Skip to content

Commit

Permalink
Cherry pick #10128 (#10199)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
  • Loading branch information
breedx-splk and renovate[bot] authored Jan 10, 2024
1 parent 105dc51 commit df10cf0
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 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.16.0",
"com.fasterxml.jackson:jackson-bom:2.16.1",
"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.16.0")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
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.16.0")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
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
32 changes: 16 additions & 16 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 df10cf0

Please sign in to comment.