Upgrade to Spring Boot 4.0.5 and Spring Framework 7.0.6

.agents/skills/grails-developer/SKILL.md

@@ -46,8 +46,8 @@ Activate this skill when developing with Grails 7, including:
 ## Technology Stack
 
 Grails 7 is built on:
-- **Spring Boot**: 3.5.x
-- **Spring Framework**: 6.2.x
+- **Spring Boot**: 4.0.x
+- **Spring Framework**: 7.0.x
 - **Groovy**: 4.0.x
 - **Gradle**: 8.14.x
 - **Spock**: 2.3-groovy-4.0

AGENTS.md

@@ -73,8 +73,8 @@ export GRADLE_OPTS="-Xms2G -Xmx5G"
 |-----------|---------|
 | JDK | 17+ (baseline 17) |
 | Groovy | 4.0.x |
-| Spring Boot | 3.5.x |
-| Spring Framework | 6.2.x |
+| Spring Boot | 4.0.x |
+| Spring Framework | 7.0.x |
 | Spock | 2.3-groovy-4.0 |
 | Gradle | 8.14.x |
 | Jakarta EE | 10 |

build-logic/docs-core/build.gradle

@@ -58,7 +58,7 @@ dependencies {
 
     testImplementation "org.codehaus.groovy:groovy-test-junit5:${GroovySystem.version}"
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.12.2'
-    testImplementation 'org.junit.platform:junit-platform-runner:1.12.2'
+    testImplementation 'org.junit.platform:junit-platform-suite:1.12.2'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.2'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.12.2'
 }

build.gradle

