WIP 2

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/liberty-20/build.gradle

@@ -54,6 +54,7 @@ dependencies {
   //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0'))
   // because using testFixtures() causes some early evaluation of dependencies
   webappRuntimeOnly libs.groovy
+  webappRuntimeOnly libs.groovy.xml
 }
 
 configurations.named("testRuntimeOnly") {

dd-java-agent/instrumentation/liberty-20/src/test/groovy/datadog/trace/instrumentation/liberty20/Liberty20Server.groovy

@@ -4,6 +4,7 @@ import com.ibm.wsspi.kernel.embeddable.Server
 import com.ibm.wsspi.kernel.embeddable.ServerBuilder
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.utils.PortUtils
+import groovy.xml.XmlParser
 import groovy.xml.XmlUtil
 
 import java.util.concurrent.TimeUnit

dd-java-agent/instrumentation/liberty-23/build.gradle

@@ -61,6 +61,7 @@ dependencies {
   //  webappImplementation testFixtures(project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0'))
   // because using testFixtures() causes some early evaluation of dependencies
   webappRuntimeOnly libs.groovy
+  webappRuntimeOnly libs.groovy.xml
 }
 
 configurations.named("testRuntimeOnly") {

dd-java-agent/instrumentation/liberty-23/src/test/groovy/datadog/trace/instrumentation/liberty23/Liberty23Server.groovy

@@ -4,6 +4,7 @@ import com.ibm.wsspi.kernel.embeddable.Server
 import com.ibm.wsspi.kernel.embeddable.ServerBuilder
 import datadog.trace.agent.test.base.HttpServer
 import datadog.trace.agent.test.utils.PortUtils
+import groovy.xml.XmlParser
 import groovy.xml.XmlUtil
 
 import java.util.concurrent.TimeUnit

dd-java-agent/instrumentation/ratpack-1.5/build.gradle

@@ -18,8 +18,12 @@ dependencies {
   compileOnly group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '4.2.0'
 
   testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')
-  testImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0'
+  testImplementation(group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.5.0') {
+    exclude group: 'org.codehaus.groovy'
+  }
   testImplementation 'com.sun.activation:jakarta.activation:1.2.2'
   testImplementation project(':dd-java-agent:appsec:appsec-test-fixtures')
-  latestDepTestImplementation group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.+'
+  latestDepTestImplementation(group: 'io.ratpack', name: 'ratpack-groovy-test', version: '1.+') {
+    exclude group: 'org.codehaus.groovy'
+  }
 }

dd-smoke-tests/gradle/build.gradle

@@ -1,6 +1,3 @@
-import java.time.Duration
-import java.time.temporal.ChronoUnit
-
 plugins {
   id 'com.gradleup.shadow'
 }

gradle/libs.versions.toml

@@ -71,6 +71,7 @@ spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spoc
 objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Spock for mocking:
 
 groovy = { module = "org.apache.groovy:groovy-all", version.ref = "groovy" }
+groovy-xml = { module = "org.apache.groovy:groovy-xml", 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" }