Merge pull request #15600 from apache/7.0.x

jamesfredley · web-flow · commit 78a9d6b33303 · 2026-04-24T09:11:49.000-05:00
merge 7.0.x into 7.1.x
diff --git a/.github/scripts/releaseDistributions.sh b/.github/scripts/releaseDistributions.sh
@@ -58,15 +58,19 @@ svn_exists() {
   svn ls "${svn_flags[@]}" --depth=empty "${url}" >/dev/null 2>&1
 }
 
-old_release_folder="$(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}" | awk -F/ 'NF{print $1; exit}')"
-if [[ -n "${old_release_folder}" ]]; then
-  PRIOR_RELEASE_URL="${RELEASE_ROOT}/${old_release_folder}"
-  echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
-  svn rm "${svn_flags[@]}" -m "Remove previous release ${old_release_folder}" "${PRIOR_RELEASE_URL}"
-  echo "✅ Deleted old release folder"
-else
-  echo "ℹ️ No existing release subfolder found under ${RELEASE_ROOT}"
-fi
+for folder in $(svn ls "${svn_flags[@]}" "${RELEASE_ROOT}"); do
+  folder=$(echo "$folder" | sed 's|/$||')
+  [[ "${folder}" == "${RELEASE_VERSION}" ]] && continue
+  PRIOR_RELEASE_URL="${RELEASE_ROOT}/${folder}"
+  read -r -p "Remove old release folder '${folder}' at ${PRIOR_RELEASE_URL}? [y/N] " confirm < /dev/tty
+  if [[ "${confirm}" =~ ^[Yy](es)?$ ]]; then
+    echo "🗑️ Deleting old release folder: ${PRIOR_RELEASE_URL}"
+    svn rm "${svn_flags[@]}" -m "Remove previous release ${folder}" "${PRIOR_RELEASE_URL}"
+    echo "✅ Deleted old release folder"
+  else
+    echo "⏭️ Skipping removal of old release folder: ${PRIOR_RELEASE_URL}"
+  fi
+done
 
 DEV_VERSION_URL="$DEV_ROOT/${RELEASE_VERSION}"
 RELEASE_VERSION_URL="$RELEASE_ROOT/${RELEASE_VERSION}"
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -37,7 +37,7 @@ ext {
             'jna.version'                   : '5.17.0',
             'jquery.version'                : '3.7.1',
             'objenesis.version'             : '3.4',
-            'spring-boot.version'           : '3.5.13',
+            'spring-boot.version'           : '3.5.14',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/DevelopmentReloadingDTO.java
@@ -74,6 +74,7 @@ public DevelopmentReloadingDTO(DevelopmentReloading developmentReloading) {
         this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, NameUtils.getNaturalNameOfEnum(name));
     }
 
