Skip to content

Commit be3215f

Browse files
Fixed build.
1 parent d3d8f43 commit be3215f

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ csi {
2828
addTestSuiteForDir('latestDepTest', 'test')
2929

3030
dependencies {
31+
testImplementation(libs.javaparser)
3132
testRuntimeOnly project(':dd-java-agent:instrumentation:iast-instrumenter')
3233
}
3334

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apply from: "$rootDir/gradle/java.gradle"
1616
dependencies {
1717
compileOnly group: 'javax.ws.rs', name: 'jsr311-api', version: '1.1.1'
1818

19-
testImplementation libs.spock.junit4 // This legacy module still needs JUnit4.
19+
testImplementation libs.junit4 // This legacy module still needs JUnit4.
2020
testImplementation group: 'io.dropwizard', name: 'dropwizard-testing', version: '0.7.1'
2121
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
2222
}

dd-java-agent/instrumentation/junit/junit-5.3/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ dependencies {
3636

3737
testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')
3838

39+
testImplementation libs.junit4
40+
3941
// versions used below are not the minimum ones that we support,
4042
// but the tests need to use them in order to be compliant with Spock 2.x
4143
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: libs.versions.junit.platform.get()

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ dependencies {
2626
compileOnly group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
2727
implementation project(':dd-java-agent:instrumentation:kafka:kafka-common')
2828

29-
testImplementation libs.spock.junit4 // This legacy module still needs JUnit4.
29+
testImplementation libs.junit4 // This legacy module still needs JUnit4.
3030
testImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '0.11.0.0'
3131
testImplementation group: 'org.springframework.kafka', name: 'spring-kafka', version: '1.3.3.RELEASE'
3232
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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ dependencies {
2626

2727
// Include latest version of kafka itself along with latest version of client libs.
2828
// This seems to help with jar compatibility hell.
29+
latestDepTestImplementation libs.junit4 // This legacy module still needs JUnit4.
2930
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka_2.13', version: '2.+'
3031
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+'
3132
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-streams', version: '2.+'
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
import dd.trace.instrumentation.springwebflux.server.SpringWebFluxTestApplication
2-
import org.junit.AfterClass
3-
import org.junit.BeforeClass
42
import org.springframework.boot.test.context.SpringBootTest
53

64
/**
@@ -11,13 +9,11 @@ import org.springframework.boot.test.context.SpringBootTest
119
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [SpringWebFluxTestApplication, ForceNettyAutoConfiguration])
1210
class SingleThreadedSpringWebfluxTest extends SpringWebfluxTest {
1311

14-
@BeforeClass
15-
static void init() {
12+
def setup() {
1613
System.setProperty("reactor.netty.ioWorkerCount", "1")
1714
}
1815

19-
@AfterClass
20-
static void teardown() {
16+
def cleanup() {
2117
System.clearProperty("reactor.netty.ioWorkerCount")
2218
}
2319
}

0 commit comments

Comments
 (0)