Groovy 5.0.5 support for Grails 8 + Spring Boot 4

.gitattributes

@@ -0,0 +1,20 @@
+# Force LF line endings on checkout for all text files so that tools
+# like Spotless (which normalize to LF) do not report format violations
+# on systems where git is configured with core.autocrlf=true.
+* text=auto eol=lf
+
+# Files that must always have CRLF line endings on checkout
+*.bat text eol=crlf
+*.cmd text eol=crlf
+
+# Binary files (no line ending normalization)
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.ico binary
+*.jar binary
+*.zip binary
+*.gz binary
+*.tgz binary
+*.pdf binary

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/CompilePlugin.groovy

@@ -33,6 +33,7 @@ import org.gradle.api.tasks.bundling.Jar
 import org.gradle.api.tasks.compile.GroovyCompile
 import org.gradle.api.tasks.compile.JavaCompile
 import org.gradle.api.tasks.javadoc.Javadoc
+import org.gradle.api.tasks.testing.Test
 import org.gradle.external.javadoc.StandardJavadocDocletOptions
 
 import static org.apache.grails.buildsrc.GradleUtils.lookupPropertyByType
@@ -114,6 +115,9 @@ class CompilePlugin implements Plugin<Project> {
                     it.options.compilerArgs += ['-Xlint:-removal']
                 }
             }
+            project.tasks.withType(Test).configureEach {
+                it.jvmArgs('-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true')
+            }
         }
     }
 

build-logic/plugins/src/main/groovy/org/apache/grails/buildsrc/SbomPlugin.groovy

@@ -88,15 +88,25 @@ class SbomPlugin implements Plugin<Project> {
     ]
 
     private static Map<String, String> LICENSE_MAPPING = [
-            'pkg:maven/org.antlr/antlr4-runtime@4.7.2?type=jar'               : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
-            'pkg:maven/jline/jline@2.14.6?type=jar'                           : 'BSD-2-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
-            'pkg:maven/org.jline/jline@3.23.0?type=jar'                       : 'BSD-2-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
-            'pkg:maven/org.liquibase.ext/liquibase-hibernate5@4.27.0?type=jar': 'Apache-2.0', // maps incorrectly because of https://github.com/liquibase/liquibase/issues/2445 & the base pom does not define a license
             'pkg:maven/com.oracle.coherence.ce/coherence-bom@25.03.1?type=pom': 'UPL-1.0', // does not have map based on license id
             'pkg:maven/com.oracle.coherence.ce/coherence-bom@25.03.2?type=pom': 'UPL-1.0', // does not have map based on license id
             'pkg:maven/com.oracle.coherence.ce/coherence-bom@22.06.2?type=pom': 'UPL-1.0', // does not have map based on license id
+            'pkg:maven/jline/jline@2.14.6?type=jar'                           : 'BSD-2-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
             'pkg:maven/opensymphony/sitemesh@2.6.0?type=jar'                  : 'OpenSymphony', // custom license approved by legal LEGAL-707
-            'pkg:maven/org.jruby/jzlib@1.1.5?type=jar'                        : 'BSD-3-Clause'// https://web.archive.org/web/20240822213507/http://www.jcraft.com/jzlib/LICENSE.txt shows it's a 3 clause
+            'pkg:maven/org.antlr/antlr4-runtime@4.7.2?type=jar'               : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jansi@3.30.9?type=jar'                       : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline@3.23.0?type=jar'                       : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-builtins@3.30.9?type=jar'              : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-console@3.30.9?type=jar'               : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-native@3.30.9?type=jar'                : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-reader@3.30.9?type=jar'                : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-style@3.30.9?type=jar'                 : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-terminal@3.30.9?type=jar'              : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-terminal-jansi@3.30.9?type=jar'        : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-terminal-jna@3.30.9?type=jar'          : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jline/jline-terminal-jni@3.30.9?type=jar'          : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/org.jruby/jzlib@1.1.5?type=jar'                        : 'BSD-3-Clause', // https://web.archive.org/web/20240822213507/http://www.jcraft.com/jzlib/LICENSE.txt shows it's a 3 clause
+            'pkg:maven/org.liquibase.ext/liquibase-hibernate5@4.27.0?type=jar': 'Apache-2.0', // maps incorrectly because of https://github.com/liquibase/liquibase/issues/2445 & the base pom does not define a license
     ]
 
     // we don't distribute these so these licenses are considered acceptable, but we still prefer ASF licenses.

dependencies.gradle

@@ -74,16 +74,15 @@ ext {
             'commons-codec.version'       : '1.18.0',
             'commons-lang3.version'       : '3.20.0',
             'geb-spock.version'           : '8.0.1',
-            'groovy.version'              : '4.0.31',
-
+            'groovy.version'              : '5.0.5',
             'jquery.version'              : '3.7.1',
             'liquibase-hibernate5.version': '4.27.0',
             'mongodb.version'             : '5.5.1',
             'rxjava.version'              : '1.3.8',
             'rxjava2.version'             : '2.2.21',
             'rxjava3.version'             : '3.1.11',
             'selenium.version'            : '4.38.0',
-            'spock.version'               : '2.3-groovy-4.0',
+            'spock.version'               : '2.4-groovy-5.0',
             'sitemesh.version'            : '2.6.0',
             'starter-sitemesh.version'    : '3.2.2',
     ]

