Merge branch '7.0.x' into more-url-cleanup

jamesfredley · jamesfredley · commit fda4d440554e · 2025-08-18T20:41:50.000-04:00
# Conflicts:
#	grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/reloading/Springloaded.java
diff --git a/grails-doc/src/en/guide/commandLine/creatingProject.adoc b/grails-doc/src/en/guide/commandLine/creatingProject.adoc
@@ -175,7 +175,7 @@ The "create-*" commands are used to produce a fundamental Grails project, allowi
 ----
 
 | -f, --features
-| The features to use. Possible values: h2, gorm-hibernate5, spring-boot-starter-jetty, springloaded, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties
+| The features to use. Possible values: h2, gorm-hibernate5, spring-boot-starter-jetty, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties
 |
 [source,shell]
 ----
diff --git a/grails-doc/src/en/guide/commandLine/interactiveMode.adoc b/grails-doc/src/en/guide/commandLine/interactiveMode.adoc
@@ -67,7 +67,7 @@ Creates an application
       [NAME]            The name of the application to create.
   -f, --features=FEATURE[,FEATURE...]
                         The features to use. Possible values: h2, scaffolding, gorm-hibernate5,
-                          spring-boot-starter-jetty, springloaded, spring-boot-starter-tomcat,
+                          spring-boot-starter-jetty, spring-boot-starter-tomcat,
                           micronaut-http-client, cache-ehcache, hibernate-validator, postgres,
                           mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb,
                           assertj, mockito, spring-boot-starter-undertow,
@@ -131,7 +131,6 @@ Available Features
   assertj                             AssertJ fluent assertions framework
   hamcrest                            Hamcrest matchers for JUnit
   jrebel                              Adds support for class reloading with JRebel (requires separate JRebel installation)
-  springloaded                        Adds support for class reloading with Spring Loaded
 
   Documentation
   asciidoctor                         Adds support for creating Asciidoctor documentation
diff --git a/grails-doc/src/en/guide/gettingStarted/downloadingAndInstalling.adoc b/grails-doc/src/en/guide/gettingStarted/downloadingAndInstalling.adoc
@@ -56,8 +56,8 @@ Partial list, for illustration purposes:
 | `./grails test run-app` | `./gradlew bootRun -Dgrails.env=test` | run-app is a Grails Script from the Base Grails Profile commands directory and ultimately calls the Gradle bootRun task
 | `./grails package` | `./gradlew assemble -Dgrails.env=prod` | package is a YAML file from the Base Grails Profile commands directory which is converted by YamlCommandFactory, when Grails CLI starts, into a Grails Command which ultimately calls the Gradle assemble task
 | `./grails generate-all org.bookstore.Author` | `./gradlew runCommand -Pargs="generate-all org.bookstore.Author"` | None. The Grails Script GenerateAll.groovy and the Grails Command GenerateAllCommand.groovy both come from the Scaffolding Plugin and have duplicate functionality
-| `./grails dbm-update` | `./gradlew dbmUpdate` | None.  Separate script and command in Database Migration Plugin
-| `./grails dbm-generate-changelog person-domain.groovy` | `./gradlew dbmGenerateChangelog -Pargs=" person-domain.groovy"` | None.  Separate script and command in Database Migration Plugin
+| `./grails dbm-update` | `./gradlew dbmUpdate` | Both are provided by DbmUpdateCommand.groovy in the database migration plugin
+| `./grails dbm-generate-changelog person-domain.groovy` | `./gradlew dbmGenerateChangelog -Pargs="person-domain.groovy"` | Both are provided by DbmGenerateChangelogCommand.groovy in the database migration plugin
 | `./grails s2-quickstart com.yourapp User Role` | `./gradlew runCommand -Pargs="s2-quickstart com.yourapp User Role"` | None. The Grails Script s2-quickstart.groovy and the Grails Command S2QuickstartCommand.groovy both come from the Grails Spring Security Core Plugin and have duplicate functionality
 
 |===
diff --git a/grails-doc/src/en/ref/Command Line/create-plugin.adoc b/grails-doc/src/en/ref/Command Line/create-plugin.adoc
@@ -70,7 +70,7 @@ Options include specifying features, configuring the GORM implementation, select
 
 Here are the available options for the create-plugin command:
 