@@ -74,6 +74,14 @@ subprojects {
             def cacheHours = isCiBuild || isReproducibleBuild ? 0 : 24
             cacheDynamicVersionsFor(cacheHours, 'hours')
             cacheChangingModulesFor(cacheHours, 'hours')
+
+            // Force Groovy 4.0.31 to override Spring Boot 4.0.5's default of Groovy 5.0.4
+            // This ensures all grails-core modules are compiled with the correct Groovy version
+            force 'org.apache.groovy:groovy:4.0.31'
+            force 'org.apache.groovy:groovy-templates:4.0.31'
+            force 'org.apache.groovy:groovy-xml:4.0.31'
+            force 'org.apache.groovy:groovy-json:4.0.31'
+            force 'org.apache.groovy:groovy-sql:4.0.31'
         }
     }
 }

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.11',
+            'spring-boot.version'           : '4.0.5',
     ]
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
@@ -48,22 +48,23 @@ ext {
 
     // Note: the name of the dependency must be the prefix of the property name so properties in the pom are resolved correctly
     gradleBomDependencies = [
-            'ant'                   : "org.apache.ant:ant:${gradleBomDependencyVersions['ant.version']}",
-            'ant-junit'             : "org.apache.ant:ant-junit:${gradleBomDependencyVersions['ant.version']}",
-            'asciidoctor-gradle-jvm': "org.asciidoctor:asciidoctor-gradle-jvm:${gradleBomDependencyVersions['asciidoctor-gradle-jvm.version']}",
-            'asciidoctorj'          : "org.asciidoctor:asciidoctorj:${gradleBomDependencyVersions['asciidoctorj.version']}",
-            'asset-pipeline-gradle' : "cloud.wondrify:asset-pipeline-gradle:${gradleBomDependencyVersions['asset-pipeline-gradle.version']}",
-            'byte-buddy'            : "net.bytebuddy:byte-buddy:${gradleBomDependencyVersions['byte-buddy.version']}",
-            'commons-text'          : "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}",
-            'directory-watcher'     : "io.methvin:directory-watcher:${gradleBomDependencyVersions['directory-watcher.version']}",
-            'grails-publish-plugin' : "org.apache.grails.gradle:grails-publish:${gradleBomDependencyVersions['grails-publish-plugin.version']}",
-            'jansi'                 : "org.fusesource.jansi:jansi:${gradleBomDependencyVersions['jansi.version']}",
-            'javaparser-core'       : "com.github.javaparser:javaparser-core:${gradleBomDependencyVersions['javaparser-core.version']}",
-            'jline'                 : "jline:jline:${gradleBomDependencyVersions['jline.version']}",
-            'jna'                   : "net.java.dev.jna:jna:${gradleBomDependencyVersions['jna.version']}",
-            'objenesis'             : "org.objenesis:objenesis:${gradleBomDependencyVersions['objenesis.version']}",
-            'spring-boot-cli'       : "org.springframework.boot:spring-boot-cli:${gradleBomDependencyVersions['spring-boot.version']}",
-            'spring-boot-gradle'    : "org.springframework.boot:spring-boot-gradle-plugin:${gradleBomDependencyVersions['spring-boot.version']}",
+            'ant'                    : "org.apache.ant:ant:${gradleBomDependencyVersions['ant.version']}",
+            'ant-junit'              : "org.apache.ant:ant-junit:${gradleBomDependencyVersions['ant.version']}",
+            'asciidoctorj-gradle-jvm': "org.asciidoctor:asciidoctor-gradle-jvm:${gradleBomDependencyVersions['asciidoctor-gradle-jvm.version']}",
+            'asciidoctorj'           : "org.asciidoctor:asciidoctorj:${gradleBomDependencyVersions['asciidoctorj.version']}",
+            'asset-pipeline-gradle'  : "cloud.wondrify:asset-pipeline-gradle:${gradleBomDependencyVersions['asset-pipeline-gradle.version']}",
+            'byte-buddy'             : "net.bytebuddy:byte-buddy:${gradleBomDependencyVersions['byte-buddy.version']}",
+            'commons-text'           : "org.apache.commons:commons-text:${gradleBomDependencyVersions['commons-text.version']}",
+            'directory-watcher'      : "io.methvin:directory-watcher:${gradleBomDependencyVersions['directory-watcher.version']}",
+            'grails-publish-plugin'  : "org.apache.grails.gradle:grails-publish:${gradleBomDependencyVersions['grails-publish-plugin.version']}",
+            'jansi'                  : "org.fusesource.jansi:jansi:${gradleBomDependencyVersions['jansi.version']}",
+            'javaparser-core'        : "com.github.javaparser:javaparser-core:${gradleBomDependencyVersions['javaparser-core.version']}",
+            'jline'                  : "jline:jline:${gradleBomDependencyVersions['jline.version']}",
+            'jna'                    : "net.java.dev.jna:jna:${gradleBomDependencyVersions['jna.version']}",
+            'objenesis'              : "org.objenesis:objenesis:${gradleBomDependencyVersions['objenesis.version']}",
+            'spring-boot-cli'        : "org.springframework.boot:spring-boot-cli:${gradleBomDependencyVersions['spring-boot.version']}",
+            'spring-boot-gradle'     : "org.springframework.boot:spring-boot-gradle-plugin:${gradleBomDependencyVersions['spring-boot.version']}",
+            'spring-boot-loader-tools': "org.springframework.boot:spring-boot-loader-tools:${gradleBomDependencyVersions['spring-boot.version']}",
     ]
 
     bomDependencyVersions = [
@@ -73,7 +74,7 @@ ext {
             'commons-codec.version'       : '1.18.0',
             'commons-lang3.version'       : '3.20.0',
             'geb-spock.version'           : '8.0.1',
-            'groovy.version'              : '4.0.30',
+            'groovy.version'              : '4.0.31',
             'jackson.version'             : '2.19.1',
             'jquery.version'              : '3.7.1',
             'liquibase-hibernate5.version': '4.27.0',

grails-bom/build.gradle

@@ -224,6 +224,15 @@ ext {
             for (Map.Entry<String, String> property : pomProperties.entrySet()) {
                 propertiesNode.appendNode(property.key, property.value)
             }
+
+            // Override Spring Boot's groovy.version property with Grails' version
+            // Spring Boot 4.0.5 defaults to Groovy 5.0.4, but Grails 8.0.x uses Groovy 4.0.31
+            def groovyVersionNode = propertiesNode.'groovy.version'
+            if (groovyVersionNode) {
+                groovyVersionNode[0].value = bomDependencyVersions['groovy.version']
+            } else {
+                propertiesNode.appendNode('groovy.version', bomDependencyVersions['groovy.version'])
+            }
         }
     }
 }

grails-bootstrap/build.gradle

@@ -62,7 +62,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
 
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

grails-codecs-core/build.gradle

@@ -40,7 +40,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
 
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

grails-codecs/build.gradle

@@ -50,7 +50,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
 
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

grails-common/build.gradle

@@ -50,7 +50,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
     testImplementation 'org.slf4j:slf4j-simple'
     testImplementation 'org.spockframework:spock-core', {
         transitive = false

grails-console/build.gradle

@@ -53,7 +53,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
 
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

grails-controllers/build.gradle

@@ -43,6 +43,8 @@ dependencies {
 
     api 'org.apache.groovy:groovy'
     api 'org.springframework.boot:spring-boot-autoconfigure'
+    api 'org.springframework.boot:spring-boot-webmvc'
+    api 'org.springframework.boot:spring-boot-servlet'
     compileOnlyApi 'jakarta.servlet:jakarta.servlet-api'
 
     runtimeOnly project(':grails-i18n')
@@ -60,7 +62,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
 
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

grails-controllers/src/main/groovy/org/grails/plugins/web/controllers/ControllersAutoConfiguration.java

@@ -29,11 +29,11 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.web.servlet.DispatcherServletRegistrationBean;
-import org.springframework.boot.autoconfigure.web.servlet.HttpEncodingAutoConfiguration;
-import org.springframework.boot.autoconfigure.web.servlet.WebMvcAutoConfiguration;
+import org.springframework.boot.servlet.autoconfigure.HttpEncodingAutoConfiguration;
+import org.springframework.boot.servlet.filter.OrderedCharacterEncodingFilter;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.boot.web.servlet.filter.OrderedCharacterEncodingFilter;
+import org.springframework.boot.webmvc.autoconfigure.DispatcherServletRegistrationBean;
+import org.springframework.boot.webmvc.autoconfigure.WebMvcAutoConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.util.ClassUtils;

grails-converters/build.gradle

@@ -59,7 +59,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
 
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

grails-core/build.gradle

@@ -50,6 +50,10 @@ dependencies {
     api 'org.springframework:spring-context'
     api 'org.springframework.boot:spring-boot-autoconfigure'
 
+    implementation 'org.springframework.boot:spring-boot-web-server', {
+        // impl: WebServerApplicationContext
+    }
+
     compileOnly 'org.springframework:spring-test'
     compileOnly 'org.apache.groovy:groovy-templates'
 
@@ -68,7 +72,7 @@ dependencies {
 
     testImplementation 'org.apache.groovy:groovy-test-junit5'
     testImplementation 'org.junit.jupiter:junit-jupiter-api'
-    testImplementation 'org.junit.platform:junit-platform-runner'
+    testImplementation 'org.junit.platform:junit-platform-suite'
 
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine'
 

grails-core/src/main/groovy/grails/boot/GrailsApp.groovy

@@ -28,7 +28,7 @@ import org.codehaus.groovy.control.CompilationUnit
 import org.codehaus.groovy.control.CompilerConfiguration
 
 import org.springframework.boot.SpringApplication
-import org.springframework.boot.web.context.WebServerApplicationContext
+import org.springframework.boot.web.server.context.WebServerApplicationContext
 import org.springframework.context.ConfigurableApplicationContext
 import org.springframework.core.env.ConfigurableEnvironment
 import org.springframework.core.io.ResourceLoader

grails-core/src/main/groovy/grails/config/external/ExternalConfigRunListener.groovy

@@ -26,7 +26,7 @@ import java.nio.file.Path
 import groovy.transform.CompileStatic
 import groovy.util.logging.Slf4j
 
-import org.springframework.boot.ConfigurableBootstrapContext
+import org.springframework.boot.bootstrap.ConfigurableBootstrapContext
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.SpringApplicationRunListener
 import org.springframework.boot.env.PropertiesPropertySourceLoader

grails-core/src/main/groovy/org/grails/compiler/injection/ApplicationClassInjector.groovy

@@ -64,7 +64,7 @@ class ApplicationClassInjector implements GrailsArtefactClassInjector {
     public static final List<String> EXCLUDED_AUTO_CONFIGURE_CLASSES = [
             'org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration',
             'org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration',
-            'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration'
+            'org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration'
     ]
 
     /**

grails-core/src/test/groovy/org/grails/compiler/injection/ApplicationClassInjectorSpec.groovy

@@ -34,7 +34,7 @@ class ApplicationClassInjectorSpec extends Specification {
         className << [
             'org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration',
             'org.springframework.boot.autoconfigure.reactor.ReactorAutoConfiguration',
-            'org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration'
+            'org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration'
         ]
     }
 

grails-data-graphql/examples/spring-boot-app/src/main/groovy/com/example/demo/DemoApplication.groovy

@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.SpringApplication
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration
 import org.springframework.boot.autoconfigure.SpringBootApplication
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
+import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.ComponentScan
 

grails-data-hibernate5/boot-plugin/build.gradle

@@ -40,17 +40,22 @@ dependencies {
     // TODO: Clarify and clean up dependencies
     implementation platform(project(':grails-bom'))
 
+    api project(":grails-data-hibernate5-core")
+    api "org.apache.groovy:groovy"
+    api "org.springframework.boot:spring-boot-autoconfigure"
+
     compileOnly project(':grails-shell-cli'), {
         exclude group:'org.apache.groovy', module:'groovy'
     }
-    api "org.apache.groovy:groovy"
-    api "org.springframework.boot:spring-boot-autoconfigure"
-    api project(":grails-data-hibernate5-core")
+    compileOnly "org.springframework.boot:spring-boot-jdbc"
+    compileOnly "org.springframework.boot:spring-boot-hibernate"
 
     testImplementation project(':grails-shell-cli'), {
         exclude group:'org.apache.groovy', module:'groovy'
     }
     testImplementation "org.spockframework:spock-core"
+    testImplementation "org.springframework.boot:spring-boot-jdbc"
+    testImplementation "org.springframework.boot:spring-boot-hibernate"
 
     testRuntimeOnly "org.apache.tomcat:tomcat-jdbc"
     testRuntimeOnly "com.h2database:h2"

grails-data-hibernate5/boot-plugin/src/main/groovy/org/grails/datastore/gorm/boot/autoconfigure/HibernateGormAutoConfiguration.groovy

@@ -33,8 +33,8 @@ import org.springframework.boot.autoconfigure.AutoConfigureBefore
 import org.springframework.boot.autoconfigure.condition.ConditionalOnBean
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
+import org.springframework.boot.hibernate.autoconfigure.HibernateJpaAutoConfiguration
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContextAware
 import org.springframework.context.ConfigurableApplicationContext

grails-data-hibernate5/boot-plugin/src/test/groovy/org/grails/datastore/gorm/boot/autoconfigure/HibernateGormAutoConfigurationSpec.groovy

@@ -22,8 +22,6 @@ import grails.gorm.annotation.Entity
 import org.springframework.beans.factory.support.DefaultListableBeanFactory
 import org.springframework.boot.autoconfigure.AutoConfigurationPackages
 import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration
-import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties
-import org.springframework.boot.autoconfigure.jdbc.EmbeddedDataSourceConfiguration
 import org.springframework.context.annotation.AnnotationConfigApplicationContext
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Import

grails-data-hibernate5/core/build.gradle

@@ -45,6 +45,8 @@ dependencies {
     api 'org.apache.groovy:groovy'
     api project(':grails-datamapping-core')
     api 'org.springframework:spring-orm'
+    api 'org.springframework:spring-web'
+    compileOnly 'jakarta.servlet:jakarta.servlet-api'
     api "org.hibernate:hibernate-core-jakarta:$hibernate5Version", {
         exclude group:'commons-logging', module:'commons-logging'
         exclude group:'com.h2database', module:'h2'
@@ -91,3 +93,8 @@ apply {
     from rootProject.layout.projectDirectory.file('gradle/grails-data-tck-config.gradle')
     from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
 }
+
+tasks.named('checkstyleMain', Checkstyle) {
+    // Exclude copied Spring Framework classes from checkstyle (they follow Spring's code style)
+    exclude('**/org/grails/orm/hibernate/support/hibernate5/**')
+}

grails-data-hibernate5/core/src/main/groovy/grails/orm/HibernateCriteriaBuilder.java

@@ -38,7 +38,6 @@
 import org.hibernate.type.StandardBasicTypes;
 import org.hibernate.type.Type;
 
-import org.springframework.orm.hibernate5.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 
 import org.grails.datastore.gorm.query.criteria.AbstractDetachedCriteria;
@@ -51,6 +50,7 @@
 import org.grails.orm.hibernate.query.AbstractHibernateQuery;
 import org.grails.orm.hibernate.query.HibernateProjectionAdapter;
 import org.grails.orm.hibernate.query.HibernateQuery;
+import org.grails.orm.hibernate.support.hibernate5.SessionHolder;
 
 /**
  * <p>Wraps the Hibernate Criteria API in a builder. The builder can be retrieved through the "createCriteria()" dynamic static

grails-data-hibernate5/core/src/main/groovy/org/grails/orm/hibernate/GrailsHibernateTemplate.java

@@ -65,12 +65,13 @@
 import org.springframework.jdbc.datasource.TransactionAwareDataSourceProxy;
 import org.springframework.jdbc.support.SQLErrorCodeSQLExceptionTranslator;
 import org.springframework.jdbc.support.SQLExceptionTranslator;
-import org.springframework.orm.hibernate5.SessionFactoryUtils;
-import org.springframework.orm.hibernate5.SessionHolder;
 import org.springframework.transaction.support.TransactionSynchronization;
 import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.Assert;
 
+import org.grails.orm.hibernate.support.hibernate5.SessionFactoryUtils;
+import org.grails.orm.hibernate.support.hibernate5.SessionHolder;
+
 public class GrailsHibernateTemplate implements IHibernateTemplate {
 
     private static final Logger LOG = LoggerFactory.getLogger(GrailsHibernateTemplate.class);