Remove groovy 4 substitutions which are no longer needed as excludes to geb plugin (#897)

Author: jamesfredley

build.gradle

@@ -5,21 +5,11 @@ buildscript {
     }
     dependencies {
         classpath "io.github.gradle-nexus:publish-plugin:$gradleNexusPublishPluginVersion"
-        classpath "io.github.groovylang.groovydoc:groovydoc-gradle-plugin:$groovydocGradlePluginVersion"
         classpath "org.grails:grails-gradle-plugin:$grailsGradlePluginVersion"
         classpath "org.grails.plugins:views-gradle:$viewsGradleVersion"
         classpath "org.asciidoctor:asciidoctor-gradle-jvm:$asciidoctorGradleVersion"
         classpath "com.github.erdi:webdriver-binaries-gradle-plugin:$webdriverBinariesPluginVersion"
     }
-
-    configurations.configureEach {
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            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"
-            }
-        }
-    }
 }
 
 group "org.grails"
@@ -80,23 +70,6 @@ allprojects {
             }
         }
     }
-
-    configurations.all {
-        resolutionStrategy.dependencySubstitution {
-            substitute module("org.codehaus.groovy:groovy-all") using module("org.apache.groovy:groovy:$groovyVersion")
-        }
-
-        resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-            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"
-            }
-
-            if (details.requested.group == "io.micronaut" && details.requested.name == "micronaut-inject-groovy") {
-                details.useVersion("4.6.1")
-            }
-        }
-    }
 }
 
 subprojects { Project subproject ->

examples/grails3-hibernate5/build.gradle

@@ -33,6 +33,7 @@ dependencies {
 
     testImplementation("org.grails.plugins:geb") {
         exclude group: 'org.gebish', module: 'geb-spock'
+        exclude group: 'org.codehaus.groovy'
     }
     testImplementation "org.gebish:geb-spock:$gebVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"

examples/grails3-multiple-datasources/build.gradle

@@ -1,11 +1,5 @@
 group "examples"
 
-configurations.all {
-    resolutionStrategy.dependencySubstitution {
-        substitute(module("org.codehaus.groovy:groovy-bom:3.0.8")).using(module("org.apache.groovy:groovy-bom:$groovyVersion"))
-    }
-}
-
 dependencies {
     implementation "org.springframework.boot:spring-boot-starter-logging"
     implementation "org.springframework.boot:spring-boot-autoconfigure"
@@ -31,6 +25,7 @@ dependencies {
     testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
     testImplementation("org.grails.plugins:geb") {
         exclude group: 'org.gebish', module: 'geb-spock'
+        exclude group: 'org.codehaus.groovy'
     }
     testImplementation "org.gebish:geb-spock:$gebVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"

examples/grails3-schema-per-tenant/build.gradle

@@ -23,7 +23,9 @@ dependencies {
     runtimeOnly "org.grails.plugins:scaffolding:$scaffoldingVersion"
 
     testImplementation "org.grails:grails-gorm-testing-support:$testingSupportVersion"
-    testImplementation "org.grails.plugins:geb:$gebPluginVersion"
+    testImplementation "org.grails.plugins:geb:$gebPluginVersion", {
+        exclude group: 'org.codehaus.groovy'
+    }
     testRuntimeOnly "org.seleniumhq.selenium:selenium-chrome-driver:$seleniumVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-firefox-driver:$seleniumVersion"
     testRuntimeOnly "org.seleniumhq.selenium:selenium-safari-driver:$seleniumSafariDriverVersion"
@@ -33,15 +35,6 @@ dependencies {
     testImplementation "org.seleniumhq.selenium:selenium-support:$seleniumVersion"
 }
 
-configurations.all {
-    resolutionStrategy.eachDependency { DependencyResolveDetails details ->
-        if ((details.requested.group == 'org.codehaus.groovy')) {
-            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"
-        }
-    }
-}
-
 tasks.withType(Test) {
     systemProperty "geb.env", System.getProperty('geb.env')
     systemProperty "geb.build.reportsDir", reporting.file("geb/integrationTest")