-- -f, --features=FEATURE[,FEATURE...]: Specifies the features to include in the plugin. Available options include h2, gorm-hibernate5, spring-boot-starter-jetty, springloaded, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow,  github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties.
+- -f, --features=FEATURE[,FEATURE...]: Specifies the features to include in the plugin. Available options include h2, gorm-hibernate5, spring-boot-starter-jetty, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow,  github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties.
 - -g, --gorm=GORM Implementation: Specifies the GORM Implementation to configure for the plugin. Possible values are hibernate, mongodb, neo4j.
 - -h, --help: Displays the help message and exits.
 - -i, --inplace: Creates a service within the current directory.
diff --git a/grails-doc/src/en/ref/Command Line/create-restapi.adoc b/grails-doc/src/en/ref/Command Line/create-restapi.adoc
@@ -40,7 +40,7 @@ The `create-restapi` command accepts the following options:
 
 - `NAME`: The desired name for the REST API application.
 
-- `-f, --features=FEATURE[,FEATURE...]`: Specifies the features to include. Available options include h2, scaffolding, gorm-hibernate5, spring-boot-starter-jetty, springloaded, spring-boot-starter-tomcat, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, asset-pipeline-grails, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, geb, properties.
+- `-f, --features=FEATURE[,FEATURE...]`: Specifies the features to include. Available options include h2, scaffolding, gorm-hibernate5, spring-boot-starter-jetty, spring-boot-starter-tomcat, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, asset-pipeline-grails, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, geb, properties.
 
 - `-g, --gorm=GORM Implementation`: Specifies the GORM Implementation to configure, with options like hibernate, mongodb, neo4j.
 
diff --git a/grails-doc/src/en/ref/Command Line/create-web-plugin.adoc b/grails-doc/src/en/ref/Command Line/create-web-plugin.adoc
@@ -38,7 +38,7 @@ grails create-web-plugin [OPTIONS] NAME
 
 Here are the available options for the `create-web-plugin` command:
 
-- `-f, --features=FEATURE[,FEATURE...]`: Specifies the features to include in the plugin. Available options include h2, gorm-hibernate5, spring-boot-starter-jetty, springloaded, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties.
+- `-f, --features=FEATURE[,FEATURE...]`: Specifies the features to include in the plugin. Available options include h2, gorm-hibernate5, spring-boot-starter-jetty, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties.
 
 - `-g, --gorm=GORM Implementation`: Specifies the GORM Implementation to configure for the plugin. Possible values are hibernate, mongodb, neo4j.
 
diff --git a/grails-doc/src/en/ref/Command Line/help.adoc b/grails-doc/src/en/ref/Command Line/help.adoc
@@ -140,7 +140,7 @@ Creates an application
       [NAME]            The name of the application to create.
   -f, --features=FEATURE[,FEATURE...]
                         The features to use. Possible values: h2, scaffolding, gorm-hibernate5,
-                          spring-boot-starter-jetty, springloaded, spring-boot-starter-tomcat,
+                          spring-boot-starter-jetty, spring-boot-starter-tomcat,
                           micronaut-http-client, cache-ehcache, hibernate-validator, postgres,
                           mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb,
                           assertj, mockito, spring-boot-starter-undertow,
diff --git a/grails-doc/src/en/ref/Command Line/list-features.adoc b/grails-doc/src/en/ref/Command Line/list-features.adoc
@@ -80,7 +80,6 @@ Available Features
   assertj                             AssertJ fluent assertions framework
   hamcrest                            Hamcrest matchers for JUnit
   jrebel                              Adds support for class reloading with JRebel (requires separate JRebel installation)
-  springloaded                        Adds support for class reloading with Spring Loaded
 
   Documentation
   asciidoctor                         Adds support for creating Asciidoctor documentation
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw
@@ -114,13 +114,6 @@ run {
 
 }
 
