Bump Groovy: 3.0.24 -> 4.0.28

Author: AlexeyKuznetsov-DD

communication/src/test/java/datadog/communication/serialization/GrowableBufferTest.java

@@ -1,6 +1,6 @@
 package datadog.communication.serialization;
 
-import static groovy.util.GroovyTestCase.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -73,13 +73,13 @@ public void testPutVariants() {
     gb.put(new byte[] {-128}, 0, 1);
 
     ByteBuffer slice = gb.slice();
-    assertEquals(slice.getShort(), (short) 1);
-    assertEquals(slice.getChar(), (char) 2);
-    assertEquals(slice.getInt(), 4);
-    assertEquals(slice.getLong(), 8L);
-    assertEquals(slice.getFloat(), 16.0f);
-    assertEquals(slice.getDouble(), 32.0);
-    assertEquals(slice.get(), (byte) 64);
-    assertEquals(slice.get(), (byte) -128);
+    assertEquals((short) 1, slice.getShort());
+    assertEquals((char) 2, slice.getChar());
+    assertEquals(4, slice.getInt());
+    assertEquals(8L, slice.getLong());
+    assertEquals(16.0f, slice.getFloat());
+    assertEquals(32.0, slice.getDouble());
+    assertEquals((byte) 64, slice.get());
+    assertEquals((byte) -128, slice.get());
   }
 }

dd-smoke-tests/src/main/groovy/datadog/smoketest/ProcessManager.groovy

@@ -268,7 +268,7 @@ abstract class ProcessManager extends Specification {
     while (reader.read(buffer) != -1) {
       buffer.flip()
       while (buffer.hasRemaining()) {
-        int c = buffer.get()
+        char c = buffer.get()
         if (c == '\n' || c == '\r') {
           break
         }

gradle/codenarc.gradle

@@ -3,7 +3,7 @@ apply plugin: "codenarc"
 dependencies {
   codenarc('org.codenarc:CodeNarc:3.6.0')
   // if the groovy transitive dependencies are upgraded, this may not be pulled
-  codenarc('org.codehaus.groovy:groovy-templates')
+  //codenarc('org.codehaus.groovy:groovy-templates')
 }
 
 codenarc {

gradle/libs.versions.toml

@@ -6,8 +6,8 @@ okhttp = "3.12.15" # Datadog fork to support Java 7
 okhttp-legacy = "[3.0,3.12.12]" # 3.12.x is last version to support Java7
 okio = "1.17.6" # Datadog fork
 
-spock = "2.4-M6-groovy-3.0"
-groovy = "3.0.24"
+spock = "2.4-M6-groovy-4.0"
+groovy = "4.0.28"
 junit5 = "5.12.2"
 junit-platform = "1.12.2"
 logback = "1.2.13"
@@ -70,8 +70,8 @@ spock-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "spoc
 spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spock" }
 objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Spock for mocking:
 
-groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
-groovy-yaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovy" }
+groovy = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
+groovy-yaml = { module = "org.apache.groovy:groovy-yaml", version.ref = "groovy" }
 junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
 junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
 junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }