merge 7.0.x into 7.1.x#15600
Merged
jamesfredley merged 10 commits into7.1.xfrom Apr 24, 2026
Merged
Conversation
Clean up labels used in the forge ui
fix: prompt before removing old SVN release folder during promotion
Release notes: https://github.com/spring-projects/spring-boot/releases/tag/v3.5.14 Assisted-by: claude-code:claude-opus-4-7
Upgrade to Spring Boot 3.5.14
Contributor
There was a problem hiding this comment.
Pull request overview
Merges changes from the 7.0.x line into 7.1.x, updating Grails Forge feature naming/metadata, option labeling for API select lists, and a few release/dependency maintenance items.
Changes:
- Rename the Forge GSP feature from
grails-gsptogspand expand feature metadata (title/description). - Add explicit human-friendly labels to
ServletImpl,GormImpl, andDevelopmentReloading, and have API DTOs expose those labels. - Bump Spring Boot version and adjust the distribution release helper script behavior.
Reviewed changes
Copilot reviewed 12 out of 13 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy | Updates tests to use the renamed gsp feature. |
| grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/ServletImpl.java | Adds a label field and accessor for servlet implementation display text. |
| grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/GormImpl.java | Adds a label field and accessor for GORM implementation display text. |
| grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java | Adds a label field and accessor for development reloading display text. |
| grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java | Renames feature to gsp, updates title, and adds a description. |
| grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java | Adds title/description metadata for the Spock feature. |
| grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronautValidator.java | Fixes DevTools spelling in an exception message. |
| grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java | Updates Javadoc wording for the reloading parameter. |
| grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java | Switches label sourcing to enum getLabel() and adds nullability annotation. |
| grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java | Switches label sourcing to enum getLabel() and adds nullability annotation. |
| grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java | Switches label sourcing to enum getLabel() and adds nullability annotation. |
| dependencies.gradle | Bumps Spring Boot patch version. |
| .github/scripts/releaseDistributions.sh | Changes release folder cleanup logic to iterate and prompt per folder. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Comment on lines
72
to
78
| this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, name); | ||
| } | ||
|
|
||
| @NonNull | ||
| @Override | ||
| @Schema(description = "A description of the GORM Implementation") | ||
| public String getDescription() { |
There was a problem hiding this comment.
In ServletImplDTO, the OpenAPI @Schema descriptions around these getters refer to “GORM Implementation”/“Gorm Implementation”, but this DTO represents ServletImpl. This will produce misleading API docs; update the schema descriptions for getDescription() and getName() to reference the Servlet implementation instead.
| * @param features The features The chosen features | ||
| * @param build The build type (optional, defaults to Gradle) | ||
| * @param reloading the development reloading (jrebel, dev tools, none, etc) | ||
| * @param reloading the development reloading (jrebel, spring boot devtools, none, etc) |
There was a problem hiding this comment.
The @param reloading Javadoc lists “spring boot devtools” as an example value, but the API enum values are devtools, jrebel, and none (see org.grails.forge.api.DevelopmentReloading#toString()). Consider updating this comment to reflect the actual accepted parameter values to avoid confusing API consumers.
Suggested change
| * @param reloading the development reloading (jrebel, spring boot devtools, none, etc) | |
| * @param reloading the development reloading (devtools, jrebel, none) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.