Skip to content

Commit 105dc51

Browse files
traskrenovate[bot]laurit
authored
[release/v1.32.x] fix(deps): update jackson packages to v2.16.0 (#9875) (#10198)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
1 parent c7ceea6 commit 105dc51

File tree

18 files changed

+63
-20
lines changed

18 files changed

+63
-20
lines changed

dependencyManagement/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ val groovyVersion = "4.0.15"
2626
// configurations.testRuntimeClasspath.resolutionStrategy.force "com.google.guava:guava:19.0"
2727

2828
val DEPENDENCY_BOMS = listOf(
29-
"com.fasterxml.jackson:jackson-bom:2.15.3",
29+
"com.fasterxml.jackson:jackson-bom:2.16.0",
3030
"com.squareup.okio:okio-bom:3.6.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
3131
"com.google.guava:guava-bom:32.1.3-jre",
3232
"org.apache.groovy:groovy-bom:${groovyVersion}",

examples/distro/smoke-tests/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44

55
dependencies {
66
testImplementation("org.testcontainers:testcontainers:1.19.2")
7-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.3")
7+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.0")
88
testImplementation("com.google.protobuf:protobuf-java-util:3.25.1")
99
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
1010
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha")

examples/extension/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ dependencies {
100100

101101
//All dependencies below are only for tests
102102
testImplementation("org.testcontainers:testcontainers:1.19.2")
103-
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.3")
103+
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.0")
104104
testImplementation("com.google.protobuf:protobuf-java-util:3.25.1")
105105
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
106106
testImplementation("io.opentelemetry:opentelemetry-api")

instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts

+13
Original file line numberDiff line numberDiff line change
@@ -150,3 +150,16 @@ tasks {
150150
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
151151
}
152152
}
153+
154+
if (!(findProperty("testLatestDeps") as Boolean)) {
155+
configurations.testRuntimeClasspath {
156+
resolutionStrategy {
157+
eachDependency {
158+
// early versions of aws sdk are not compatible with jackson 2.16.0
159+
if (requested.group.startsWith("com.fasterxml.jackson")) {
160+
useVersion("2.15.3")
161+
}
162+
}
163+
}
164+
}
165+
}

instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts

+13
Original file line numberDiff line numberDiff line change
@@ -47,3 +47,16 @@ tasks {
4747
dependsOn(testReceiveSpansDisabled)
4848
}
4949
}
50+
51+
if (!(findProperty("testLatestDeps") as Boolean)) {
52+
configurations.testRuntimeClasspath {
53+
resolutionStrategy {
54+
eachDependency {
55+
// early versions of aws sdk are not compatible with jackson 2.16.0
56+
if (requested.group.startsWith("com.fasterxml.jackson")) {
57+
useVersion("2.15.3")
58+
}
59+
}
60+
}
61+
}
62+
}

instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

+13
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,16 @@ dependencies {
2121
// last version that does not use json protocol
2222
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
2323
}
24+
25+
if (!(findProperty("testLatestDeps") as Boolean)) {
26+
configurations.testRuntimeClasspath {
27+
resolutionStrategy {
28+
eachDependency {
29+
// early versions of aws sdk are not compatible with jackson 2.16.0
30+
if (requested.group.startsWith("com.fasterxml.jackson")) {
31+
useVersion("2.15.3")
32+
}
33+
}
34+
}
35+
}
36+
}

instrumentation/dropwizard/dropwizard-testing/build.gradle.kts

+4
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,9 @@ configurations.testRuntimeClasspath {
2121
// requires old logback (and therefore also old slf4j)
2222
force("ch.qos.logback:logback-classic:1.2.11")
2323
force("org.slf4j:slf4j-api:1.7.36")
24+
25+
// dropwizard testing is not compatible with jackson 2.16.0
26+
force("com.fasterxml.jackson.core:jackson-databind:2.15.3")
27+
force("com.fasterxml.jackson.module:jackson-module-afterburner:2.15.3")
2428
}
2529
}

licenses/licenses.md

+17-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)