Merge pull request #14759 from apache/grails-gradle-tasks-groovy-4

Use groovy 4 for grails-gradle-tasks

Author: jamesfredley

grails-gradle/plugins/build.gradle

@@ -36,8 +36,8 @@ dependencies {
 
     implementation project(':grails-gradle-tasks')
 
+    // spock is leaking from the grails-gradle-bom through grails-gradle-model
     implementation project(':grails-gradle-model'), {
-        exclude group: 'org.apache.groovy'
         exclude group: 'org.spockframework'
     }
 
@@ -185,4 +185,4 @@ apply {
     from rootProject.layout.projectDirectory.file('gradle/java-config.gradle')
     from rootProject.layout.projectDirectory.file('gradle/docs-config.gradle')
     from rootProject.layout.projectDirectory.file('gradle/e2eTest.gradle')
-}
+}

grails-gradle/tasks/build.gradle

@@ -29,10 +29,10 @@ group = 'org.apache.grails'
 dependencies {
     implementation platform(project(':grails-gradle-bom'))
 
-    implementation "org.codehaus.groovy:groovy"
+    implementation "org.apache.groovy:groovy:${bomDependencyVersions['groovy.version']}"
 
+    // spock is leaking from the grails-gradle-bom through grails-gradle-model
     implementation project(':grails-gradle-model'), {
-        exclude group: 'org.apache.groovy'
         exclude group: 'org.spockframework'
     }