+    @NonNull
     @Override
     @Schema(description = "A description of the developmentReloading")
     public String getDescription() {
@@ -97,6 +98,6 @@ public DevelopmentReloading getValue() {
     @Override
     @Schema(description = "The label of the developmentReloading for select options")
     public String getLabel() {
-        return description;
+        return value.getLabel();
     }
 }
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/GormImplDTO.java
@@ -27,7 +27,6 @@
 import io.micronaut.core.naming.Named;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.grails.forge.options.GormImpl;
-import org.grails.forge.util.NameUtils;
 
 /**
  * DTO objects for {@link GormImpl}.
@@ -84,6 +83,7 @@ public GormImplDTO(GormImpl gormImpl) {
 
     }
 
+    @NonNull
     @Override
     @Schema(description = "A description of the GORM Implementation")
     public String getDescription() {
@@ -106,6 +106,6 @@ public GormImpl getValue() {
     @Override
     @Schema(description = "The label of the GORM Implementation for select options")
     public String getLabel() {
-        return NameUtils.getNaturalNameOfEnum(name);
+        return value.getLabel();
     }
 }
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/ServletImplDTO.java
@@ -27,7 +27,6 @@
 import io.micronaut.core.naming.Named;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.grails.forge.options.ServletImpl;
-import org.grails.forge.util.NameUtils;
 
 /**
  * DTO objects for {@link ServletImpl}.
@@ -73,6 +72,7 @@ public ServletImplDTO(ServletImpl servletImpl) {
         this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, name);
     }
 
+    @NonNull
     @Override
     @Schema(description = "A description of the GORM Implementation")
     public String getDescription() {
@@ -95,6 +95,6 @@ public ServletImpl getValue() {
     @Override
     @Schema(description = "The label of the Servlet Implementation for select options")
     public String getLabel() {
-        return NameUtils.getNaturalNameOfEnum(name);
+        return value.getLabel();
     }
 }
diff --git a/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java b/grails-forge/grails-forge-api/src/main/java/org/grails/forge/api/preview/PreviewController.java
@@ -72,7 +72,7 @@ public PreviewController(ProjectGenerator projectGenerator, ApplicationEventPubl
      * @param name The name of the application The name of the application
      * @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)
      * @param gorm The GORM (optional, defaults to Hibernate)
      * @param servlet The Servlet (optional, defaults to Embedded Tomcat)
      * @return A preview of the application contents.
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronautValidator.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/micronaut/GrailsMicronautValidator.java
@@ -36,7 +36,7 @@ public void validatePreProcessing(Options options, ApplicationType applicationTy
         if (features.stream().anyMatch(f -> f instanceof GrailsMicronaut)) {
             if (features.stream().anyMatch(f -> (f instanceof SpringBootDevTools))) {
                 // See: https://github.com/micronaut-projects/micronaut-spring/issues/769
-                throw new IllegalArgumentException("Spring Boot Dev Tools are not supported with Grails Micronaut");
+                throw new IllegalArgumentException("Spring Boot DevTools are not supported with Grails Micronaut");
             }
         }
     }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/Spock.java
@@ -18,6 +18,7 @@
  */
 package org.grails.forge.feature.test;
 
+import io.micronaut.core.annotation.NonNull;
 import jakarta.inject.Singleton;
 import org.grails.forge.application.ApplicationType;
 import org.grails.forge.application.generator.GeneratorContext;
@@ -36,6 +37,21 @@ public String getName() {
         return "spock";
     }
 
+    @NonNull
+    @Override
+    public String getTitle() {
+        return "Spock Testing Framework";
+    }
+
+    @NonNull
+    @Override
+    public String getDescription() {
+        return "Spock is a testing, specification, and mocking framework for JVM developers " +
+            "that emphasizes readability and clarity. By blending BDD concepts and Groovy's " +
+            "concise syntax, Spock helps teams write tests that are easy to understand and " +
+            "enjoyable to maintain.";
+    }
+
     @Override
     public boolean supports(ApplicationType applicationType) {
         return true;
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/view/GrailsGsp.java
@@ -18,6 +18,7 @@
  */
 package org.grails.forge.feature.view;
 
+import io.micronaut.core.annotation.NonNull;
 import jakarta.inject.Singleton;
 import org.grails.forge.application.ApplicationType;
 import org.grails.forge.application.generator.GeneratorContext;
@@ -51,12 +52,21 @@ public boolean shouldApply(ApplicationType applicationType, Options options, Set
 
     @Override
     public String getTitle() {
-        return "Grails GSP";
+        return "GSP";
     }
 
+    @NonNull
     @Override
     public String getName() {
-        return "grails-gsp";
+        return "gsp";
+    }
+
+    @NonNull
+    @Override
+    public String getDescription() {
+        return "GSP (Groovy Server Pages) is the server-side view technology used in Grails. " +
+            "It is designed to be familiar to developers with experience in ASP or JSP, while providing " +
+            "a more flexible, expressive, and intuitive way to build web pages.";
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/DevelopmentReloading.java
@@ -24,11 +24,16 @@
 
 public enum DevelopmentReloading {
 
-    DEVTOOLS,
-    JREBEL,
-    NONE;
+    DEVTOOLS("Spring Boot DevTools"),
+    JREBEL("JRebel"),
+    NONE("None");
 
     public static final DevelopmentReloading DEFAULT_OPTION = DEVTOOLS;
+    private final String label;
+
+    DevelopmentReloading(String label) {
+        this.label = label;
+    }
 
     @Override
     public String toString() {
@@ -40,6 +45,11 @@ public String getName() {
         return name().toLowerCase(Locale.ENGLISH);
     }
 
+    @NonNull
+    public String getLabel() {
+        return label;
+    }
+
     public DevelopmentReloading toDevelopmentReloading() {
         return switch (this) {
             case DEVTOOLS -> DevelopmentReloading.DEVTOOLS;
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/GormImpl.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/GormImpl.java
@@ -22,19 +22,26 @@
 
 public enum GormImpl {
 
-    HIBERNATE("gorm-hibernate5"),
-    MONGODB("gorm-mongodb");
+    HIBERNATE("gorm-hibernate5", "Hibernate 5"),
+    MONGODB("gorm-mongodb", "MongoDB");
 
     public static final GormImpl DEFAULT_OPTION = HIBERNATE;
     private final String featureName;
+    private final String label;
 
-    GormImpl(String featureName) {
+    GormImpl(String featureName, String label) {
         this.featureName = featureName;
+        this.label = label;
     }
 
     @NonNull
     public String getName() {
         return featureName;
     }
 
+    @NonNull
+    public String getLabel() {
+        return label;
+    }
+
 }
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/ServletImpl.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/options/ServletImpl.java
@@ -27,20 +27,28 @@
  * @since 6.0.0
  */
 public enum ServletImpl {
-    NONE("NONE"),
-    TOMCAT("spring-boot-starter-tomcat"),
-    JETTY("spring-boot-starter-jetty"),
-    UNDERTOW("spring-boot-starter-undertow");
+
+    TOMCAT("spring-boot-starter-tomcat", "Tomcat"),
+    JETTY("spring-boot-starter-jetty", "Jetty"),
+    UNDERTOW("spring-boot-starter-undertow", "Undertow"),
+    NONE("NONE", "None");
 
     public static final ServletImpl DEFAULT_OPTION = TOMCAT;
     private final String featureName;
+    private final String label;
 
-    ServletImpl(String featureName) {
+    ServletImpl(String featureName, String label) {
         this.featureName = featureName;
+        this.label = label;
     }
 
     @NonNull
     public String getName() {
         return featureName;
     }
+
+    @NonNull
+    public String getLabel() {
+        return label;
+    }
 }
diff --git a/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy b/grails-forge/grails-forge-core/src/test/groovy/org/grails/forge/feature/view/GrailsGspSpec.groovy
@@ -27,26 +27,24 @@ import org.grails.forge.application.generator.GeneratorContext
 import org.grails.forge.feature.Features
 import org.grails.forge.fixture.CommandOutputFixture
 import org.grails.forge.options.DevelopmentReloading
-import org.grails.forge.options.JdkVersion
 import org.grails.forge.options.Options
-import org.grails.forge.options.TestFramework
 import spock.lang.Unroll
 
 class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixture {
 
-    void "test grails-gsp feature"() {
+    void "test gsp feature"() {
         when:
-        final Features features = getFeatures(["grails-gsp"])
+        final Features features = getFeatures(["gsp"])
 
         then:
         features.contains("grails-web")
-        features.contains("grails-gsp")
+        features.contains("gsp")
     }
 
     void "test dependencies are present for Gradle"() {
         when:
         final String template = new BuildBuilder(beanContext)
-            .features(["grails-gsp"])
+            .features(["gsp"])
             .render()
 
         then:
@@ -57,7 +55,7 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
 
     void "test gsp configuration"() {
         when:
-        final GeneratorContext ctx = buildGeneratorContext(["grails-gsp"])
+        final GeneratorContext ctx = buildGeneratorContext(["gsp"])
 
         then:
         ctx.getConfiguration().containsKey("grails.views.gsp.encoding")
@@ -70,7 +68,7 @@ class GrailsGspSpec extends ApplicationContextSpec implements CommandOutputFixtu
 
     void "test mime configuration"() {
         when:
-        final GeneratorContext ctx = buildGeneratorContext(["grails-gsp"])
+        final GeneratorContext ctx = buildGeneratorContext(["gsp"])
 
         then:
         ctx.getConfiguration().get("grails.mime.disable.accept.header.userAgents") == Arrays.asList("Gecko", "WebKit", "Presto", "Trident")

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ ext {`
`37`	`37`	`'jna.version' : '5.17.0',`
`38`	`38`	`'jquery.version' : '3.7.1',`
`39`	`39`	`'objenesis.version' : '3.4',`
`40`		`- 'spring-boot.version' : '3.5.13',`
	`40`	`+ 'spring-boot.version' : '3.5.14',`
`41`	`41`	`]`
`42`	`42`
`43`	`43`	`// Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly`
Original file line number	Diff line number	Diff line change
`@@ -74,6 +74,7 @@ public DevelopmentReloadingDTO(DevelopmentReloading developmentReloading) {`
`74`	`74`	`this.description = messageSource.getMessage(MESSAGE_PREFIX + name + ".description", messageContext, NameUtils.getNaturalNameOfEnum(name));`
`75`	`75`	`}`
`76`	`76`
	`77`	`+ @NonNull`
`77`	`78`	`@Override`
`78`	`79`	`@Schema(description = "A description of the developmentReloading")`
`79`	`80`	`public String getDescription() {`
`@@ -97,6 +98,6 @@ public DevelopmentReloading getValue() {`
`97`	`98`	`@Override`
`98`	`99`	`@Schema(description = "The label of the developmentReloading for select options")`
`99`	`100`	`public String getLabel() {`
`100`		`- return description;`
	`101`	`+ return value.getLabel();`
`101`	`102`	`}`
`102`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`import io.micronaut.core.naming.Named;`
`28`	`28`	`import io.swagger.v3.oas.annotations.media.Schema;`
`29`	`29`	`import org.grails.forge.options.GormImpl;`
`30`		`-import org.grails.forge.util.NameUtils;`
`31`	`30`
`32`	`31`	`/**`
`33`	`32`	`* DTO objects for {@link GormImpl}.`
`@@ -84,6 +83,7 @@ public GormImplDTO(GormImpl gormImpl) {`
`84`	`83`
`85`	`84`	`}`
`86`	`85`
	`86`	`+ @NonNull`
`87`	`87`	`@Override`
`88`	`88`	`@Schema(description = "A description of the GORM Implementation")`
`89`	`89`	`public String getDescription() {`
`@@ -106,6 +106,6 @@ public GormImpl getValue() {`
`106`	`106`	`@Override`
`107`	`107`	`@Schema(description = "The label of the GORM Implementation for select options")`
`108`	`108`	`public String getLabel() {`
`109`		`- return NameUtils.getNaturalNameOfEnum(name);`
	`109`	`+ return value.getLabel();`
`110`	`110`	`}`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public void validatePreProcessing(Options options, ApplicationType applicationTy`
`36`	`36`	`if (features.stream().anyMatch(f -> f instanceof GrailsMicronaut)) {`
`37`	`37`	`if (features.stream().anyMatch(f -> (f instanceof SpringBootDevTools))) {`
`38`	`38`	`// See: https://github.com/micronaut-projects/micronaut-spring/issues/769`
`39`		`- throw new IllegalArgumentException("Spring Boot Dev Tools are not supported with Grails Micronaut");`
	`39`	`+ throw new IllegalArgumentException("Spring Boot DevTools are not supported with Grails Micronaut");`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`