diff --git a/build.gradle b/build.gradle
index 7c82c247260..6cdbfb12f87 100644
--- a/build.gradle
+++ b/build.gradle
@@ -26,7 +26,7 @@ plugins {
   id 'com.gradleup.shadow' version '8.3.6' apply false
   id 'me.champeau.jmh' version '0.7.0' apply false
   id 'org.gradle.playframework' version '0.13' apply false
-  id 'info.solidsoft.pitest' version '1.9.11'  apply false
+  id 'info.solidsoft.pitest' version '1.9.11' apply false
 }
 
 description = 'dd-trace-java'
diff --git a/dd-java-agent/instrumentation/akka-http/build.gradle b/dd-java-agent/instrumentation/akka-http/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/akka-http/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/akka-http/gradle.lockfile b/dd-java-agent/instrumentation/akka-http/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/akka-http/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/apache-httpclient/build.gradle b/dd-java-agent/instrumentation/apache-httpclient/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/apache-httpclient/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/apache-httpcore/build.gradle b/dd-java-agent/instrumentation/apache-httpcore/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/apache-httpcore/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/armeria/build.gradle b/dd-java-agent/instrumentation/armeria/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/armeria/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/build.gradle b/dd-java-agent/instrumentation/build.gradle
index 6054f51da4b..4c69a12c2b8 100644
--- a/dd-java-agent/instrumentation/build.gradle
+++ b/dd-java-agent/instrumentation/build.gradle
@@ -53,6 +53,9 @@ subprojects { Project subProj ->
   subProj.tasks.withType(Javadoc).configureEach { enabled = false }
 
   subProj.afterEvaluate {
+    if (!plugins.hasPlugin("java")) {
+      return
+    }
     String jdkCompile = null
     if (project.hasProperty('minJavaVersionForTests') && project.getProperty('minJavaVersionForTests') != JavaVersion.VERSION_1_8) {
       def version = JavaVersion.toVersion(project.getProperty('minJavaVersionForTests'))
@@ -60,7 +63,7 @@ subprojects { Project subProj ->
       jdkCompile = "main_${name}Implementation"
     }
     configurations.muzzleBootstrap {
-      exclude group: 'org.snakeyaml', module : 'snakeyaml-engine' // we vendor this in the agent jar
+      exclude group: 'org.snakeyaml', module: 'snakeyaml-engine' // we vendor this in the agent jar
     }
     dependencies {
       // Apply common dependencies for instrumentation.
@@ -122,10 +125,12 @@ subprojects { Project subProj ->
   }
 
   def path = subProj.getPath()
-  // don't include the redis RequestImpl stub
-  if (!path.equals(':dd-java-agent:instrumentation:vertx-redis-client-3.9:stubs')) {
-    parent_project.dependencies {
-      implementation project(path)
+  subProj.plugins.withId("java") {
+    if (!path.equals(':dd-java-agent:instrumentation:vertx-redis-client-3.9:stubs')) {
+      // don't include the redis RequestImpl stub
+      parent_project.dependencies {
+        implementation project(path)
+      }
     }
   }
 }
@@ -137,7 +142,7 @@ dependencies {
   implementation project(':dd-java-agent:agent-builder')
 }
 
-if (project.gradle.startParameter.taskNames.any {it.endsWith("generateMuzzleReport")}) {
+if (project.gradle.startParameter.taskNames.any { it.endsWith("generateMuzzleReport") }) {
   apply plugin: 'muzzle'
   task("muzzleInstrumentationReport") {
     dependsOn(project.getAllTasks(true).values().flatten().findAll { it.name.endsWith("generateMuzzleReport") })
diff --git a/dd-java-agent/instrumentation/couchbase/build.gradle b/dd-java-agent/instrumentation/couchbase/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/couchbase/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/couchbase/gradle.lockfile b/dd-java-agent/instrumentation/couchbase/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/couchbase/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/freemarker/build.gradle b/dd-java-agent/instrumentation/freemarker/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/freemarker/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/freemarker/gradle.lockfile b/dd-java-agent/instrumentation/freemarker/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/freemarker/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/graphql-java/build.gradle b/dd-java-agent/instrumentation/graphql-java/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/graphql-java/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/graphql-java/gradle.lockfile b/dd-java-agent/instrumentation/graphql-java/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/graphql-java/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/redisson/build.gradle b/dd-java-agent/instrumentation/redisson/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/redisson/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/redisson/gradle.lockfile b/dd-java-agent/instrumentation/redisson/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/redisson/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/servicetalk/build.gradle b/dd-java-agent/instrumentation/servicetalk/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/servicetalk/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/servicetalk/gradle.lockfile b/dd-java-agent/instrumentation/servicetalk/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/servicetalk/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/websocket/build.gradle b/dd-java-agent/instrumentation/websocket/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/websocket/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/websocket/gradle.lockfile b/dd-java-agent/instrumentation/websocket/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/websocket/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/build.gradle b/dd-java-agent/instrumentation/websocket/jetty-websocket/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/websocket/jetty-websocket/gradle.lockfile b/dd-java-agent/instrumentation/websocket/jetty-websocket/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/websocket/jetty-websocket/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/dd-java-agent/instrumentation/zio/build.gradle b/dd-java-agent/instrumentation/zio/build.gradle
deleted file mode 100644
index 5e69c67bd78..00000000000
--- a/dd-java-agent/instrumentation/zio/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "$rootDir/gradle/java.gradle"
diff --git a/dd-java-agent/instrumentation/zio/gradle.lockfile b/dd-java-agent/instrumentation/zio/gradle.lockfile
deleted file mode 100644
index e20e7ed6434..00000000000
--- a/dd-java-agent/instrumentation/zio/gradle.lockfile
+++ /dev/null
@@ -1,157 +0,0 @@
-# This is a Gradle generated file for dependency locking.
-# Manual edits can break the build and are not advised.
-# This file is expected to be part of source control.
-cafe.cryptography:curve25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-cafe.cryptography:ed25519-elisabeth:0.1.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-ch.qos.logback:logback-classic:1.2.3=testCompileClasspath,testRuntimeClasspath
-ch.qos.logback:logback-core:1.2.3=testCompileClasspath,testRuntimeClasspath
-com.beust:jcommander:1.78=testRuntimeClasspath
-com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq.okio:okio:1.17.6=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.datadoghq:java-dogstatsd-client:4.4.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.datadoghq:sketches-java:0.8.3=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.javaparser:javaparser-core:3.25.1=testCompileClasspath,testRuntimeClasspath
-com.github.jnr:jffi:1.3.13=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-a64asm:1.0.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-constants:0.10.4=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-enxio:0.32.17=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-ffi:2.2.16=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-posix:3.1.19=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-unixsocket:0.38.22=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.jnr:jnr-x86asm:1.0.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath
-com.github.spotbugs:spotbugs-annotations:4.7.3=spotbugs
-com.github.spotbugs:spotbugs:4.7.3=spotbugs
-com.github.stefanbirkner:system-rules:1.19.0=testCompileClasspath,testRuntimeClasspath
-com.google.auto.service:auto-service-annotations:1.0-rc7=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath
-com.google.auto.service:auto-service:1.0-rc7=annotationProcessor,testAnnotationProcessor
-com.google.auto:auto-common:0.10=annotationProcessor,testAnnotationProcessor
-com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath
-com.google.code.gson:gson:2.9.1=spotbugs
-com.google.errorprone:error_prone_annotations:2.2.0=annotationProcessor,testAnnotationProcessor
-com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor
-com.google.guava:guava:20.0=testCompileClasspath,testRuntimeClasspath
-com.google.guava:guava:27.0.1-jre=annotationProcessor,testAnnotationProcessor
-com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,testAnnotationProcessor
-com.google.j2objc:j2objc-annotations:1.1=annotationProcessor,testAnnotationProcessor
-com.google.re2j:re2j:1.7=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-com.squareup.moshi:moshi:1.11.0=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:logging-interceptor:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okhttp3:okhttp:3.12.12=testCompileClasspath,testRuntimeClasspath
-com.squareup.okio:okio:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-com.thoughtworks.qdox:qdox:1.12.1=testRuntimeClasspath
-commons-codec:commons-codec:1.15=spotbugs
-commons-fileupload:commons-fileupload:1.5=testCompileClasspath,testRuntimeClasspath
-commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath
-de.thetaphi:forbiddenapis:3.8=compileClasspath
-info.picocli:picocli:4.6.3=testRuntimeClasspath
-io.sqreen:libsqreen:13.0.1=testRuntimeClasspath
-javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath
-jaxen:jaxen:1.2.0=spotbugs
-jline:jline:2.14.6=testRuntimeClasspath
-junit:junit-dep:4.11=testCompileClasspath,testRuntimeClasspath
-junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy-agent:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.bytebuddy:byte-buddy:1.17.5=compileClasspath,instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath
-net.java.dev.jna:jna-platform:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.java.dev.jna:jna:5.8.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-net.jcip:jcip-annotations:1.0=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath
-net.sf.saxon:Saxon-HE:11.4=spotbugs
-org.apache.ant:ant-antlr:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-antlr:1.9.15=codenarc
-org.apache.ant:ant-junit:1.10.12=testRuntimeClasspath
-org.apache.ant:ant-junit:1.9.15=codenarc
-org.apache.ant:ant-launcher:1.10.12=testRuntimeClasspath
-org.apache.ant:ant:1.10.12=testCompileClasspath,testRuntimeClasspath
-org.apache.bcel:bcel:6.5.0=spotbugs
-org.apache.commons:commons-lang3:3.12.0=spotbugs
-org.apache.commons:commons-text:1.10.0=spotbugs
-org.apache.httpcomponents.client5:httpclient5:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5-h2:5.1.3=spotbugs
-org.apache.httpcomponents.core5:httpcore5:5.1.3=spotbugs
-org.apache.logging.log4j:log4j-api:2.19.0=spotbugs
-org.apache.logging.log4j:log4j-core:2.19.0=spotbugs
-org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath
-org.checkerframework:checker-qual:2.5.2=annotationProcessor,testAnnotationProcessor
-org.codehaus.groovy:groovy-all:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-ant:2.5.14=codenarc
-org.codehaus.groovy:groovy-ant:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-astbuilder:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-cli-picocli:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-console:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-datetime:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-docgenerator:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovydoc:2.5.14=codenarc
-org.codehaus.groovy:groovy-groovydoc:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-groovysh:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jmx:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-json:2.5.14=codenarc
-org.codehaus.groovy:groovy-json:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-jsr223:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-macro:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-nio:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-servlet:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-sql:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-swing:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-templates:2.5.14=codenarc
-org.codehaus.groovy:groovy-templates:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test-junit5:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-test:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-testng:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy-xml:2.5.14=codenarc
-org.codehaus.groovy:groovy-xml:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.groovy:groovy:2.5.14=codenarc
-org.codehaus.groovy:groovy:3.0.17=testCompileClasspath,testRuntimeClasspath
-org.codehaus.mojo:animal-sniffer-annotations:1.17=annotationProcessor,testAnnotationProcessor
-org.codenarc:CodeNarc:2.2.0=codenarc
-org.dom4j:dom4j:2.1.3=spotbugs
-org.eclipse.jetty:jetty-http:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-io:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-server:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.eclipse.jetty:jetty-util:9.4.56.v20240826=testCompileClasspath,testRuntimeClasspath
-org.gmetrics:GMetrics:1.1=codenarc
-org.hamcrest:hamcrest-core:1.3=testCompileClasspath,testRuntimeClasspath
-org.hamcrest:hamcrest:2.2=testCompileClasspath,testRuntimeClasspath
-org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-api:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.jupiter:junit-jupiter-engine:5.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-commons:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-engine:1.9.2=testCompileClasspath,testRuntimeClasspath
-org.junit.platform:junit-platform-launcher:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-runner:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-api:1.9.2=testRuntimeClasspath
-org.junit.platform:junit-platform-suite-commons:1.9.2=testRuntimeClasspath
-org.junit:junit-bom:5.9.1=spotbugs
-org.junit:junit-bom:5.9.2=testCompileClasspath,testRuntimeClasspath
-org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath
-org.opentest4j:opentest4j:1.2.0=testCompileClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-analysis:9.4=spotbugs
-org.ow2.asm:asm-commons:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-commons:9.4=spotbugs
-org.ow2.asm:asm-commons:9.8=testRuntimeClasspath
-org.ow2.asm:asm-tree:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm-tree:9.4=spotbugs
-org.ow2.asm:asm-tree:9.8=testRuntimeClasspath
-org.ow2.asm:asm-util:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.ow2.asm:asm-util:9.4=spotbugs
-org.ow2.asm:asm:9.2=instrumentPluginClasspath,muzzleTooling,runtimeClasspath
-org.ow2.asm:asm:9.4=spotbugs
-org.ow2.asm:asm:9.8=testRuntimeClasspath
-org.slf4j:jcl-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:log4j-over-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath
-org.slf4j:slf4j-api:1.7.30=compileClasspath,instrumentPluginClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath
-org.slf4j:slf4j-api:1.7.32=testRuntimeClasspath
-org.slf4j:slf4j-api:2.0.0=spotbugs,spotbugsSlf4j
-org.slf4j:slf4j-simple:2.0.0=spotbugsSlf4j
-org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
-org.spockframework:spock-core:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.spockframework:spock-junit4:2.3-groovy-3.0=testCompileClasspath,testRuntimeClasspath
-org.testng:testng:7.5=testRuntimeClasspath
-org.webjars:jquery:3.5.1=testRuntimeClasspath
-org.xmlresolver:xmlresolver:4.4.3=spotbugs
-xml-apis:xml-apis:1.4.01=spotbugs
-empty=spotbugsPlugins
diff --git a/gradle/ci_jobs.gradle b/gradle/ci_jobs.gradle
index d4f661aff40..4fd8a2350db 100644
--- a/gradle/ci_jobs.gradle
+++ b/gradle/ci_jobs.gradle
@@ -191,5 +191,7 @@ testAggregate("base", [":"], [
 
 
 tasks.register('runMuzzle') {
-  dependsOn subprojects.findAll { p -> p.activePartition && p.plugins.hasPlugin('muzzle') }.collect { p -> p.path + ":muzzle" }
+  dependsOn subprojects.findAll { p ->
+    p.activePartition && p.plugins.hasPlugin('java') && p.plugins.hasPlugin('muzzle')
+  }.collect { p -> p.path + ":muzzle" }
 }
diff --git a/settings.gradle b/settings.gradle
index 60c8f77730a..c3beb9a4ebf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -204,19 +204,15 @@ include ':dd-java-agent:instrumentation-annotation-processor'
 // instrumentation:
 include ':dd-java-agent:instrumentation:aerospike-4'
 include ':dd-java-agent:instrumentation:akka-concurrent'
-include ':dd-java-agent:instrumentation:akka-http'
 include ':dd-java-agent:instrumentation:akka-http:akka-http-10.0'
 include ':dd-java-agent:instrumentation:akka-http:akka-http-10.2-iast'
 include ':dd-java-agent:instrumentation:akka-http:akka-http-10.6'
 include ':dd-java-agent:instrumentation:akka-init'
-include ':dd-java-agent:instrumentation:apache-httpclient'
 include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpasyncclient-4.0'
 include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-4.0'
 include ':dd-java-agent:instrumentation:apache-httpclient:apache-httpclient-5.0'
-include ':dd-java-agent:instrumentation:apache-httpcore'
 include ':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-4.0'
 include ':dd-java-agent:instrumentation:apache-httpcore:apache-httpcore-5.0'
-include ':dd-java-agent:instrumentation:armeria'
 include ':dd-java-agent:instrumentation:armeria:armeria-grpc-0.84'
 include ':dd-java-agent:instrumentation:armeria:armeria-jetty-1.24'
 include ':dd-java-agent:instrumentation:avro'
@@ -248,7 +244,6 @@ include ':dd-java-agent:instrumentation:commons-httpclient-2'
 include ':dd-java-agent:instrumentation:commons-lang-2'
 include ':dd-java-agent:instrumentation:commons-lang-3'
 include ':dd-java-agent:instrumentation:commons-text'
-include ':dd-java-agent:instrumentation:couchbase'
 include ':dd-java-agent:instrumentation:couchbase:couchbase-2.0'
 include ':dd-java-agent:instrumentation:couchbase:couchbase-2.6'
 include ':dd-java-agent:instrumentation:couchbase:couchbase-3.1'
@@ -274,7 +269,6 @@ include ':dd-java-agent:instrumentation:elasticsearch:transport-7.3'
 include ':dd-java-agent:instrumentation:enable-wallclock-profiling'
 include ':dd-java-agent:instrumentation:exception-profiling'
 include ':dd-java-agent:instrumentation:finatra-2.9'
-include ':dd-java-agent:instrumentation:freemarker'
 include ':dd-java-agent:instrumentation:freemarker:freemarker-2.3.9'
 include ':dd-java-agent:instrumentation:freemarker:freemarker-2.3.24'
 include ':dd-java-agent:instrumentation:glassfish'
@@ -284,7 +278,6 @@ include ':dd-java-agent:instrumentation:graal:native-image'
 include ':dd-java-agent:instrumentation:gradle-3.0'
 include ':dd-java-agent:instrumentation:gradle-8.3'
 include ':dd-java-agent:instrumentation:gradle-testing'
-include ':dd-java-agent:instrumentation:graphql-java'
 include ':dd-java-agent:instrumentation:graphql-java:graphql-java-14.0'
 include ':dd-java-agent:instrumentation:graphql-java:graphql-java-20.0'
 include ':dd-java-agent:instrumentation:graphql-java:graphql-java-common'
@@ -481,7 +474,6 @@ include ':dd-java-agent:instrumentation:shutdown'
 include ':dd-java-agent:instrumentation:slick'
 include ':dd-java-agent:instrumentation:snakeyaml'
 include ':dd-java-agent:instrumentation:span-origin'
-include ':dd-java-agent:instrumentation:spark'
 include ':dd-java-agent:instrumentation:spark:spark_2.12'
 include ':dd-java-agent:instrumentation:spark:spark_2.13'
 include ':dd-java-agent:instrumentation:spark-executor'
@@ -549,7 +541,6 @@ include ':dd-java-agent:instrumentation:redisson:redisson-2.0.0'
 include ':dd-java-agent:instrumentation:redisson:redisson-2.3.0'
 include ':dd-java-agent:instrumentation:redisson:redisson-3.10.3'
 include ':dd-java-agent:instrumentation:weaver'
-include ':dd-java-agent:instrumentation:websocket'
 include ':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0'
 include ':dd-java-agent:instrumentation:websocket:javax-websocket-1.0'
 include ':dd-java-agent:instrumentation:websocket:jetty-websocket'
@@ -558,7 +549,6 @@ include ':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocke
 include ':dd-java-agent:instrumentation:websocket:jetty-websocket:jetty-websocket-12'
 include ':dd-java-agent:instrumentation:websphere-jmx'
 include ':dd-java-agent:instrumentation:wildfly-9'
-include ':dd-java-agent:instrumentation:zio'
 include ':dd-java-agent:instrumentation:zio:zio-2.0'
 
 // benchmark