Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions dd-java-agent/agent-ci-visibility/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,6 @@ dependencies {
testImplementation group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'
testImplementation group: 'org.freemarker', name: 'freemarker', version: '2.3.31'
testImplementation group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'

testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.9.2") // Required to update dependency lock files
}

shadowJar {
Expand Down
2 changes: 0 additions & 2 deletions dd-java-agent/agent-debugger/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ dependencies {
testImplementation group: 'org.ow2.asm', name: 'asm-util', version: libs.versions.asm.get()
testImplementation group: "org.junit.jupiter", name: "junit-jupiter-params", version: libs.versions.junit5.get()
testImplementation project(':dd-java-agent:agent-debugger:debugger-test-scala')
testRuntimeOnly("org.junit.platform:junit-platform-launcher:1.7.0")
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: libs.versions.junit5.get()
testImplementation libs.bundles.mockito
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
testImplementation group: 'org.springframework.boot', name: 'spring-boot', version: '2.3.5.RELEASE'
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/agent-llmobs/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ dependencies {
implementation project(':internal-api')

testImplementation project(':dd-java-agent:testing')
testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.12.0'
}

shadowJar {
Expand Down
3 changes: 3 additions & 0 deletions gradle/java_deps.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@ dependencies {
testImplementation libs.bundles.spock
testImplementation libs.groovy
testImplementation libs.bundles.test.logging

// Required to update dependency lock files
testRuntimeOnly libs.bundles.junit.platform
}
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ spock = "2.3-groovy-3.0"
spock24 = "2.4-M6-groovy-3.0"
groovy = "3.0.24"
junit5 = "5.9.2"
junit-platform = "1.9.2"
logback = "1.2.13"
bytebuddy = "1.17.5"
scala = "2.11.12" # Last version to support Java 7 (2.12+ require Java 8+)
Expand Down Expand Up @@ -74,6 +75,7 @@ groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
groovy-yaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovy" }
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit5" }
junit-jupiter-params = { module = "org.junit.jupiter:junit-jupiter-params", version.ref = "junit5" }
junit-platform-launcher = { module = "org.junit.platform:junit-platform-launcher", version.ref = "junit-platform" }

mokito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mokito-junit-jupiter = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
Expand Down Expand Up @@ -109,6 +111,7 @@ cafe-crypto = ["cafe-crypto-curve25519", "cafe-crypto-ed25519"]
spock = ["spock-core", "spock-junit4", "objenesis"]
spock24-spring = ["spock24-core", "spock24-junit4", "spock24-spring"]
junit5 = ["junit-jupiter", "junit-jupiter-params"]
junit-platform = ["junit-platform-launcher"]
mockito = ["mokito-core", "mokito-junit-jupiter", "byte-buddy", "byte-buddy-agent"]
test-logging = ["logback-classic", "log4j-over-slf4j", "jcl-over-slf4j", "jul-to-slf4j"]

Expand Down
Loading