compile grails-shell, grails-gradle-model and grails-bootstrap w/ Gradle Groovy version

build.gradle

@@ -213,17 +213,19 @@ if (isReleaseVersion) {
     }
 }
 
-allprojects {
-
-    // FORCE UPGRADE OF GROOVY IN DEPENDENCIES TO GROOVY 4
+// FORCE UPGRADE OF GROOVY IN DEPENDENCIES TO GROOVY 4
+// except in projects that will be run by Gradle during the build
+configure(allprojects - project(':grails-shell') - project(':grails-bootstrap') - project(':grails-gradle-model')){
     configurations.configureEach {
         resolutionStrategy.eachDependency { DependencyResolveDetails details ->
             if (details.requested.group == 'org.codehaus.groovy' && details.requested.name != 'groovy-bom') {
                 details.useTarget(group: 'org.apache.groovy', name: details.requested.name, version: groovyVersion)
             }
         }
     }
+}
 
+allprojects {
     repositories {
         mavenLocal()
         mavenCentral()
@@ -482,8 +484,8 @@ subprojects { project ->
         documentation "org.apache.groovy:groovy-cli-picocli:$groovyVersion"
         documentation ("com.github.javaparser:javaparser-core:$javaParserCoreVersion")
 
-        if (project.name =~ /^(grails-bootstrap)/ || project.name =~ /^(grails-gradle-model)/) {
-            compileOnly groovyDependency
+        if (project.name =~ /^(grails-bootstrap)/ || project.name =~ /^(grails-gradle-model)/ || project.name =~ /^(grails-shell)/) {
+            // do nothing
         } else {
             api groovyDependency
         }

gradle.properties

@@ -20,7 +20,7 @@ gradleNexusPluginVersion=2.3.1
 gradleNexusPublishPluginVersion=1.3.0
 gradleExtraConfigurationsPluginVersion=10.0.1
 gradleLicensePluginVersion=0.16.1
-groovyVersion=4.0.22
+groovyVersion=4.0.23
 gspVersion=7.0.0-SNAPSHOT
 hamcrestVersion=3.0
 h2Version=2.2.224

grails-bootstrap/build.gradle

@@ -1,23 +1,29 @@
 import org.apache.tools.ant.filters.ReplaceTokens
 
 dependencies {
-    compileOnly ( "org.apache.groovy:groovy-xml:$groovyVersion" )
-    compileOnly ( "org.apache.groovy:groovy-templates:$groovyVersion" )
-    api "org.yaml:snakeyaml:$snakeyamlVersion"
-    api "io.micronaut:micronaut-inject:$micronautVersion"
-
-    compileOnly("io.methvin:directory-watcher:$directoryWatcherVersion")
-    compileOnly("org.fusesource.jansi:jansi:$jansiVersion")
-    compileOnly("jline:jline:$jlineVersion")
-    compileOnly("net.java.dev.jna:jna:$jnaVersion")
+    // compile grails-bootstap with the Groovy version provided by Gradle
+    // to ensure build compatibility with Gradle, currently Groovy 3.0.x
+    // when used by grails-gradle-plugin
+    // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
+    compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"
+    compileOnly "org.codehaus.groovy:groovy-templates:$GroovySystem.version"
+    compileOnly "org.codehaus.groovy:groovy-xml:$GroovySystem.version"
+    compileOnly "org.codehaus.groovy:groovy-ant:$GroovySystem.version"
+
+    compileOnly "io.methvin:directory-watcher:$directoryWatcherVersion"
+    compileOnly "org.fusesource.jansi:jansi:$jansiVersion"
+    compileOnly "jline:jline:$jlineVersion"
+    compileOnly "net.java.dev.jna:jna:$jnaVersion"
 
-    // Ant
-    compileOnly "org.apache.groovy:groovy-ant:$groovyVersion"
-    testImplementation ( "org.apache.groovy:groovy-xml:$groovyVersion" )
-    testImplementation ( "org.apache.groovy:groovy-templates:$groovyVersion" )
-    testImplementation("org.fusesource.jansi:jansi:$jansiVersion")
-    testImplementation("jline:jline:$jlineVersion")
+    api "org.yaml:snakeyaml:$snakeyamlVersion"
+    api "io.micronaut:micronaut-inject:$micronautVersion", {
+        exclude group: 'org.apache.groovy'
+    }
 
+    testImplementation "org.apache.groovy:groovy-xml:$groovyVersion"
+    testImplementation "org.apache.groovy:groovy-templates:$groovyVersion "
+    testImplementation "org.fusesource.jansi:jansi:$jansiVersion"
+    testImplementation "jline:jline:$jlineVersion"
 }
 
 processResources {

grails-gradle-model/build.gradle

@@ -0,0 +1,7 @@
+dependencies {
+    // compile grails-gradle-model with the Groovy version provided by Gradle
+    // to ensure build compatibility with Gradle, currently Groovy 3.0.x
+    // when used by grails-gradle-plugin
+    // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
+    compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"
+}

grails-shell/build.gradle

@@ -11,17 +11,27 @@ ext {
 }
 
 dependencies {
+    // compile grails-shell with the Groovy version provided by Gradle
+    // to ensure build compatibility with Gradle, currently Groovy 3.0.x
+    // when used by grails-gradle-plugin
+    // see: https://docs.gradle.org/current/userguide/compatibility.html#groovy
+    compileOnly "org.codehaus.groovy:groovy:$GroovySystem.version"
+    compileOnly "org.codehaus.groovy:groovy-templates:$GroovySystem.version"
+    compileOnly "org.codehaus.groovy:groovy-xml:$GroovySystem.version"
+    compileOnly "org.codehaus.groovy:groovy-ant:$GroovySystem.version"
+    compileOnly "org.codehaus.groovy:groovy-json:$GroovySystem.version"
+
+    runtimeOnly "org.apache.groovy:groovy-ant:$groovyVersion"
+    runtimeOnly "org.apache.groovy:groovy-json:$groovyVersion"
+    runtimeOnly "org.apache.groovy:groovy-jmx:$groovyVersion"
+    runtimeOnly "org.apache.groovy:groovy-xml:$groovyVersion"
+
     api project(":grails-bootstrap")
     api project(":grails-gradle-model")
     api "org.apache.ant:ant:$antVersion"
-    api "org.apache.groovy:groovy-ant:$groovyVersion"
-    api "org.apache.groovy:groovy-json:$groovyVersion"
-    api "org.apache.groovy:groovy-jmx:$groovyVersion"
     api "org.fusesource.jansi:jansi:$jansiVersion"
     api "jline:jline:$jlineVersion"
     api "org.gradle:gradle-tooling-api:$gradleToolingApiVersion"
-    compileOnly "org.apache.groovy:groovy-templates:$groovyVersion"
-    api "org.apache.groovy:groovy-xml:$groovyVersion"
 
     compileOnly "org.springframework.boot:spring-boot:$springBootVersion"
     compileOnly "org.springframework.boot:spring-boot-loader-tools:$springBootVersion"
@@ -56,6 +66,10 @@ dependencies {
 
     testImplementation "net.sf.expectit:expectit-core:$expectitCoreVersion"
     testImplementation "com.github.jnr:jnr-posix:$jnrPosixVersion"
+    testImplementation "org.apache.groovy:groovy-xml:$groovyVersion"
+    testImplementation "org.apache.groovy:groovy-json:$groovyVersion"
+    testImplementation "org.apache.groovy:groovy-templates:$groovyVersion"
+    testImplementation "org.apache.groovy:groovy-ant:$groovyVersion"
 
     runtimeOnly "org.slf4j:slf4j-simple:$slf4jVersion"
     runtimeOnly "org.codehaus.plexus:plexus-component-api:$plexusComponentApiVersion"