fix(deps): update dependency com.fasterxml.jackson:jackson-bom to v2.…

…15.3 (#9673) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lauri Tulmin <[email protected]>
open-telemetry · Oct 13, 2023 · 096d321 · 096d321
1 parent 48a19d7
commit 096d321
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 42 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.15.2",
+  "com.fasterxml.jackson:jackson-bom:2.15.3",
   "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/instrumentation/finatra-2.9/javaagent/build.gradle.kts b/instrumentation/finatra-2.9/javaagent/build.gradle.kts
@@ -96,15 +96,3 @@ tasks {
     dependsOn(testStableSemconv)
   }
 }
-
-// com.fasterxml.jackson.module:jackson-module-scala_2.11:2.15.2 is missing force using jackson 2.15.1
-// remove this when a new version of jackson is released
-configurations.configureEach {
-  resolutionStrategy {
-    eachDependency {
-      if (requested.group == "com.fasterxml.jackson" && requested.name == "jackson-bom" && requested.version == "2.15.2") {
-        useVersion("2.15.1")
-      }
-    }
-  }
-}
diff --git a/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts b/instrumentation/play/play-mvc/play-mvc-2.6/javaagent/build.gradle.kts
@@ -88,15 +88,3 @@ tasks {
 configurations.configureEach {
   exclude("org.eclipse.jetty.websocket", "websocket-client")
 }
-
-// com.fasterxml.jackson.module:jackson-module-scala_2.13:2.15.2 is missing force using jackson 2.15.1
-// remove this when a new version of jackson is released
-configurations.configureEach {
-  resolutionStrategy {
-    eachDependency {
-      if (requested.group == "com.fasterxml.jackson" && requested.name == "jackson-bom" && requested.version == "2.15.2") {
-        useVersion("2.15.1")
-      }
-    }
-  }
-}
diff --git a/...n-annotations-2.15.2.jar/META-INF/LICENSE → ...n-annotations-2.15.3.jar/META-INF/LICENSE b/...n-annotations-2.15.2.jar/META-INF/LICENSE → ...n-annotations-2.15.3.jar/META-INF/LICENSE
diff --git a/...on-annotations-2.15.2.jar/META-INF/NOTICE → ...on-annotations-2.15.3.jar/META-INF/NOTICE b/...on-annotations-2.15.2.jar/META-INF/NOTICE → ...on-annotations-2.15.3.jar/META-INF/NOTICE
diff --git a/.../jackson-core-2.15.2.jar/META-INF/LICENSE → .../jackson-core-2.15.3.jar/META-INF/LICENSE b/.../jackson-core-2.15.2.jar/META-INF/LICENSE → .../jackson-core-2.15.3.jar/META-INF/LICENSE
diff --git a/...s/jackson-core-2.15.2.jar/META-INF/NOTICE → ...s/jackson-core-2.15.3.jar/META-INF/NOTICE b/...s/jackson-core-2.15.2.jar/META-INF/NOTICE → ...s/jackson-core-2.15.3.jar/META-INF/NOTICE
diff --git a/...kson-databind-2.15.2.jar/META-INF/LICENSE → ...kson-databind-2.15.3.jar/META-INF/LICENSE b/...kson-databind-2.15.2.jar/META-INF/LICENSE → ...kson-databind-2.15.3.jar/META-INF/LICENSE
diff --git a/...ckson-databind-2.15.2.jar/META-INF/NOTICE → ...ckson-databind-2.15.3.jar/META-INF/NOTICE b/...ckson-databind-2.15.2.jar/META-INF/NOTICE → ...ckson-databind-2.15.3.jar/META-INF/NOTICE
diff --git a/...taformat-yaml-2.15.2.jar/META-INF/LICENSE → ...taformat-yaml-2.15.3.jar/META-INF/LICENSE b/...taformat-yaml-2.15.2.jar/META-INF/LICENSE → ...taformat-yaml-2.15.3.jar/META-INF/LICENSE
diff --git a/...ataformat-yaml-2.15.2.jar/META-INF/NOTICE → ...ataformat-yaml-2.15.3.jar/META-INF/NOTICE b/...ataformat-yaml-2.15.2.jar/META-INF/NOTICE → ...ataformat-yaml-2.15.3.jar/META-INF/NOTICE
diff --git a/...on-jr-objects-2.15.2.jar/META-INF/LICENSE → ...on-jr-objects-2.15.3.jar/META-INF/LICENSE b/...on-jr-objects-2.15.2.jar/META-INF/LICENSE → ...on-jr-objects-2.15.3.jar/META-INF/LICENSE
diff --git a/...son-jr-objects-2.15.2.jar/META-INF/NOTICE → ...son-jr-objects-2.15.3.jar/META-INF/NOTICE b/...son-jr-objects-2.15.2.jar/META-INF/NOTICE → ...son-jr-objects-2.15.3.jar/META-INF/NOTICE
diff --git a/licenses/licenses.md b/licenses/licenses.md