More adjustments for github groovy-joint-workflow

build.gradle

@@ -10,8 +10,7 @@ buildscript {
 }
 
 ext {
-    // https://github.com/grails/grails-data-mapping/actions/runs/10528294929/job/29180566819
-    groovyVersion = /*System.getenv('CI_GROOVY_VERSION') ?:*/ project.groovyVersion
+    groovyVersion = System.getenv('CI_GROOVY_VERSION') ?: project.groovyVersion
     // overall project version
     isCiBuild = System.getenv().get("CI") as Boolean
     isSnapshot = project.projectVersion.endsWith("-SNAPSHOT")
@@ -61,8 +60,8 @@ allprojects {
         all {
             resolutionStrategy {
                 eachDependency { DependencyResolveDetails details ->
-                    if (details.requested.group == 'org.codehaus.groovy') {
-                        details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion)
+                    if ((details.requested.group == 'org.codehaus.groovy' || details.requested.group == 'org.apache.groovy') && details.requested.name != 'groovy-bom') {
+                        details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: "$groovyVersion")
                         details.because "The dependency coordinates are changed in Apache Groovy 4, plus ensure version"
                     }
                 }