Fixed tests.

Author: AlexeyKuznetsov-DD

dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy

@@ -64,7 +64,7 @@ class TimerTaskContinuationTest extends InstrumentationSpecification {
   def "test continuation activated when TimerTask runs (date)"() {
     when:
     runUnderTrace("parent", {
-      timer.schedule(timerTask, Instant.now().plusMillis(100).toDate())
+      timer.schedule(timerTask, Date.from(Instant.now().plusMillis(100)))
     })
     runLatch.await()
 

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

@@ -16,7 +16,7 @@ apply from: "$rootDir/gradle/java.gradle"
 dependencies {
   compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'
 
-  testImplementation libs.junit4 // This legacy module still needs JUnit4.
+  testImplementation libs.spock.junit4 // 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/junit/junit-5.3/build.gradle

@@ -36,7 +36,7 @@ dependencies {
 
   testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')
 
-  testImplementation libs.junit4
+  testImplementation libs.junit4 // This module still needs JUnit4.
 
   // versions used below are not the minimum ones that we support,
   // but the tests need to use them in order to be compliant with Spock 2.x

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

@@ -26,7 +26,7 @@ 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.junit4 // This legacy module still needs JUnit4.
+  testImplementation libs.spock.junit4 // This legacy 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

@@ -26,7 +26,7 @@ dependencies {
 
   // Include latest version of kafka itself along with latest version of client libs.
   // This seems to help with jar compatibility hell.
-  latestDepTestImplementation libs.junit4 // This legacy module still needs JUnit4.
+  latestDepTestImplementation libs.spock.junit4 // 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.+'

gradle/libs.versions.toml

@@ -82,6 +82,7 @@ groovy-xml = { module = "org.apache.groovy:groovy-xml", version.ref = "groovy" }
 
 ## Spock:
 spock-core = { module = "org.spockframework:spock-core", version.ref = "spock" }
+spock-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "spock" }
 spock-spring = { module = "org.spockframework:spock-spring", version.ref = "spock" }
 objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Spock for mocking: