[Canary] Grails 8 on Groovy 6.0.0-SNAPSHOT

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

@@ -111,6 +111,7 @@ class CompilePlugin implements Plugin<Project> {
                 it.options.encoding = StandardCharsets.UTF_8.name()
                 it.options.fork = true
                 it.options.forkOptions.jvmArgs = ['-Xms128M', '-Xmx2G']
+                it.options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
                 if (System.getenv('SUPPRESS_DEPRECATION_WARNINGS') == 'true') {
                     it.options.compilerArgs += ['-Xlint:-removal']
                 }

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

@@ -91,24 +91,32 @@ class SbomPlugin implements Plugin<Project> {
             'pkg:maven/com.oracle.coherence.ce/[email protected]?type=pom': 'UPL-1.0', // does not have map based on license id
             'pkg:maven/com.oracle.coherence.ce/[email protected]?type=pom': 'UPL-1.0', // does not have map based on license id
             'pkg:maven/com.oracle.coherence.ce/[email protected]?type=pom': 'UPL-1.0', // does not have map based on license id
-            'pkg:maven/jline/[email protected]?type=jar'                           : 'BSD-2-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
+            'pkg:maven/jline/[email protected]?type=jar'                           : 'BSD-2-Clause', // legacy jline:jline group, BSD-2; maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
             'pkg:maven/opensymphony/[email protected]?type=jar'                  : 'OpenSymphony', // custom license approved by legal LEGAL-707
             'pkg:maven/org.antlr/[email protected]?type=jar'               : 'BSD-3-Clause', // maps incorrectly because of https://github.com/CycloneDX/cyclonedx-core-java/issues/205
-            'pkg:maven/org.jline/[email protected]?type=jar'                       : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'                       : 'BSD-3-Clause', // direct dependency declared at jline.version in dependencies.gradle
-            'pkg:maven/org.jline/[email protected]?type=jar'              : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'               : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'                : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'                : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'                 : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'              : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'        : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'          : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
-            'pkg:maven/org.jline/[email protected]?type=jar'          : 'BSD-3-Clause', // jline group resolved at 3.30.9 transitively via groovy-groovysh; main org.jline:jline pinned at 3.30.6 directly
             'pkg:maven/org.jruby/[email protected]?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/[email protected]?type=jar': 'Apache-2.0', // maps incorrectly because of https://github.com/liquibase/liquibase/issues/2445 & the base pom does not define a license
     ]
 
+    /**
+     * Group-level license overrides applied AFTER {@link #LICENSE_MAPPING} fails to match.
+     * The key is a purl prefix (e.g. {@code 'pkg:maven/org.jline/'}) and the value is the
+     * SPDX license id to force for any artifact whose bomRef starts with that prefix.
+     *
+     * This exists for groups that:
+     * (a) have a stable license across all artifacts and versions, AND
+     * (b) suffer from cyclonedx-core-java#205 (license is misreported), AND
+     * (c) are pulled transitively by SNAPSHOT dependencies (e.g. groovy-groovysh ->
+     *     org.jline:* drifts on every Groovy SNAPSHOT bump), making per-version entries
+     *     unmaintainable.
+     *
+     * Only add a group entry when ALL three conditions hold. Per-version entries in
+     * {@link #LICENSE_MAPPING} should still be preferred for one-off overrides.
+     */
+    private static Map<String, String> LICENSE_GROUP_MAPPING = [
+            'pkg:maven/org.jline/': 'BSD-3-Clause', // entire org.jline group is BSD-3-Clause; cyclonedx misreports it (cyclonedx-core-java#205) and versions drift via groovy-groovysh on every SNAPSHOT bump
+    ]
+
     // we don't distribute these so these licenses are considered acceptable, but we still prefer ASF licenses.
     // Require a whitelist of any case of category X licenses to prevent accidental inclusion in a distributed artifact
     // this list will need to be updated anytime we change versions so we can revise the licenses
@@ -328,6 +336,21 @@ class SbomPlugin implements Plugin<Project> {
             return licenseBlock
         }
 
+        // Fallback: group-level override matched by purl prefix. See LICENSE_GROUP_MAPPING
+        // for criteria (stable license + cyclonedx misreport + SNAPSHOT version drift).
+        def groupOverride = LICENSE_GROUP_MAPPING.find { prefix, _ -> bomRef.startsWith(prefix) }
+        if (groupOverride) {
+            def licenseId = groupOverride.value
+            logger.lifecycle('Forcing license for {} to {} via group rule {}', bomRef, licenseId, groupOverride.key)
+
+            def licenseBlock = LICENSES[licenseId]
+            if (!licenseBlock) {
+                throw new GradleException("Cannot find license information for id ${licenseId} to use for bomRef ${bomRef} in project ${projectName}")
+            }
+
+            return licenseBlock
+        }
+
         if (!(licenseChoices instanceof List) || licenseChoices.isEmpty()) {
             throw new GradleException("No License was found for dependency: ${bomRef} in project ${projectName}")
         }

dependencies.gradle

@@ -78,7 +78,7 @@ ext {
             'commons-codec.version'       : '1.21.0',
             'commons-lang3.version'       : '3.20.0',
             'geb-spock.version'           : '8.0.1',
-            'groovy.version'              : '5.0.6-SNAPSHOT',
+            'groovy.version'              : '6.0.0-SNAPSHOT',
             'jquery.version'              : '3.7.1',
             'liquibase-hibernate5.version': '4.27.0',
             'mongodb.version'             : '5.6.4',

gradle/functional-test-config.gradle

@@ -54,11 +54,7 @@ configurations.configureEach {
     }
 }
 
-tasks.named('compileTestGroovy') {
-    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
-}
-
-tasks.named('compileGroovy') {
+tasks.withType(GroovyCompile).configureEach {
     options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
 }
 

gradle/hibernate5-test-config.gradle

@@ -26,6 +26,10 @@ dependencies {
     add('testRuntimeOnly', 'org.objenesis:objenesis')
 }
 
+tasks.withType(GroovyCompile).configureEach {
+    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
+}
+
 tasks.withType(Test).configureEach {
     onlyIf {
         ![

gradle/mongodb-forked-test-config.gradle

@@ -26,6 +26,10 @@ dependencies {
     add('testRuntimeOnly', 'org.objenesis:objenesis')
 }
 
+tasks.withType(GroovyCompile).configureEach {
+    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
+}
+
 tasks.named('compileTestGroovy', GroovyCompile) {
     groovyOptions.forkOptions.jvmArgs = ['-Xmx768m']
 }

gradle/mongodb-test-config.gradle

@@ -26,6 +26,10 @@ dependencies {
     add('testRuntimeOnly', 'org.objenesis:objenesis')
 }
 
+tasks.withType(GroovyCompile).configureEach {
+    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
+}
+
 tasks.named('compileTestGroovy', GroovyCompile) {
     groovyOptions.forkOptions.jvmArgs = ['-Xmx768m']
 }

gradle/test-config.gradle

@@ -35,11 +35,12 @@ dependencies {
     add('testRuntimeOnly', 'org.objenesis:objenesis')
 }
 
-tasks.named('compileTestGroovy') {
-    options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
-}
-
-tasks.named('compileGroovy') {
+// Disable Spock's compile-time Groovy version check on ALL Groovy compile
+// tasks. Spock's SpockTransform is registered via META-INF services and
+// the Groovy compiler loads every AST transform on the classpath, so even
+// main source sets trip the version check when Groovy is newer than the
+// Spock artifact's groovy variant.
+tasks.withType(GroovyCompile).configureEach {
     options.forkOptions.jvmArgs += ['-Dspock.iKnowWhatImDoing.disableGroovyVersionCheck=true']
 }
 

grails-controllers/src/main/groovy/org/grails/compiler/web/ControllerActionTransformer.java

@@ -73,7 +73,6 @@
 import org.codehaus.groovy.classgen.GeneratorContext;
 import org.codehaus.groovy.control.CompilationUnit;
 import org.codehaus.groovy.control.SourceUnit;
-import org.codehaus.groovy.runtime.DefaultGroovyMethods;
 import org.codehaus.groovy.syntax.Token;
 import org.codehaus.groovy.syntax.Types;
 import org.codehaus.groovy.transform.trait.Traits;
@@ -267,12 +266,12 @@ private void processMethods(ClassNode classNode, SourceUnit source,
             if (methodShouldBeConfiguredAsControllerAction(method)) {
                 final List<MethodNode> declaredMethodsWithThisName = classNode.getDeclaredMethods(method.getName());
                 if (declaredMethodsWithThisName != null) {
-                    final int numberOfNonExceptionHandlerMethodsWithThisName = DefaultGroovyMethods.count((Iterable) declaredMethodsWithThisName, new Closure(this) {
-                        @Override
-                        public Object call(Object object) {
-                            return !isExceptionHandlingMethod((MethodNode) object);
+                    int numberOfNonExceptionHandlerMethodsWithThisName = 0;
+                    for (MethodNode candidate : declaredMethodsWithThisName) {
+                        if (!isExceptionHandlingMethod(candidate)) {
+                            numberOfNonExceptionHandlerMethodsWithThisName++;
                         }
-                    }).intValue();
+                    }
                     if (numberOfNonExceptionHandlerMethodsWithThisName > 1) {
                         String message = "Controller actions may not be overloaded.  The [" +
                                 method.getName() +

grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/GormEntity.groovy

@@ -39,6 +39,7 @@ import org.grails.datastore.mapping.model.types.ToOne
 import org.grails.datastore.mapping.query.api.BuildableCriteria
 import org.grails.datastore.mapping.query.api.Criteria
 import org.grails.datastore.mapping.reflect.EntityReflector
+import org.codehaus.groovy.runtime.InvokerHelper
 
 /**
  *
@@ -591,12 +592,45 @@ trait GormEntity<D> implements GormValidateable, DirtyCheckable, GormEntityApi<D
 
     /**
      * Retrieves an object from the datastore. eg. Book.get(1)
+     *
+     * Groovy 6 (GROOVY-11829) relaxed {@code MetaClassImpl.isGenericGetMethod} to
+     * accept {@code get(Serializable)} as a generic property getter where Groovy 5
+     * required {@code get(String)}. Without the {@link #get(String)} overload below,
+     * every dynamic property access on a GORM entity (e.g. {@code Book.name},
+     * {@code Book.simpleName}) routes through this method instead of
+     * {@link Class#getName()}, breaking property resolution and triggering false
+     * "GORM not initialized" errors during class loading.
      */
     @Generated
     static D get(Serializable id) {
         currentGormStaticApi().get(id)
     }
 
+    /**
+     * Groovy 6 generic-property-getter overload (see GROOVY-11829). Resolves
+     * {@link Class} bean properties first, then falls back to GORM's
+     * {@code propertyMissing} (handles datasource qualifiers and dynamic GORM
+     * properties), and finally to {@link #get(Serializable)} for entity-by-ID
+     * lookups. Throws {@link MissingPropertyException} when nothing matches so
+     * Groovy's MOP can continue normal property resolution.
+     */
+    @Generated
+    static Object get(String nameOrId) {
+        MetaProperty mp = InvokerHelper.getMetaClass(Class).hasProperty(this, nameOrId)
+        if (mp != null) {
+            return mp.getProperty(this)
+        }
+        try {
+            return currentGormStaticApi().propertyMissing(nameOrId)
+        } catch (MissingPropertyException | IllegalStateException ignore) {
+            try {
+                return currentGormStaticApi().get((Serializable) nameOrId)
+            } catch (IllegalStateException e) {
+                throw new MissingPropertyException(nameOrId, this)
+            }
+        }
+    }
+
     /**
      * Retrieves an object from the datastore. eg. Book.read(1)
      *
@@ -854,6 +888,10 @@ trait GormEntity<D> implements GormValidateable, DirtyCheckable, GormEntityApi<D
      */
     @Generated
     static Object staticPropertyMissing(String property) {
+        MetaProperty mp = InvokerHelper.getMetaClass(Class).hasProperty(this, property)
+        if (mp != null) {
+            return mp.getProperty(this)
+        }
         try {
             currentGormStaticApi().propertyMissing(property)
         } catch (IllegalStateException e) {

grails-datamapping-core/src/main/groovy/org/grails/datastore/gorm/validation/constraints/MappingContextAwareConstraintFactory.groovy

@@ -35,7 +35,11 @@ class MappingContextAwareConstraintFactory extends DefaultConstraintFactory {
 
     final MappingContext mappingContext
 
-    MappingContextAwareConstraintFactory(Class<? extends Constraint> constraintClass, MessageSource messageSource, MappingContext mappingContext, List<Class> targetTypes = [Object]) {
+    MappingContextAwareConstraintFactory(Class<? extends Constraint> constraintClass, MessageSource messageSource, MappingContext mappingContext) {
+        this(constraintClass, messageSource, mappingContext, [Object] as List<Class>)
+    }
+
+    MappingContextAwareConstraintFactory(Class<? extends Constraint> constraintClass, MessageSource messageSource, MappingContext mappingContext, List<Class> targetTypes) {
         super(constraintClass, messageSource, targetTypes)
         this.mappingContext = mappingContext
     }

grails-datamapping-core/src/test/groovy/org/grails/compiler/gorm/GormEntityTransformSpec.groovy

@@ -217,6 +217,38 @@ class GormEntityTransformSpec extends Specification{
         thrown(MissingPropertyException)
     }
 
+    void 'test Groovy 6 genericGetMethod regression workaround (GROOVY-11829)'() {
+        expect: 'Class bean properties remain accessible via dynamic property access (the workaround target)'
+        Book.simpleName == 'Book'
+        Book.name.endsWith('Book')
+
+        and: 'the get(String) Groovy-6 compatibility overload exists and is @Generated'
+        def getStringMethod = Book.getMethod('get', String)
+        getStringMethod != null
+        getStringMethod.isAnnotationPresent(Generated)
+
+        and: 'the original get(Serializable) overload still exists for entity-by-id lookups'
+        def getSerializableMethod = Book.getMethod('get', Serializable)
+        getSerializableMethod != null
+        getSerializableMethod.isAnnotationPresent(Generated)
+    }
+
+    void 'test get(String) throws MissingPropertyException when GORM not initialized and string is not a Class property'() {
+        when: 'a name that is neither a Class property nor a known qualifier is passed'
+        Book.get('definitelyNotAClassPropertyOrEntityIdABCXYZ')
+
+        then: 'we do NOT leak the IllegalStateException raised by uninitialized GORM'
+        thrown(MissingPropertyException)
+    }
+
+    void 'test get(String) returns Class bean property when name matches Class property and GORM not initialized'() {
+        expect: 'explicit get("simpleName") returns the Class.simpleName because the Groovy 6 generic-getter workaround intercepts Class properties before delegating to the GORM static API'
+        Book.get('simpleName') == 'Book'
+
+        and: 'this is a documented behavior change vs Grails on Groovy 5: prior to GROOVY-11829, Book.get("simpleName") would call get(Serializable) and attempt an entity-by-id lookup. See GormEntity.get(String) docstring.'
+        Book.get('canonicalName') == Book.canonicalName
+    }
+
     void 'test that all GormEntity/GormValidateable trait methods are marked as Generated'() {
 
         expect: 'all GormEntity methods are marked as Generated on implementation class'

grails-datamapping-validation/src/main/groovy/org/grails/datastore/gorm/validation/constraints/factory/DefaultConstraintFactory.groovy

@@ -47,7 +47,11 @@ class DefaultConstraintFactory implements ConstraintFactory {
 
     protected final Constructor constraintConstructor
 
-    DefaultConstraintFactory(Class<? extends Constraint> constraintClass, MessageSource messageSource, List<Class> targetTypes = [Object]) {
+    DefaultConstraintFactory(Class<? extends Constraint> constraintClass, MessageSource messageSource) {
+        this(constraintClass, messageSource, [Object] as List<Class>)
+    }
+
+    DefaultConstraintFactory(Class<? extends Constraint> constraintClass, MessageSource messageSource, List<Class> targetTypes) {
         this.type = constraintClass
         this.name = Introspector.decapitalize(constraintClass.simpleName) - 'Constraint'
         this.messageSource = messageSource