Merge branch '7.0.x' into forge-updates

Author: matrei

gradle.properties

@@ -54,7 +54,7 @@ gradleCycloneDxPluginVersion=2.4.1
 micronautPlatformVersion=4.9.2
 
 # Libraries only specific to test apps, these should not be exposed
-grailsSpringSecurityVersion=7.0.0-SNAPSHOT
+grailsSpringSecurityVersion=7.0.1-SNAPSHOT
 jbossTransactionApiVersion=2.0.0.Final
 # Note: we do not import the micronaut bom in our tests to avoid spring version mismatches
 micronautHttpClientVersion=4.9.9

grails-doc/src/en/guide/upgrading/upgrading60x.adoc

@@ -176,10 +176,10 @@ This update introduces enhancements and fixes to the Spring Framework, providing
 Grails 6 used Spring Boot 2.7.x. Grails {version} updates this to Spring Boot {springBootVersion}. For more information, consult the release notes for previous Spring Boot releases:
 1. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.5-Release-Notes[Spring Boot 3.5 Release Notes]
 2. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[Spring Boot 3.4 Release Notes]
-3. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[Spring Boot 3.3 Release Notes]
-4. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[Spring Boot 3.2 Release Notes]
-5. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[Spring Boot 3.1 Release Notes]
-6. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.4-Release-Notes[Spring Boot 3.0 Release Notes]
+3. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.3-Release-Notes[Spring Boot 3.3 Release Notes]
+4. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.2-Release-Notes[Spring Boot 3.2 Release Notes]
+5. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.1-Release-Notes[Spring Boot 3.1 Release Notes]
+6. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-3.0-Release-Notes[Spring Boot 3.0 Release Notes]
 
 ==== 10. Upgrading Your Project:
 
@@ -678,4 +678,4 @@ If your application or API consumers depend on the previous JSON format for `Cal
 
 4. **ZonedDateTime**: Note that the zone ID (e.g., `[America/Los_Angeles]`) is no longer included in the output, matching Spring Boot's behavior.
 
-This change applies to both the `grails-converters` module (standard JSON rendering) and the `grails-views-gson` module (JSON views).
+This change applies to both the `grails-converters` module (standard JSON rendering) and the `grails-views-gson` module (JSON views).

grails-forge/grails-forge-core/src/main/java/org/grails/forge/feature/build/gradle/templates/buildGradle.rocker.raw

@@ -105,7 +105,7 @@ compileJava.options.release = @features.getTargetJdk()
 }
 
 @if (features.contains("jrebel")) {
-run {
+bootRun {
     dependsOn(generateRebel)
     if (project.hasProperty("rebelAgent")) {
         jvmArgs(rebelAgent)