gradle.properties

@@ -58,7 +58,7 @@ micronautPlatformVersion=5.0.0-M1
 
 # Libraries only specific to test apps, these should not be exposed
 ersatzVersion=4.0.1
-grailsSpringSecurityVersion=7.0.2-SNAPSHOT
+grailsSpringSecurityVersion=7.0.1
 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

gradle/functional-test-config.gradle

@@ -54,11 +54,22 @@ configurations.configureEach {
     }
 }
 
+tasks.named('compileTestGroovy') {
+    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
+}
+
+tasks.named('compileGroovy') {
+    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
+}
+
 List<String> debugArguments = [
         '-Xmx2g', '-Xdebug', '-Xnoagent', '-Djava.compiler=NONE',
         '-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005'
 ]
 tasks.withType(Test).configureEach { Test task ->
+
+    systemProperty('spock.iKnowWhatImDoing.disableGroovyVersionCheck', 'true')
+
     boolean isHibernate5 = !project.name.startsWith('grails-test-examples-hibernate5')
     boolean isMongo = !project.name.startsWith('grails-test-examples-mongodb')
 

gradle/hibernate5-test-config.gradle

@@ -20,6 +20,10 @@
 dependencies {
     // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
     add('testRuntimeOnly', 'org.junit.platform:junit-platform-launcher')
+    // Required by Spock 2.4 to mock concrete classes (byte-buddy/objenesis are
+    // not transitive from spock-core in this configuration).
+    add('testRuntimeOnly', 'net.bytebuddy:byte-buddy')
+    add('testRuntimeOnly', 'org.objenesis:objenesis')
 }
 
 tasks.withType(Test).configureEach {

gradle/mongodb-forked-test-config.gradle

@@ -20,6 +20,10 @@
 dependencies {
     // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
     add('testRuntimeOnly', 'org.junit.platform:junit-platform-launcher')
+    // Required by Spock 2.4 to mock concrete classes (byte-buddy/objenesis are
+    // not transitive from spock-core in this configuration).
+    add('testRuntimeOnly', 'net.bytebuddy:byte-buddy')
+    add('testRuntimeOnly', 'org.objenesis:objenesis')
 }
 
 tasks.named('compileTestGroovy', GroovyCompile) {

gradle/mongodb-test-config.gradle

@@ -20,6 +20,10 @@
 dependencies {
     // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
     add('testRuntimeOnly', 'org.junit.platform:junit-platform-launcher')
+    // Required by Spock 2.4 to mock concrete classes (byte-buddy/objenesis are
+    // not transitive from spock-core in this configuration).
+    add('testRuntimeOnly', 'net.bytebuddy:byte-buddy')
+    add('testRuntimeOnly', 'org.objenesis:objenesis')
 }
 
 tasks.named('compileTestGroovy', GroovyCompile) {

gradle/rat-root-config.gradle

@@ -51,6 +51,8 @@ tasks.named('rat') {
             'grails-fields/grails-app/views/templates/_fields/*.gsp', // template files that people are expected to use in the end application
             'grails-geb/src/main/templates/*.groovy', // template files that people are expected to use in the end application
             'grails-doc/src/en/ref/Versions/Grails BOM.adoc', // exclude generated data
+            'grails-doc/src/en/ref/Versions/Grails BOM Hibernate5.adoc', // exclude generated data
+            'grails-doc/src/en/ref/Versions/Grails BOM Hibernate7.adoc', // exclude generated data
             'grails-profiles/**/templates/**', // template files that people are expected to use in the end application
             'grails-profiles/**/commands/**', // template files that people are expected to use in the end application
             'grails-profiles/**/features/**', // template files that people are expected to use in the end application

gradle/test-config.gradle

@@ -29,6 +29,18 @@ def java17moduleReflectionCompatibilityArguments = [
 dependencies {
     // https://docs.gradle.org/8.3/userguide/upgrading_version_8.html#test_framework_implementation_dependencies
     add('testRuntimeOnly', 'org.junit.platform:junit-platform-launcher')
+    // Required by Spock 2.4 to mock concrete classes (byte-buddy/objenesis are
+    // not transitive from spock-core in this configuration).
+    add('testRuntimeOnly', 'net.bytebuddy:byte-buddy')
+    add('testRuntimeOnly', 'org.objenesis:objenesis')
+}
+
+tasks.named('compileTestGroovy') {
+    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
+}
+
+tasks.named('compileGroovy') {
+    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
 }
 
 // Disable build cache for Groovy compilation in CI to ensure AST transformations are always applied.
@@ -46,6 +58,7 @@ tasks.withType(Test).configureEach {
     // Disable build cache for tests in CI to ensure they always run
     outputs.cacheIf { !isCiBuild }
 
+    systemProperty('spock.iKnowWhatImDoing.disableGroovyVersionCheck', 'true')
     onlyIf {
         ![
                 'onlyFunctionalTests',