Skip to content

Commit

Permalink
[release/v1.32.x] fix(deps): update jackson packages to v2.16.0 (open…
Browse files Browse the repository at this point in the history
…-telemetry#9875) (open-telemetry#10198)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
  • Loading branch information
3 people authored Jan 9, 2024
1 parent c7ceea6 commit 105dc51
Show file tree
Hide file tree
Showing 18 changed files with 63 additions and 20 deletions.
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ val groovyVersion = "4.0.15"
// configurations.testRuntimeClasspath.resolutionStrategy.force "com.google.guava:guava:19.0"

val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.15.3",
"com.fasterxml.jackson:jackson-bom:2.16.0",
"com.squareup.okio:okio-bom:3.6.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
"com.google.guava:guava-bom:32.1.3-jre",
"org.apache.groovy:groovy-bom:${groovyVersion}",
Expand Down
2 changes: 1 addition & 1 deletion examples/distro/smoke-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ plugins {

dependencies {
testImplementation("org.testcontainers:testcontainers:1.19.2")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.3")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.0")
testImplementation("com.google.protobuf:protobuf-java-util:3.25.1")
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.0.0-alpha")
Expand Down
2 changes: 1 addition & 1 deletion examples/extension/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ dependencies {

//All dependencies below are only for tests
testImplementation("org.testcontainers:testcontainers:1.19.2")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.15.3")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.0")
testImplementation("com.google.protobuf:protobuf-java-util:3.25.1")
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("io.opentelemetry:opentelemetry-api")
Expand Down
13 changes: 13 additions & 0 deletions instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,16 @@ tasks {
systemProperty("testLatestDeps", findProperty("testLatestDeps") as Boolean)
}
}

if (!(findProperty("testLatestDeps") as Boolean)) {
configurations.testRuntimeClasspath {
resolutionStrategy {
eachDependency {
// early versions of aws sdk are not compatible with jackson 2.16.0
if (requested.group.startsWith("com.fasterxml.jackson")) {
useVersion("2.15.3")
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,16 @@ tasks {
dependsOn(testReceiveSpansDisabled)
}
}

if (!(findProperty("testLatestDeps") as Boolean)) {
configurations.testRuntimeClasspath {
resolutionStrategy {
eachDependency {
// early versions of aws sdk are not compatible with jackson 2.16.0
if (requested.group.startsWith("com.fasterxml.jackson")) {
useVersion("2.15.3")
}
}
}
}
}
13 changes: 13 additions & 0 deletions instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,16 @@ dependencies {
// last version that does not use json protocol
latestDepTestLibrary("com.amazonaws:aws-java-sdk-sqs:1.12.583")
}

if (!(findProperty("testLatestDeps") as Boolean)) {
configurations.testRuntimeClasspath {
resolutionStrategy {
eachDependency {
// early versions of aws sdk are not compatible with jackson 2.16.0
if (requested.group.startsWith("com.fasterxml.jackson")) {
useVersion("2.15.3")
}
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,9 @@ configurations.testRuntimeClasspath {
// requires old logback (and therefore also old slf4j)
force("ch.qos.logback:logback-classic:1.2.11")
force("org.slf4j:slf4j-api:1.7.36")

// dropwizard testing is not compatible with jackson 2.16.0
force("com.fasterxml.jackson.core:jackson-databind:2.15.3")
force("com.fasterxml.jackson.module:jackson-module-afterburner:2.15.3")
}
}
34 changes: 17 additions & 17 deletions licenses/licenses.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 105dc51

Please sign in to comment.