All spock dependencies should be in groovySpock config.

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle

@@ -20,11 +20,15 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuite('latestDepTest')
 addTestSuite('iastLatestDepTest3')
 
+groovySpock {
+  // This module still needs Spock with JUnit4.
+  configureDependencies("testImplementation", libs.spock.junit4.groovy4)
+}
+
 dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
 
-  testImplementation libs.spock.junit4.groovy4 // This module still needs Spock with JUnit4.
   testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
   testImplementation group: 'org.springframework.kafka', name: 'spring-kafka-test', version: '1.3.3.RELEASE'

dd-java-agent/instrumentation/kafka/kafka-streams-0.11/build.gradle

@@ -11,6 +11,11 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuite('latestDepTest')
 
+groovySpock {
+  // This module still needs Spock with JUnit4.
+  configureDependencies("latestDepTestImplementation", libs.spock.junit4.groovy4)
+}
+
 dependencies {
   compileOnly group: 'org.apache.kafka', name: 'kafka-streams', version: '0.11.0.0'
 
@@ -26,7 +31,6 @@ dependencies {
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.
-  latestDepTestImplementation libs.spock.junit4.groovy4 // This module still needs Spock with JUnit4.
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+'
   latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '2.+'

dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1/build.gradle

@@ -13,10 +13,14 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+groovySpock {
+  // This module still needs Spock with JUnit4.
+  configureDependencies("testImplementation", libs.spock.junit4.groovy4)
+}
+
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'
 
-  testImplementation libs.spock.junit4.groovy4 // This module still needs Spock with JUnit4.
   testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.7.1'
   testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
 }

dd-java-agent/instrumentation/spring/spring-data-1.8/build.gradle

@@ -29,6 +29,10 @@ testJvmConstraints {
 
 addTestSuiteForDir('latestDepTest', 'test')
 
+groovySpock {
+  configureDependencies("testImplementation", libs.spock.spring.groovy4)
+}
+
 // DQH - API changes that impact instrumentation occurred in spring-data-commons in March 2014.
 // For now, that limits support to spring-data-commons 1.9.0 (maybe 1.8.0).
 // For testing, chose a couple spring-data modules that are old enough to work with 1.9.0.
@@ -37,7 +41,6 @@ dependencies {
   compileOnly(group: 'org.springframework', name: 'spring-aop', version: '1.2')
   implementation project(':dd-java-agent:agent-debugger:debugger-bootstrap')
 
-  testImplementation libs.spock.spring.groovy4
   testImplementation group: 'org.springframework', name: 'spring-test', version: '3.0.0.RELEASE'
 
   // JPA dependencies

dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/build.gradle

@@ -60,7 +60,6 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
-
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('latestBoot20Test', 'bootTest')
 addTestSuiteForDir('latestBoot24Test', 'bootTest')
@@ -76,6 +75,10 @@ configurations {
   latestIast3TestImplementation.extendsFrom(iastTestImplementation)
 }
 
+groovySpock {
+  configureDependencies("testImplementation", libs.spock.spring.groovy4)
+}
+
 dependencies {
   compileOnly group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
   compileOnly group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.4'
@@ -86,7 +89,6 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1')
   testImplementation project(':dd-java-agent:instrumentation:reactive-streams')
   testImplementation project(':dd-java-agent:instrumentation:reactor-netty-1')
-  testImplementation libs.spock.spring.groovy4
 
   testImplementation group: 'org.springframework', name: 'spring-webflux', version: '5.0.0.RELEASE'
   testImplementation group: 'io.projectreactor.ipc', name: 'reactor-netty', version: '0.7.0.RELEASE'

dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/build.gradle

@@ -36,6 +36,10 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuite("latestDepTest")
 addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "latestDepTest")
 
+groovySpock {
+  configureDependencies("testImplementation", libs.spock.spring.groovy4)
+}
+
 dependencies {
   compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '3.1.0.RELEASE'
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '3.1.0'
@@ -66,8 +70,6 @@ dependencies {
   testImplementation group: 'javax.validation', name: 'validation-api', version: '1.1.0.Final'
   testImplementation group: 'org.hibernate', name: 'hibernate-validator', version: '5.4.2.Final'
 
-  testImplementation libs.spock.spring.groovy4
-
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '1.5.17.RELEASE'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.17.RELEASE'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-websocket', version: '1.5.17.RELEASE'

dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-5.3/build.gradle

@@ -10,6 +10,10 @@ muzzle {
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'call-site-instrumentation'
 
+groovySpock {
+  configureDependencies("testImplementation", libs.spock.spring.groovy4)
+}
+
 dependencies {
   compileOnly group: 'org.springframework', name: 'spring-webmvc', version: '5.3.23'
   compileOnly group: 'javax.servlet', name: 'javax.servlet-api', version: '4.0.1'
@@ -21,8 +25,6 @@ dependencies {
   testImplementation project(':dd-java-agent:instrumentation:servlet:javax-servlet:javax-servlet-3.0')
   testImplementation project(':dd-java-agent:instrumentation:spring:spring-webmvc:spring-webmvc-3.1')
 
-  testImplementation libs.spock.spring.groovy4
-
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '2.7.5'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.7.5'
 

dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/build.gradle

@@ -27,6 +27,10 @@ tasks.withType(GroovyCompile).configureEach {
   groovyOptions.setParameters(true)
 }
 
+groovySpock {
+  configureDependencies("testImplementation", libs.spock.spring.groovy4)
+}
+
 dependencies {
   main_java17CompileOnly(group: 'org.springframework', name: 'spring-webmvc', version: '6.0.0')
   main_java17CompileOnly group: 'jakarta.servlet', name: 'jakarta.servlet-api', version: '5.0.0'
@@ -47,8 +51,6 @@ dependencies {
   testRuntimeOnly project(':dd-java-agent:instrumentation:websocket:jakarta-websocket-2.0')
   testImplementation project(':dd-java-agent:instrumentation:servlet:jakarta-servlet-5.0')
 
-  testImplementation libs.spock.spring.groovy4
-
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.0.0'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '3.0.0'
   testImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-security', version: '3.0.0'