From 23fcdc7543088261e94e43330f8c1524076a6f88 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Tue, 16 Sep 2025 18:40:09 -0400 Subject: [PATCH 1/2] Moved `jackson-databind` to `libs.versions.toml`. --- .../civisibility-test-fixtures/build.gradle | 2 +- dd-java-agent/agent-crashtracking/build.gradle | 2 +- .../agent-profiling/profiling-uploader/build.gradle | 6 +++--- dd-java-agent/appsec/build.gradle | 2 +- dd-java-agent/instrumentation/finatra-2.9/build.gradle | 2 -- dd-java-agent/instrumentation/jose-jwt/build.gradle | 1 - .../junit-4.10/cucumber-junit-4/build.gradle | 2 +- .../instrumentation/junit-5.3/cucumber-junit-5/build.gradle | 2 +- .../instrumentation/kafka/kafka-clients-0.11/build.gradle | 4 ++-- .../instrumentation/kafka/kafka-connect-0.11/build.gradle | 2 +- dd-smoke-tests/profiling-integration-tests/build.gradle | 2 +- gradle/libs.versions.toml | 3 +++ 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle index e8068ab0757..9dae3654dd3 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle +++ b/dd-java-agent/agent-ci-visibility/civisibility-test-fixtures/build.gradle @@ -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' } diff --git a/dd-java-agent/agent-crashtracking/build.gradle b/dd-java-agent/agent-crashtracking/build.gradle index 60a2873dd21..752ba182ac4 100644 --- a/dd-java-agent/agent-crashtracking/build.gradle +++ b/dd-java-agent/agent-crashtracking/build.gradle @@ -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' } diff --git a/dd-java-agent/agent-profiling/profiling-uploader/build.gradle b/dd-java-agent/agent-profiling/profiling-uploader/build.gradle index eb83b79fa9c..f9a03e3a917 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-uploader/build.gradle @@ -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') } diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index 13a2ad59de3..ca2d4606665 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -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 { diff --git a/dd-java-agent/instrumentation/finatra-2.9/build.gradle b/dd-java-agent/instrumentation/finatra-2.9/build.gradle index b2bd5982db1..a863777080c 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/build.gradle +++ b/dd-java-agent/instrumentation/finatra-2.9/build.gradle @@ -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 { diff --git a/dd-java-agent/instrumentation/jose-jwt/build.gradle b/dd-java-agent/instrumentation/jose-jwt/build.gradle index b32b8df1d6e..4afd7d1245d 100644 --- a/dd-java-agent/instrumentation/jose-jwt/build.gradle +++ b/dd-java-agent/instrumentation/jose-jwt/build.gradle @@ -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' } diff --git a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle index f41fa06eeac..71884399d8a 100644 --- a/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle +++ b/dd-java-agent/instrumentation/junit-4.10/cucumber-junit-4/build.gradle @@ -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: '+' diff --git a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle index 0a54591717f..17ffae6f100 100644 --- a/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle +++ b/dd-java-agent/instrumentation/junit-5.3/cucumber-junit-5/build.gradle @@ -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: '+' diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index 45660889306..d38bff1397e 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -53,7 +53,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 // Include latest version of kafka itself along with latest version of client libs. latestDepTestImplementation group: 'org.apache.kafka', name: 'kafka-clients', version: '2.+' @@ -71,7 +71,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 libs.jackson.databind iastLatestDepTest3Implementation project(':dd-java-agent:agent-iast:iast-test-fixtures') } diff --git a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle index d6f83855616..fee687d4a5a 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/build.gradle @@ -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' diff --git a/dd-smoke-tests/profiling-integration-tests/build.gradle b/dd-smoke-tests/profiling-integration-tests/build.gradle index d87a0746379..72c0fdc2850 100644 --- a/dd-smoke-tests/profiling-integration-tests/build.gradle +++ b/dd-smoke-tests/profiling-integration-tests/build.gradle @@ -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 { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 181282ea6de..96e01568535 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" } @@ -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"] From dd123e85323bf9a11f69fd12dbbdecf343b512ae Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 17 Sep 2025 15:48:31 -0400 Subject: [PATCH 2/2] Pin Jackson version for Kafka tests. --- .../instrumentation/kafka/kafka-clients-0.11/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle index 056839954f8..f435502c205 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/build.gradle @@ -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 libs.jackson.databind + 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.+' @@ -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 libs.jackson.databind + iastLatestDepTest3Implementation(group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.15.4') iastLatestDepTest3Implementation project(':dd-java-agent:agent-iast:iast-test-fixtures') }