Spock 2.4

Author: AlexeyKuznetsov-DD

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

@@ -53,7 +53,7 @@ dependencies {
   }
   bootTestImplementation project(':dd-java-agent:instrumentation:spring-webflux-5')
   // our default version of spock is too old
-  bootTestImplementation libs.bundles.spock24.spring
+  bootTestImplementation libs.bundles.spock.spring
 
   latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-webflux', version: '3.+'
   latestDepBootTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-test', version: '3.+', {
@@ -62,7 +62,7 @@ dependencies {
   }
   latestDepBootTestImplementation project(':dd-java-agent:instrumentation:spring-webflux-5')
   // our default version of spock is too old
-  latestDepBootTestImplementation libs.bundles.spock24.spring
+  latestDepBootTestImplementation libs.bundles.spock.spring
 
   iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-reactor-netty', version: '3.0.0'
   iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-json', version: '3.0.0'
@@ -80,6 +80,6 @@ dependencies {
   iastTestImplementation group: 'org.springframework.boot', name: 'spring-boot-starter-json', version: '3.0.0'
 
   // our default version of spock is too old
-  iastTestImplementation libs.bundles.spock24.spring
+  iastTestImplementation libs.bundles.spock.spring
 }
 

dd-smoke-tests/apm-tracing-disabled/build.gradle

@@ -19,6 +19,9 @@ dependencies {
   implementation project(':dd-trace-api')
   testImplementation project(':dd-smoke-tests')
   testImplementation(testFixtures(project(":dd-smoke-tests:iast-util")))
+
+  // Spock 2.4 requires
+  testRuntimeOnly("org.junit.platform:junit-platform-engine:1.12.2")
 }
 
 tasks.withType(Test).configureEach {

gradle/libs.versions.toml

@@ -6,8 +6,7 @@ okhttp = "3.12.15" # Datadog fork to support Java 7
 okhttp-legacy = "[3.0,3.12.12]" # 3.12.x is last version to support Java7
 okio = "1.17.6" # Datadog fork
 
-spock = "2.3-groovy-3.0"
-spock24 = "2.4-M6-groovy-3.0"
+spock = "2.4-M6-groovy-3.0"
 groovy = "3.0.24"
 junit5 = "5.9.2"
 logback = "1.2.13"
@@ -64,11 +63,8 @@ aircompressor = { module = 'io.airlift:aircompressor', version = '2.0.2'}
 # Testing
 spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
 spock-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "spock" }
-objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Spock for mocking:
-
-spock24-core = { module = "org.spockframework:spock-core", version.ref = "spock24" }
-spock24-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "spock24" }
-spock24-spring = { module = "org.spockframework:spock-spring", version = "spock24" }
+spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spock" }
+objenesis = { module = "org.objenesis:objenesis", version = "3.4" } # Used by Spock for mocking:
 
 groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
 groovy-yaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovy" }
@@ -107,7 +103,7 @@ asm = ["asm", "asmcommons"]
 cafe-crypto = ["cafe-crypto-curve25519", "cafe-crypto-ed25519"]
 # Testing
 spock = ["spock-core", "spock-junit4", "objenesis"]
-spock24-spring = ["spock24-core", "spock24-junit4", "spock24-spring"]
+spock-spring = ["spock-core", "spock-junit4", "spock-spring"]
 junit5 = ["junit-jupiter", "junit-jupiter-params"]
 mockito = ["mokito-core", "mokito-junit-jupiter", "byte-buddy", "byte-buddy-agent"]
 test-logging = ["logback-classic", "log4j-over-slf4j", "jcl-over-slf4j", "jul-to-slf4j"]