feat: upgrade groovy to 4.x (#268)

tomtom-international · Nov 4, 2024 · f8f3a1d · f8f3a1d
1 parent 73a8dee
commit f8f3a1d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/build.gradle b/build.gradle
@@ -59,11 +59,11 @@ subprojects { prj ->
         apply plugin: 'com.github.johnrengelman.shadow'
     }
     ext.versions = [
-            groovy         : '3.0.17',
+            groovy         : '4.0.23',
             guava          : '32.1.2-jre',
             jackson        : '2.14.2',
             snakeyaml      : '2.0',
-            spock          : '2.3-groovy-3.0',
+            spock          : '2.3-groovy-4.0',
             objenesis      : '3.2',
             awaitility     : '4.1.0',
             javassist      : '3.28.0-GA',

diff --git a/integration-test/build.gradle b/integration-test/build.gradle
@@ -35,6 +35,7 @@ dependencies {
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
     testImplementation group: 'org.awaitility', name: 'awaitility', version: versions.awaitility
+    testImplementation group: 'org.apache.groovy', name: 'groovy', version: versions.groovy
 }
 
 configurations {

diff --git a/james-agent-io/build.gradle b/james-agent-io/build.gradle
@@ -29,5 +29,5 @@ dependencies {
     }
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
-    testImplementation group: 'org.codehaus.groovy', name: 'groovy', version: versions.groovy
+    testImplementation group: 'org.apache.groovy', name: 'groovy', version: versions.groovy
 }
diff --git a/james-agent/build.gradle b/james-agent/build.gradle
@@ -53,9 +53,9 @@ dependencies {
     }
     implementation group: 'org.yaml', name: 'snakeyaml', version: versions.snakeyaml
     implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: versions.jackson
-    implementation group: 'org.codehaus.groovy', name: 'groovy', version: versions.groovy
-    implementation group: 'org.codehaus.groovy', name: 'groovy-json', version: versions.groovy
-    implementation group: 'org.codehaus.groovy', name: 'groovy-xml', version: versions.groovy
+    implementation group: 'org.apache.groovy', name: 'groovy', version: versions.groovy
+    implementation group: 'org.apache.groovy', name: 'groovy-json', version: versions.groovy
+    implementation group: 'org.apache.groovy', name: 'groovy-xml', version: versions.groovy
     implementation group: 'org.javassist', name: 'javassist', version: versions.javassist
     implementation group: 'com.lmax', name: 'disruptor', version: versions.disruptor
     implementation group: 'org.apache.logging.log4j', name: 'log4j-api', version: versions.log4j_stackutil

diff --git a/james-controller-consul/build.gradle b/james-controller-consul/build.gradle
@@ -36,5 +36,5 @@ dependencies {
     implementation 'com.netflix.archaius:archaius-core:0.7.7'
 
     testImplementation group: 'org.spockframework', name: 'spock-core', version: versions.spock
-    testImplementation group: 'org.codehaus.groovy', name: 'groovy', version: versions.groovy
+    testImplementation group: 'org.apache.groovy', name: 'groovy', version: versions.groovy
 }