Fixed build.

Author: AlexeyKuznetsov-DD

buildSrc/build.gradle.kts

@@ -80,8 +80,8 @@ testing {
   suites {
     val test by getting(JvmTestSuite::class) {
       dependencies {
-        implementation(libs.spock.core)
         implementation(libs.groovy)
+        implementation(libs.spock.core)
       }
       targets.configureEach {
         testTask.configure {

buildSrc/call-site-instrumentation-plugin/build.gradle.kts

@@ -32,12 +32,12 @@ dependencies {
   implementation("org.freemarker", "freemarker", "2.3.30")
   implementation(libs.asm)
   implementation(libs.asm.tree)
-  implementation("com.github.javaparser", "javaparser-symbol-solver-core", "3.24.4")
+  implementation(libs.javaparser.solver)
 
   testImplementation(libs.bytebuddy)
+  testImplementation(libs.bundles.groovy)
   testImplementation(libs.spock.core)
   testImplementation("org.objenesis", "objenesis", "3.0.1")
-  testImplementation(libs.groovy)
   testImplementation("javax.servlet", "javax.servlet-api", "3.0.1")
   testImplementation("com.github.spotbugs", "spotbugs-annotations", "4.2.0")
 }

communication/src/test/groovy/datadog/communication/http/RejectingExecutorServiceTest.groovy

@@ -1,19 +1,19 @@
 package datadog.communication.http
 
+import static org.junit.jupiter.api.Assertions.assertThrows
+
 import org.junit.jupiter.api.Test
 
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.RejectedExecutionException
 import java.util.concurrent.TimeUnit
 
-import static groovy.test.GroovyAssert.shouldFail
-
 class RejectingExecutorServiceTest {
   ExecutorService executorService = new RejectingExecutorService()
 
   @Test
   void 'execute throws exception'() {
-    shouldFail(RejectedExecutionException) {
+    assertThrows(RejectedExecutionException) {
       executorService.execute({})
     }
   }

dd-java-agent/agent-iast/iast-test-fixtures/src/main/groovy/com/datadog/iast/test/NoopOverheadController.groovy

@@ -3,9 +3,9 @@ package com.datadog.iast.test
 import com.datadog.iast.model.VulnerabilityType
 import com.datadog.iast.overhead.Operation
 import com.datadog.iast.overhead.OverheadController
-import com.github.javaparser.quality.Nullable
 import datadog.trace.bootstrap.instrumentation.api.AgentSpan
 import groovy.transform.CompileStatic
+import javax.annotation.Nullable
 
 @CompileStatic
 class NoopOverheadController implements OverheadController {

dd-java-agent/instrumentation-testing/src/test/groovy/server/HttpServerTest.groovy

@@ -435,7 +435,7 @@ class HttpServerTest extends InstrumentationSpecification {
 
     then:
     clientResponse.code() == 500
-    IOUtils.readFully (clientResponse.body().byteStream()).contains("assert body != null")
+    IOUtils.readFully(clientResponse.body().byteStream()).contains("assert body != null")
 
     cleanup:
     server.stop()

dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/iastTest/groovy/datadog/trace/instrumentation/akkahttp/iast/IastAkkaTest.groovy

@@ -8,7 +8,6 @@ import okhttp3.MultipartBody
 import okhttp3.Request.Builder
 import okhttp3.RequestBody
 import spock.lang.AutoCleanup
-import spock.lang.Ignore
 import spock.lang.Shared
 
 import java.nio.charset.StandardCharsets
@@ -487,7 +486,6 @@ class IastAkkaTest extends IastRequestTestRunner {
     'urlencoded_only' | 'IAST: [var (tainted):[foo (tainted), bar (tainted)]]'
   }
 
-  @Ignore("Not working under Groovy 4")
   void 'json request — #variant variant'() {
     given:
     final json =  '''{

dd-java-agent/instrumentation/aws-java/aws-java-sdk-1.11/src/test/groovy/AWS1ClientTest.groovy

@@ -43,7 +43,6 @@ import datadog.trace.bootstrap.instrumentation.api.Tags
 import datadog.trace.test.util.Flaky
 import org.json.XML
 import spock.lang.AutoCleanup
-import spock.lang.Ignore
 import spock.lang.Shared
 
 import java.util.concurrent.atomic.AtomicReference
@@ -143,7 +142,6 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
     false      | 1
   }
 
-  @Ignore("Failing under Groovy 4")
   def "send #operation request with mocked response"() {
     setup:
     responseBody.set(body)
@@ -404,7 +402,6 @@ abstract class AWS1ClientTest extends VersionedNamingTestBase {
     server.close()
   }
 
-  @Ignore("Failing under Groovy 4")
   def "#service #operation sets peer.service in serverless environment"() {
     setup:
 

dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardAsyncTest.groovy

@@ -21,9 +21,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
 
-import spock.lang.Ignore
-
-@Ignore("Not working under Groovy 4")
 class DropwizardAsyncTest extends DropwizardTest {
 
   Class testApp() {

dd-java-agent/instrumentation/dropwizard/src/test/groovy/DropwizardTest.groovy

@@ -30,9 +30,6 @@ import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.QUERY_
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.REDIRECT
 import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.SUCCESS
 
-import spock.lang.Ignore
-
-@Ignore("Not working under Groovy 4")
 class DropwizardTest extends HttpServerTest<DropwizardTestSupport> {
 
   class DropwizardServer implements HttpServer {

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/iastLatestDepTest3/groovy/iast/KafkaIastDeserializerTest.groovy

@@ -16,8 +16,6 @@ import java.nio.ByteBuffer
 import static org.hamcrest.CoreMatchers.instanceOf
 import static org.hamcrest.core.IsEqual.equalTo
 
-import spock.lang.Ignore
-
 class KafkaIastDeserializerTest extends IastRequestTestRunner {
 
   private static final int BUFF_OFFSET = 10
@@ -103,7 +101,6 @@ class KafkaIastDeserializerTest extends IastRequestTestRunner {
     test << testSuite()
   }
 
-  @Ignore("Not working under Groovy 4")
   void 'test json deserialization: #test'() {
     given:
     final origin = test.origin