-@if (features.contains("springloaded")) {
-run {
-    jvmArgs("-noverify", "-javaagent:agent/springloaded-1.2.8.RELEASE.jar")
-}
-
-}
-
 @if (features.contains("spock")) {
 tasks.withType(Test) {
     useJUnitPlatform()
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/reloading/SpringBootDevTools.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/reloading/SpringBootDevTools.java
@@ -61,7 +61,7 @@ public boolean isVisible() {
 
     @Override
     public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {
-        return true;
+        return selectedFeatures.stream().noneMatch(f -> f instanceof ReloadingFeature);
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/reloading/Springloaded.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/reloading/Springloaded.java
diff --git a/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java b/grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/test/GebWithWebDriverBinaries.java
@@ -52,13 +52,13 @@ public String getName() {
 
     @Override
     public String getTitle() {
-        return "Geb Functional Testing for Grails with WebDriver binaries Gradle plugin";
+        return "Geb Functional Testing for Grails with WebDriver binaries Gradle plugin - no longer maintained";
     }
 
     @NonNull
     @Override
     public String getDescription() {
-        return "This plugins configure Geb for Grails framework to write automation tests with WebDriver binaries Gradle plugin.";
+        return "This plugins configure Geb for Grails framework to write automation tests with WebDriver binaries Gradle plugin.  No longer maintained and limited to Gradle 8.6 and JDK 21.  geb-with-testcontainers is the replacement and default starting with Grails 7.";
     }
 
     @Override
diff --git a/grails-forge/grails-forge-core/src/main/resources/META-INF/native-image/org.grails.forge/grails-forge-core/resource-config.json b/grails-forge/grails-forge-core/src/main/resources/META-INF/native-image/org.grails.forge/grails-forge-core/resource-config.json
@@ -7,7 +7,6 @@
       {"pattern":"gsp/.*$"},
       {"pattern":"i18n/.*$"},
       {"pattern":".gitkeep"},
-      {"pattern":"springloaded/.*$"},
       {"pattern":"\\Qgrails-versions.properties\\E"},
       {"pattern":"pom.xml"}
     ]
diff --git a/grails-forge/grails-forge-core/src/main/resources/pom.xml b/grails-forge/grails-forge-core/src/main/resources/pom.xml
@@ -35,12 +35,12 @@
         <dependency>
             <groupId>org.grails.plugins</groupId>
             <artifactId>grails-web-console</artifactId>
-            <version>7.0.0-M2</version>
+            <version>7.0.0-M3</version>
         </dependency>
         <dependency>
             <groupId>org.apache.grails</groupId>
             <artifactId>grails-quartz</artifactId>
-            <version>4.0.0-SNAPSHOT</version>
+            <version>4.0.0-M3</version>
         </dependency>
         <dependency>
             <!-- Last released Feb 24, 2021 -->
@@ -87,4 +87,4 @@
             <version>2.11.0</version>
         </dependency>
     </dependencies>
-</project>
+</project>
diff --git a/grails-forge/grails-forge-core/src/main/resources/springloaded/springloaded-1.2.8.RELEASE.jar b/grails-forge/grails-forge-core/src/main/resources/springloaded/springloaded-1.2.8.RELEASE.jar

Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ The "create-*" commands are used to produce a fundamental Grails project, allowi`
`175`	`175`	`----`
`176`	`176`
`177`	`177`	`\| -f, --features`
`178`		`-\| The features to use. Possible values: h2, gorm-hibernate5, spring-boot-starter-jetty, springloaded, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties`
	`178`	`+\| The features to use. Possible values: h2, gorm-hibernate5, spring-boot-starter-jetty, micronaut-http-client, cache-ehcache, hibernate-validator, postgres, mysql, cache, database-migration, grails-gsp, hamcrest, gorm-mongodb, assertj, mockito, spring-boot-starter-undertow, github-workflow-java-ci, jrebel, testcontainers, sqlserver, grails-console, views-markup, views-json, gorm-neo4j, asciidoctor, embedded-mongodb, grails-web-console, logbackGroovy, mongo-sync, shade, properties`
`179`	`179`	`\|`
`180`	`180`	`[source,shell]`
`181`	`181`	`----`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public boolean isVisible() {`
`61`	`61`
`62`	`62`	`@Override`
`63`	`63`	`public boolean shouldApply(ApplicationType applicationType, Options options, Set<Feature> selectedFeatures) {`
`64`		`- return true;`
	`64`	`+ return selectedFeatures.stream().noneMatch(f -> f instanceof ReloadingFeature);`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Override`