Cleanup classpath for modules with dependency on Groovy and Spock (#10069)

Author: AlexeyKuznetsov-DD

build.gradle.kts

@@ -2,6 +2,8 @@ import com.diffplug.gradle.spotless.SpotlessExtension
 import datadog.gradle.plugin.ci.testAggregate
 
 plugins {
+  kotlin("jvm") version libs.versions.kotlin.plugin apply false
+
   id("dd-trace-java.gradle-debug")
   id("dd-trace-java.dependency-locking")
   id("dd-trace-java.tracer-version")
@@ -16,7 +18,6 @@ plugins {
   id("com.gradleup.shadow") version "8.3.6" apply false
   id("me.champeau.jmh") version "0.7.3" apply false
   id("org.gradle.playframework") version "0.13" apply false
-  kotlin("jvm") version libs.versions.kotlin.plugin apply false
 }
 
 description = "dd-trace-java"

buildSrc/build.gradle.kts

@@ -18,6 +18,7 @@ gradlePlugin {
       id = "dd-trace-java.instrument"
       implementationClass = "InstrumentPlugin"
     }
+
     create("muzzle-plugin") {
       id = "dd-trace-java.muzzle"
       implementationClass = "datadog.gradle.plugin.muzzle.MuzzlePlugin"
@@ -26,18 +27,22 @@ gradlePlugin {
       id = "dd-trace-java.call-site-instrumentation"
       implementationClass = "datadog.gradle.plugin.csi.CallSiteInstrumentationPlugin"
     }
+
     create("tracer-version-plugin") {
       id = "dd-trace-java.tracer-version"
       implementationClass = "datadog.gradle.plugin.version.TracerVersionPlugin"
     }
+
     create("dump-hanged-test-plugin") {
       id = "dd-trace-java.dump-hanged-test"
       implementationClass = "datadog.gradle.plugin.dump.DumpHangedTestPlugin"
     }
+
     create("supported-config-generation") {
       id = "dd-trace-java.supported-config-generator"
       implementationClass = "datadog.gradle.plugin.config.SupportedConfigPlugin"
     }
+
     create("supported-config-linter") {
       id = "dd-trace-java.config-inversion-linter"
       implementationClass = "datadog.gradle.plugin.config.ConfigInversionLinter"

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

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

dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/build.gradle

@@ -4,5 +4,8 @@ apply from: "$rootDir/gradle/version.gradle"
 dependencies {
   api project(':dd-java-agent:instrumentation-testing')
   api project(':dd-java-agent:agent-ci-visibility:civisibility-test-fixtures')
+
+  compileOnly(libs.bundles.groovy)
+  compileOnly(libs.bundles.spock)
 }
 

dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle

@@ -11,5 +11,9 @@ dependencies {
   api libs.jackson.databind
   api group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
   api group: 'org.xmlunit', name: 'xmlunit-core', version: '2.10.3'
+
+  compileOnly(libs.junit.jupiter)
+  compileOnly(libs.bundles.groovy)
+  compileOnly(libs.bundles.spock)
 }
 

dd-java-agent/agent-iast/build.gradle

@@ -48,10 +48,11 @@ dependencies {
 
   testImplementation project(':utils:test-utils')
   testImplementation project(':dd-java-agent:agent-bootstrap')
-  testImplementation libs.bytebuddy
   testImplementation('org.skyscreamer:jsonassert:1.5.1')
-  testImplementation libs.groovy.yaml
-  testImplementation libs.guava
+  testImplementation(libs.bytebuddy)
+  testImplementation(libs.guava)
+
+  testImplementation(libs.groovy.yaml)
 
   testImplementation group: 'io.grpc', name: 'grpc-core', version: grpcVersion
   testImplementation group: 'io.grpc', name: 'grpc-protobuf', version: grpcVersion

dd-java-agent/agent-iast/iast-test-fixtures/build.gradle

@@ -4,4 +4,7 @@ apply from: "$rootDir/gradle/version.gradle"
 dependencies {
   api project(':dd-java-agent:agent-iast')
   api project(':dd-java-agent:instrumentation-testing')
+
+  compileOnly(libs.bundles.groovy)
+  compileOnly(libs.bundles.spock)
 }

dd-java-agent/appsec/appsec-test-fixtures/build.gradle

@@ -4,6 +4,11 @@ apply from: "$rootDir/gradle/version.gradle"
 dependencies {
   api project(':dd-java-agent:appsec')
   api project(':dd-java-agent:instrumentation-testing')
+
+  compileOnly(libs.junit.jupiter)
+
+  compileOnly(libs.bundles.groovy)
+  compileOnly(libs.bundles.spock)
 }
 
 configurations.named('api') {

dd-java-agent/instrumentation-testing/build.gradle

@@ -4,14 +4,14 @@ dependencies {
   api libs.bytebuddy
   api libs.bytebuddyagent
   api libs.slf4j
-  api libs.bundles.spock
   api libs.bundles.test.logging
   api libs.guava
 
   api project(':dd-java-agent:testing')
 
   implementation project(':dd-java-agent:agent-debugger')
 
+  implementation(libs.junit.jupiter)
   implementation "org.junit.platform:junit-platform-runner:${libs.versions.junit.platform.get()}"
 
   testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
@@ -23,4 +23,7 @@ dependencies {
   // We have autoservices defined in test subtree, looks like we need this to be able to properly rebuild this
   testAnnotationProcessor libs.autoservice.processor
   testCompileOnly libs.autoservice.annotation
+
+  compileOnly(libs.bundles.groovy)
+  compileOnly(libs.bundles.spock)
 }

dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle

@@ -28,6 +28,7 @@ csi {
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
+  testImplementation(libs.javaparser)
   testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
 }