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
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies {
api group: 'org.skyscreamer', name: 'jsonassert', version: '1.5.1'
api group: 'org.freemarker', name: 'freemarker', version: '2.3.31'
api group: 'com.jayway.jsonpath', name: 'json-path', version: '2.8.0'
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
api libs.jackson.databind
api group: 'org.msgpack', name: 'jackson-dataformat-msgpack', version: '0.9.6'
api group: 'org.xmlunit', name: 'xmlunit-core', version: '2.10.3'
}
Expand Down
2 changes: 1 addition & 1 deletion dd-java-agent/agent-crashtracking/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {

testImplementation libs.bundles.junit5
testImplementation libs.bundles.mockito
testImplementation libs.jackson.databind
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10'
}

Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,11 @@ dependencies {
implementation libs.lz4
implementation libs.aircompressor

testImplementation libs.bundles.junit5
testImplementation project(':dd-java-agent:agent-profiling:profiling-testing')
testImplementation project(':utils:test-utils')
testImplementation libs.bundles.junit5
testImplementation libs.bundles.mockito
testImplementation libs.jackson.databind
testImplementation group: 'com.squareup.okhttp3', name: 'mockwebserver', version: libs.versions.okhttp.legacy.get()

testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
}

2 changes: 1 addition & 1 deletion dd-java-agent/appsec/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'
testImplementation group: 'com.flipkart.zjsonpatch', name: 'zjsonpatch', version: '0.4.11'
testImplementation libs.logback.classic
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.16.0'
testImplementation libs.jackson.databind
}

shadowJar {
Expand Down
2 changes: 0 additions & 2 deletions dd-java-agent/instrumentation/finatra-2.9/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,12 @@ dependencies {
testImplementation project(':dd-java-agent:instrumentation:netty:netty-4.1')

testImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '19.12.0'
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
// Required for older versions of finatra on JDKs >= 11
testImplementation group: 'com.sun.activation', name: 'javax.activation', version: '1.2.0'

latestPre207TestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '[,20.7.0)'

latestDepTestImplementation group: 'com.twitter', name: 'finatra-http_2.11', version: '+'
latestDepTestImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.0'
}

tasks.named("compileLatestDepTestGroovy").configure {
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/jose-jwt/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@ addTestSuiteForDir('latestDepTest', 'test')
dependencies {
testImplementation group: 'com.auth0', name: 'java-jwt', version: '4.0.0-beta.0'
testImplementation group: 'com.nimbusds', name: 'nimbus-jose-jwt', version: '9.24.4'
testImplementation group: 'com.fasterxml.jackson.core', name:'jackson-databind', version:'2.13.2.2'
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies {

testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '5.4.0'
testImplementation group: 'io.cucumber', name: 'cucumber-junit', version: '5.4.0'
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.1'
testImplementation libs.jackson.databind

latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '+'
latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-junit', version: '+'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies {

testImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '5.4.0'
testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '5.4.0'
testImplementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.14.1'
testImplementation libs.jackson.databind

latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-java', version: '+'
latestDepTestImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '+'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:java-io')
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8')
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.11.4')

// Include latest version of kafka itself along with latest version of client libs.
latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+'
Expand All @@ -63,7 +63,7 @@ dependencies {
iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:java-io')
iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
iastLatestDepTest3RuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.12')
iastLatestDepTest3Implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.3')
iastLatestDepTest3Implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.4')
iastLatestDepTest3Implementation project(':dd-java-agent:agent-iast:iast-test-fixtures')

}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ dependencies {
testRuntimeOnly project(':dd-java-agent:instrumentation:java-io')
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core')
testRuntimeOnly project(':dd-java-agent:instrumentation:jackson-core:jackson-core-2.8')
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
testImplementation libs.jackson.databind
testImplementation group: 'org.assertj', name: 'assertj-core', version: '2.9.+'
testImplementation group: 'org.mockito', name: 'mockito-core', version: '2.19.0'
testImplementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.3'
Expand Down
2 changes: 1 addition & 1 deletion dd-smoke-tests/profiling-integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies {
testImplementation libs.bundles.mockito
testImplementation libs.bundles.jmc
testImplementation libs.aircompressor
testImplementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.10')
testImplementation libs.jackson.databind
}

tasks.withType(Test).configureEach {
Expand Down
3 changes: 3 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ asm = "9.8"
cafe_crypto = "0.1.0"
lz4 = "1.7.1"
jmh = "1.37"
jackson = "2.20.0"

[libraries]
slf4j = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
Expand Down Expand Up @@ -100,6 +101,8 @@ coroutines = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version
jmc-common = { module = "org.openjdk.jmc:common", version.ref = "jmc" }
jmc-flightrecorder = { module = "org.openjdk.jmc:flightrecorder", version.ref = "jmc" }

jackson-databind = {module = "com.fasterxml.jackson.core:jackson-databind", version.ref = "jackson"}

[bundles]
asm = ["asm", "asmcommons"]
cafe-crypto = ["cafe-crypto-curve25519", "cafe-crypto-ed25519"]
Expand Down