Merge remote-tracking branch 'origin/8.0.x' into grails8-groovy5-sb4

# Conflicts:
#	grails-doc/src/en/guide/upgrading/upgrading80x.adoc

Author: jamesfredley

grails-doc/src/en/guide/conf/micronaut.adoc

@@ -32,16 +32,16 @@ Here's an example build file:
 .build.gradle
 ----
 dependencies {
-    // enforcedPlatform is required: it forces grails-bom-managed versions over the
-    // versions declared by the Micronaut platform (e.g. javaparser-core, Groovy 4),
+    // enforcedPlatform is required: it forces the selected Grails Micronaut BOM versions over the
+    // versions declared by the Micronaut platform (for example Groovy 5 and javaparser-core),
     // preventing binary incompatibilities at runtime.
     implementation enforcedPlatform("org.apache.grails:grails-micronaut-bom:$grailsVersion")
 
     implementation 'org.apache.grails:grails-micronaut'
 }
 ----
 
-The `grails-micronaut-bom` layers Micronaut-specific dependency overrides on top of `grails-bom` and pins the `io.micronaut.platform:micronaut-platform` version it was built against. Applying it as `enforcedPlatform` makes all of its constraints strictly versioned so that no transitive dependency (including Micronaut's own platform) can override them — there is no need to set a `micronautPlatformVersion` Gradle property. See link:{versionsRef}Grails%20BOM%20Micronaut.html[Grails Micronaut BOM Dependencies] for the full list of managed versions.
+The `grails-micronaut-bom` layers Micronaut-specific dependency overrides on top of `grails-bom` and pins the `io.micronaut.platform:micronaut-platform` version it was built against. Applying it as `enforcedPlatform` makes all of its constraints strictly versioned so that no transitive dependency, including Micronaut's own platform, can override them. There is no need to set a `micronautPlatformVersion` Gradle property. See link:{versionsRef}Grails%20BOM%20Micronaut.html[Grails Micronaut BOM Dependencies] for the full list of managed versions.
 
 ==== Hibernate-Specific Micronaut BOMs
 
@@ -80,12 +80,13 @@ The Micronaut auto-setup defaults to on. If a project deliberately deviates from
 .build.gradle
 ----
 grails {
-    micronautAutoSetup = false // not recommended — also skips the bootJar/bootWar CLASSIC loader configuration
+    micronautAutoSetup = false // not recommended - also skips Micronaut BOM validation
 }
 ----
 
-WARNING: Disabling auto-setup is rarely appropriate. Without `enforcedPlatform`, Gradle's default conflict resolution allows the Micronaut platform to silently override grails-bom-managed versions of libraries such as Groovy and `javaparser-core`, leading to binary incompatibilities at runtime. The CLASSIC loader configuration that auto-setup provides is also required for `java -jar` compatibility with the Micronaut-Spring integration.
+WARNING: Disabling auto-setup is rarely appropriate. Without auto-setup, the Grails Gradle plugin will not validate that a Micronaut-compatible BOM is applied as `enforcedPlatform`. Without `enforcedPlatform`, Gradle's default conflict resolution allows the Micronaut platform to silently override the selected Grails Micronaut BOM versions of libraries such as Groovy and `javaparser-core`, leading to binary incompatibilities at runtime.
 
 ==== Generated Applications
 
-Applications generated by https://forge.grails.org/[Grails Forge] with the Micronaut feature selected automatically use `enforcedPlatform("org.apache.grails:grails-micronaut-bom:$grailsVersion")` and require no further setup.
+Applications generated by https://forge.grails.org/[Grails Forge] with the Micronaut feature selected automatically use `enforcedPlatform("org.apache.grails:grails-micronaut-bom:$grailsVersion")` and require no further setup.
+In Grails 8, Micronaut-enabled applications require JDK 25 or later; applications that do not use Micronaut continue to use the standard Java 21 baseline.

grails-doc/src/en/guide/introduction/whatsNew.adoc

@@ -27,6 +27,18 @@ This release focuses on enhancing the developer experience, improving performanc
 For detailed information on how to upgrade to Grails {grailsMajorVersion}, including major dependency changes, please see the xref:upgrading#upgrading80x[Upgrading from Grails 7 to Grails {grailsMajorVersion}] section.
 Notable new features are included below.
 
+==== Platform Baseline
+
+Grails {grailsMajorVersion} raises the standard build and runtime baseline to Java 21 and uses Gradle {gradleVersion}.
+The standard Grails BOM remains on Groovy {groovyVersion} and Spock {spockVersion}, while Micronaut-enabled Grails applications use Micronaut-specific BOM variants that align with Micronaut 5 and require JDK 25 or later.
+
+==== Spring Boot 4.1 and Spring Framework 7
+
+Grails {grailsMajorVersion} is built on Spring Boot {springBootVersion} and Spring Framework {springVersion}.
+This brings the Spring Boot 4 modular artifact layout, Spring Framework 7 API removals, Jackson 3, Tomcat 11 and Jakarta Servlet 6.1, plus Spring Boot 4.1 dependency management for Spring Security 7.1, Spring Data 2026.0 and Micrometer 1.17.
+
+The Grails 8 upgrade guide calls out the major application-impacting changes and links to the Spring Boot 4.0 migration guide, Spring Boot 4.1 release notes and Spring Framework 7.0 release notes.
+
 ==== GSP Tag Library Improvements
 
 Grails {grailsMajorVersion} continues the move toward method-based TagLib handlers while preserving compatibility with existing closure-based tags.
@@ -90,4 +102,3 @@ A single property can likewise declare a `$text` index — or another special ty
 When the options of an already-created index change between restarts, GORM now reconciles the difference instead of only
 logging a conflict. A changed TTL is applied in place with MongoDB's `collMod` command — no drop, no rebuild — while any
 other option change is applied by declaring `indexAttributes: [recreateOnConflict: true]`.
-

grails-doc/src/en/guide/introduction/whatsNew/dependencyUpgrades.adoc

@@ -19,9 +19,11 @@ under the License.
 
 Grails {version} ships with the following foundational dependency versions:
 
+* Java 21 minimum baseline
 * Groovy {groovyVersion}
 * Spring Framework {springVersion}
 * Spring Boot {springBootVersion}
 * Gradle {gradleVersion}
 * Spock {spockVersion}
 
+See the link:{versionsRef}Grails%20BOM.html[Grails BOM dependency table] for the complete managed dependency set, including the Hibernate and Micronaut BOM variants.

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

@@ -44,15 +44,18 @@ Grails 8 requires a minimum of Java 21 to both build and run Grails applications
 This is an increase from Grails 7, which required Java 17.
 Update your project's toolchain, CI pipelines, and deployment environments to use JDK 21 or later.
 
-==== 2. Spring Boot 4.0.x
+==== 2. Spring Boot 4.1.x
 
-Grails 8 upgrades from Spring Boot 3.5.x to Spring Boot 4.0.x.
-This is a major upgrade that brings Spring Framework 7.0.x, new module structure, and several breaking changes.
+Grails 8 upgrades from Spring Boot 3.5.x to Spring Boot 4.1.x.
+This crosses the Spring Boot 4 major release boundary and adopts the Spring Boot 4.1 managed stack used by Grails 8: Spring Framework 7.0.x, Spring Security 7.1.x, Spring Data 2026.0.x, Micrometer 1.17.x, Jackson 3.1.x, Tomcat 11.0.x, and Jakarta Servlet 6.1.
+The upgrade includes the Spring Boot 4 module split, removed Spring Framework 6 deprecations, and additional Spring Boot 4.1 removals of APIs and properties that were deprecated in Spring Boot 4.0.
 
 For full details, consult:
 
-1. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.0-Release-Notes[Spring Boot 4.0 Release Notes]
-2. https://github.com/spring-projects/spring-framework/wiki/Upgrading-to-Spring-Framework-7.x[Upgrading to Spring Framework 7]
+1. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.0-Migration-Guide[Spring Boot 4.0 Migration Guide]
+2. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.0-Release-Notes[Spring Boot 4.0 Release Notes]
+3. https://github.com/spring-projects/spring-boot/wiki/Spring-Boot-4.1-Release-Notes[Spring Boot 4.1 Release Notes]
+4. https://github.com/spring-projects/spring-framework/wiki/Spring-Framework-7.0-Release-Notes[Spring Framework 7.0 Release Notes]
 
 ==== 3. Spring Boot Autoconfigure Modularization
 
@@ -253,9 +256,10 @@ tasks.withType(BootArchive).configureEach {
 * The `grails-micronaut` plugin continues to work with Spring Boot 4's default loader.
 If you experience issues running your Micronaut-enabled Grails application via `java -jar`, please report them to the https://github.com/apache/grails-core/issues[Grails issue tracker].
 
-===== 7.2 enforcedPlatform Required for grails-bom
+===== 7.2 enforcedPlatform Required for Micronaut BOMs
 
-When using Micronaut, the `grails-bom` **must** be applied as `enforcedPlatform` instead of `platform`.
+When using Micronaut, select a Micronaut-compatible Grails BOM and apply it as `enforcedPlatform` instead of `platform`.
+The default choice is `grails-micronaut-bom`; Hibernate-specific variants are covered in section 7.4.
 The Micronaut 5 platform declares its own managed dependency versions that conflict with those managed by the `grails-bom`.
 Without `enforcedPlatform`, Gradle's default conflict resolution (highest version wins) allows the Micronaut platform to silently override `grails-bom` versions, leading to binary incompatibilities at runtime.
 
@@ -265,22 +269,22 @@ For example, without `enforcedPlatform`:
 * **Spock** is upgraded from 2.3-groovy-4.0 to 2.4-groovy-5.0 -- compiled against Groovy 5, incompatible with Groovy 4 classes
 * **Kotlin**, **Mockito**, **Byte Buddy** are upgraded to versions not tested with the Grails stack
 
-Using `enforcedPlatform` makes all `grails-bom` constraints strictly versioned so they cannot be overridden by any transitive dependency.
+Using `enforcedPlatform` makes the selected Micronaut BOM constraints strictly versioned so they cannot be overridden by any transitive dependency.
 
-The Grails Gradle Plugin will error at configuration time if `grails-micronaut` is detected and `grails-bom` is not applied as `enforcedPlatform`.
+The Grails Gradle Plugin will error at configuration time if `grails-micronaut` is detected and no Micronaut-compatible Grails BOM is applied as `enforcedPlatform`.
 
 [source,groovy]
 .build.gradle
 ----
 dependencies {
     // enforcedPlatform is required when using grails-micronaut
-    implementation enforcedPlatform("org.apache.grails:grails-bom:$grailsVersion")
+    implementation enforcedPlatform("org.apache.grails:grails-micronaut-bom:$grailsVersion")
 
     implementation 'org.apache.grails:grails-micronaut'
 }
 ----
 
-NOTE: Applications generated by the Grails Forge automatically use `enforcedPlatform` when the Micronaut feature is selected.
+NOTE: Applications generated by the Grails Forge automatically use the appropriate Micronaut BOM as `enforcedPlatform` when the Micronaut feature is selected.
 
 ===== 7.3 Micronaut Features Require JDK 25
 
@@ -360,7 +364,7 @@ If you need to restore the legacy behavior temporarily, the deprecated marshalle
 ==== 9. Jackson 3 is the New Default
 
 Spring Boot 4 ships Jackson 3 (`tools.jackson.*`) and auto-configures a `JsonMapper` bean instead of the Jackson 2 `ObjectMapper`.
-Grails 8 follows that change: any Grails module that previously declared `com.fasterxml.jackson.core:jackson-databind` (Jackson 2) now declares `tools.jackson.core:jackson-databind` (Jackson 3, currently 3.1.0 via the Spring Boot 4 BOM).
+Grails 8 follows that change: any Grails module that previously declared `com.fasterxml.jackson.core:jackson-databind` (Jackson 2) now declares `tools.jackson.core:jackson-databind` (Jackson 3.1.x via the Spring Boot 4.1 BOM).
 
 **What stayed the same:**
 
@@ -400,7 +404,7 @@ Spring Boot 4 provides a `tools.jackson.databind.json.JsonMapper` bean instead o
 Update injection points to expect `JsonMapper`.
 
 **If you must stay on Jackson 2 temporarily:**
-Spring Boot 4 still manages the Jackson 2 BOM (currently 2.21.2) and provides an opt-in toggle so the auto-configured mapper preserves Jackson 2 defaults:
+Spring Boot 4 still manages the Jackson 2 BOM and provides an opt-in toggle so the auto-configured mapper preserves Jackson 2 defaults:
 
 [source,yaml]
 .application.yml
@@ -764,12 +768,24 @@ If your application *directly* uses `@Retryable`, `@EnableRetry`, or `@Recover`,
 implementation 'org.springframework.retry:spring-retry'
 ----
 
-NOTE: The `grails-bom` pins a known-good Spring Retry version (`2.0.x`), so you do not need to specify a version when using `enforcedPlatform("org.apache.grails:grails-bom:$grailsVersion")`.
+NOTE: The `grails-bom` pins a known-good Spring Retry version (`2.0.x`), so you do not need to specify a version when your build uses the Grails BOM, whether it is auto-applied by the Grails Gradle plugin or declared explicitly.
 Override the BOM-managed version in your build if you need a newer release.
 
 ==== 20. Other Default Behavior Changes
 
-Spring Boot 4 made several smaller default-behavior changes that you may notice but rarely require code changes:
+Spring Boot 4.0 and 4.1 made several smaller default-behavior changes that you may notice but rarely require code changes:
+
+* **Spring Boot 4.1 removes Spring Boot 4.0 deprecations.**
+If you tested against an earlier Grails 8 snapshot or Spring Boot 4.0.x directly, remove any use of APIs, methods, or configuration properties that were only deprecated there before moving to the current Grails 8 line.
+
+* **The Spring Boot `BuildInfo` task writes `META-INF/build-info.properties` by default.**
+If your build, packaging, or tests read `build-info.properties` from the root of the generated resources directory, update them to read `META-INF/build-info.properties` or configure the task's `filename` property.
+
+* **Spring Data JPA repository bootstrap modes were tightened.**
+Grails GORM is unaffected, but applications that also use Spring Data JPA directly should review any `spring.data.jpa.repositories.bootstrap-mode` setting when moving to Spring Boot 4.1.
+
+* **Derby support is deprecated in Spring Boot.**
+Grails does not use Derby by default, but applications that added Derby through Spring Boot auto-configuration should plan a migration to H2, HSQLDB, or another supported database.
 
 * **Logback default charset is now `UTF-8`** for log files (aligning with the existing Log4j2 default).
 Console output uses `Console#charset()` if available, otherwise `UTF-8`.

grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsExtension.groovy

@@ -126,12 +126,10 @@ class GrailsExtension {
      * Whether the Micronaut auto-setup should run when the `grails-micronaut` plugin is detected.
      * When enabled, the Grails Gradle plugin:
      * <ul>
-     *   <li>validates that `grails-micronaut-bom` is applied as `enforcedPlatform` and fails the build
-     *       at configuration time with an actionable error if not (`grails-micronaut-bom` is the single
-     *       source of truth for the Micronaut platform version);</li>
-     *   <li>configures the Spring Boot `bootJar`/`bootWar` tasks to use the {@code CLASSIC} loader
-     *       implementation (required for {@code java -jar} compatibility with the Micronaut-Spring
-     *       integration).</li>
+     *   <li>validates that a Micronaut-compatible Grails BOM is applied as `enforcedPlatform` and fails
+     *       the build at configuration time with an actionable error if not;</li>
+     *   <li>keeps Micronaut dependency management aligned with the Grails BOM variant selected by the
+     *       application.</li>
      * </ul>
      * Disabling this is rarely appropriate; consumer projects should normally apply the BOM as
      * `enforcedPlatform` so that the Micronaut platform cannot override grails-bom-managed versions.
@@ -190,7 +188,8 @@ class GrailsExtension {
      * </pre>
      *
      * <p>The Micronaut variants ({@code grails-micronaut-bom},
-     * {@code grails-hibernate5-micronaut-bom}) are applied as an {@code enforcedPlatform}
+     * {@code grails-hibernate5-micronaut-bom}, and {@code grails-hibernate7-micronaut-bom})
+     * are applied as an {@code enforcedPlatform}
      * because the Micronaut platform would otherwise override their managed versions via
      * conflict resolution. All other BOMs are applied as a regular {@code platform}.</p>
      *

grails-gradle/plugins/src/main/groovy/org/grails/gradle/plugin/core/GrailsGradlePlugin.groovy

@@ -439,7 +439,7 @@ ${importStatements}
             }
 
             // Exactly one Grails BOM may be applied. The BOMs are split by integration
-            // (default / hibernate5 / micronaut), so a project must select a single variant.
+            // (default / hibernate / micronaut), so a project must select a single variant.
             // If the build declares a Grails BOM by hand - for example a Micronaut application
             // declaring enforcedPlatform(grails-micronaut-bom), or an application generated by
             // Grails Forge / a profile that declares platform(grails-bom) directly - honor that
@@ -450,7 +450,7 @@ ${importStatements}
                 throw new GradleException(
                     "Project '${project.name}' declares more than one Grails BOM (${declaredBoms.join(', ')}). " +
                         'Exactly one Grails BOM may be applied; the BOMs are split by integration ' +
-                        '(default / hibernate5 / micronaut), so a project must select a single variant.'
+                        '(default / hibernate / micronaut), so a project must select a single variant.'
                 )
             }
             def effectiveBom = declaredBoms.isEmpty() ? bomName : declaredBoms.first()
@@ -505,6 +505,7 @@ ${importStatements}
     private static final Set<String> ENFORCED_PLATFORM_BOMS = [
             'grails-micronaut-bom',
             'grails-hibernate5-micronaut-bom',
+            'grails-hibernate7-micronaut-bom',
     ] as Set<String>
 
     /**
@@ -516,8 +517,10 @@ ${importStatements}
             'grails-bom',
             'grails-base-bom',
             'grails-hibernate5-bom',
+            'grails-hibernate7-bom',
             'grails-micronaut-bom',
             'grails-hibernate5-micronaut-bom',
+            'grails-hibernate7-micronaut-bom',
     ] as Set<String>
 
     /**
@@ -641,10 +644,10 @@ ${importStatements}
 
             project.logger.lifecycle('Micronaut Support Detected for {}', project.name)
 
-            // Validate that grails-micronaut-bom is applied as enforcedPlatform. The BOM is now the
-            // single source of truth for the Micronaut platform version: applying it as
-            // enforcedPlatform pins io.micronaut.platform:micronaut-platform with a strict
-            // constraint that no transitive can override.
+            // Validate that a Micronaut-compatible Grails BOM is applied as enforcedPlatform. The
+            // selected BOM is the single source of truth for the Micronaut platform version:
+            // applying it as enforcedPlatform pins io.micronaut.platform:micronaut-platform with a
+            // strict constraint that no transitive can override.
             validateMicronautBom(project)
 
         }
@@ -665,7 +668,7 @@ ${importStatements}
         }
 
         // Exactly one Grails BOM is ever applied (the BOMs are split by integration:
-        // default / hibernate5 / micronaut). A Micronaut project selects the Micronaut
+        // default / hibernate / micronaut). A Micronaut project selects the Micronaut
         // variant either by setting grails { bom = 'grails-micronaut-bom' } (auto-applied
         // as an enforcedPlatform by applyGrailsBom) or by opting out via grails { bom = null }
         // and declaring enforcedPlatform(grails-micronaut-bom) by hand. Either way the