Cherry pick #10128 (#10199)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
open-telemetry · Jan 10, 2024 · df10cf0 · df10cf0
1 parent 105dc51
commit df10cf0
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 19 deletions.
diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts
@@ -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}",

diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle
@@ -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")

diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle
@@ -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")

diff --git a/...n-annotations-2.16.0.jar/META-INF/LICENSE → ...n-annotations-2.16.1.jar/META-INF/LICENSE b/...n-annotations-2.16.0.jar/META-INF/LICENSE → ...n-annotations-2.16.1.jar/META-INF/LICENSE
diff --git a/...on-annotations-2.16.0.jar/META-INF/NOTICE → ...on-annotations-2.16.1.jar/META-INF/NOTICE b/...on-annotations-2.16.0.jar/META-INF/NOTICE → ...on-annotations-2.16.1.jar/META-INF/NOTICE
diff --git a/.../jackson-core-2.16.0.jar/META-INF/LICENSE → .../jackson-core-2.16.1.jar/META-INF/LICENSE b/.../jackson-core-2.16.0.jar/META-INF/LICENSE → .../jackson-core-2.16.1.jar/META-INF/LICENSE
diff --git a/...s/jackson-core-2.16.0.jar/META-INF/NOTICE → ...s/jackson-core-2.16.1.jar/META-INF/NOTICE b/...s/jackson-core-2.16.0.jar/META-INF/NOTICE → ...s/jackson-core-2.16.1.jar/META-INF/NOTICE
diff --git a/...kson-databind-2.16.0.jar/META-INF/LICENSE → ...kson-databind-2.16.1.jar/META-INF/LICENSE b/...kson-databind-2.16.0.jar/META-INF/LICENSE → ...kson-databind-2.16.1.jar/META-INF/LICENSE
diff --git a/...ckson-databind-2.16.0.jar/META-INF/NOTICE → ...ckson-databind-2.16.1.jar/META-INF/NOTICE b/...ckson-databind-2.16.0.jar/META-INF/NOTICE → ...ckson-databind-2.16.1.jar/META-INF/NOTICE
diff --git a/...taformat-yaml-2.16.0.jar/META-INF/LICENSE → ...taformat-yaml-2.16.1.jar/META-INF/LICENSE b/...taformat-yaml-2.16.0.jar/META-INF/LICENSE → ...taformat-yaml-2.16.1.jar/META-INF/LICENSE
diff --git a/...ataformat-yaml-2.16.0.jar/META-INF/NOTICE → ...ataformat-yaml-2.16.1.jar/META-INF/NOTICE b/...ataformat-yaml-2.16.0.jar/META-INF/NOTICE → ...ataformat-yaml-2.16.1.jar/META-INF/NOTICE
diff --git a/...on-jr-objects-2.16.0.jar/META-INF/LICENSE → ...on-jr-objects-2.16.1.jar/META-INF/LICENSE b/...on-jr-objects-2.16.0.jar/META-INF/LICENSE → ...on-jr-objects-2.16.1.jar/META-INF/LICENSE
diff --git a/...son-jr-objects-2.16.0.jar/META-INF/NOTICE → ...son-jr-objects-2.16.1.jar/META-INF/NOTICE b/...son-jr-objects-2.16.0.jar/META-INF/NOTICE → ...son-jr-objects-2.16.1.jar/META-INF/NOTICE
diff --git a/licenses/licenses.md b/licenses/licenses.md