Browse Source

fix(deps): update jackson packages to v2.16.0 (#9875)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
renovate[bot] 1 year ago
parent
commit
0c05fd73ac

+ 1 - 1
dependencyManagement/build.gradle.kts

@@ -26,7 +26,7 @@ val groovyVersion = "4.0.16"
 // 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}",

+ 1 - 1
examples/distro/smoke-tests/build.gradle

@@ -4,7 +4,7 @@ plugins {
 
 dependencies {
   testImplementation("org.testcontainers:testcontainers:1.19.3")
-  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")

+ 1 - 1
examples/extension/build.gradle

@@ -100,7 +100,7 @@ dependencies {
 
   //All dependencies below are only for tests
   testImplementation("org.testcontainers:testcontainers:1.19.3")
-  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")

+ 13 - 0
instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts

@@ -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")
+        }
+      }
+    }
+  }
+}

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

@@ -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 - 0
instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts

@@ -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")
+        }
+      }
+    }
+  }
+}

+ 4 - 0
instrumentation/dropwizard/dropwizard-testing/build.gradle.kts

@@ -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")
   }
 }

+ 0 - 0
licenses/jackson-annotations-2.15.3.jar/META-INF/LICENSE → licenses/jackson-annotations-2.16.0.jar/META-INF/LICENSE


+ 0 - 0
licenses/jackson-annotations-2.15.3.jar/META-INF/NOTICE → licenses/jackson-annotations-2.16.0.jar/META-INF/NOTICE


+ 0 - 0
licenses/jackson-core-2.15.3.jar/META-INF/LICENSE → licenses/jackson-core-2.16.0.jar/META-INF/LICENSE


+ 0 - 0
licenses/jackson-core-2.15.3.jar/META-INF/NOTICE → licenses/jackson-core-2.16.0.jar/META-INF/NOTICE


+ 0 - 0
licenses/jackson-databind-2.15.3.jar/META-INF/LICENSE → licenses/jackson-databind-2.16.0.jar/META-INF/LICENSE


+ 0 - 0
licenses/jackson-databind-2.15.3.jar/META-INF/NOTICE → licenses/jackson-databind-2.16.0.jar/META-INF/NOTICE


+ 0 - 0
licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/LICENSE → licenses/jackson-dataformat-yaml-2.16.0.jar/META-INF/LICENSE


+ 0 - 0
licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/NOTICE → licenses/jackson-dataformat-yaml-2.16.0.jar/META-INF/NOTICE


+ 0 - 0
licenses/jackson-jr-objects-2.15.3.jar/META-INF/LICENSE → licenses/jackson-jr-objects-2.16.0.jar/META-INF/LICENSE


+ 0 - 0
licenses/jackson-jr-objects-2.15.3.jar/META-INF/NOTICE → licenses/jackson-jr-objects-2.16.0.jar/META-INF/NOTICE


+ 17 - 17
licenses/licenses.md

@@ -1,7 +1,7 @@
 
 # javaagent
 ## Dependency License Report
-_2023-11-20 15:01:46 EET_
+_2023-11-20 15:39:08 PST_
 ## Apache License, Version 2.0
 
 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18`
@@ -9,40 +9,40 @@ _2023-11-20 15:01:46 EET_
 > - **POM Project URL**: [https://github.com/raphw/weak-lock-free](https://github.com/raphw/weak-lock-free)
 > - **POM License**: Apache License, Version 2.0 - [http://www.apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
-**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.15.3`
+**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.16.0`
 > - **Project URL**: [https://github.com/FasterXML/jackson](https://github.com/FasterXML/jackson)
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
-> - **Embedded license files**: [jackson-annotations-2.15.3.jar/META-INF/LICENSE](jackson-annotations-2.15.3.jar/META-INF/LICENSE)
-    - [jackson-annotations-2.15.3.jar/META-INF/NOTICE](jackson-annotations-2.15.3.jar/META-INF/NOTICE)
+> - **Embedded license files**: [jackson-annotations-2.16.0.jar/META-INF/LICENSE](jackson-annotations-2.16.0.jar/META-INF/LICENSE)
+    - [jackson-annotations-2.16.0.jar/META-INF/NOTICE](jackson-annotations-2.16.0.jar/META-INF/NOTICE)
 
-**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.15.3`
+**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.16.0`
 > - **Project URL**: [https://github.com/FasterXML/jackson-core](https://github.com/FasterXML/jackson-core)
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
-> - **Embedded license files**: [jackson-core-2.15.3.jar/META-INF/LICENSE](jackson-core-2.15.3.jar/META-INF/LICENSE)
-    - [jackson-core-2.15.3.jar/META-INF/NOTICE](jackson-core-2.15.3.jar/META-INF/NOTICE)
+> - **Embedded license files**: [jackson-core-2.16.0.jar/META-INF/LICENSE](jackson-core-2.16.0.jar/META-INF/LICENSE)
+    - [jackson-core-2.16.0.jar/META-INF/NOTICE](jackson-core-2.16.0.jar/META-INF/NOTICE)
 
-**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.15.3`
+**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.16.0`
 > - **Project URL**: [https://github.com/FasterXML/jackson](https://github.com/FasterXML/jackson)
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
-> - **Embedded license files**: [jackson-databind-2.15.3.jar/META-INF/LICENSE](jackson-databind-2.15.3.jar/META-INF/LICENSE)
-    - [jackson-databind-2.15.3.jar/META-INF/NOTICE](jackson-databind-2.15.3.jar/META-INF/NOTICE)
+> - **Embedded license files**: [jackson-databind-2.16.0.jar/META-INF/LICENSE](jackson-databind-2.16.0.jar/META-INF/LICENSE)
+    - [jackson-databind-2.16.0.jar/META-INF/NOTICE](jackson-databind-2.16.0.jar/META-INF/NOTICE)
 
-**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.15.3`
+**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.16.0`
 > - **Project URL**: [https://github.com/FasterXML/jackson-dataformats-text](https://github.com/FasterXML/jackson-dataformats-text)
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
-> - **Embedded license files**: [jackson-dataformat-yaml-2.15.3.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.15.3.jar/META-INF/LICENSE)
-    - [jackson-dataformat-yaml-2.15.3.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.15.3.jar/META-INF/NOTICE)
+> - **Embedded license files**: [jackson-dataformat-yaml-2.16.0.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.16.0.jar/META-INF/LICENSE)
+    - [jackson-dataformat-yaml-2.16.0.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.16.0.jar/META-INF/NOTICE)
 
-**6** **Group:** `com.fasterxml.jackson.jr` **Name:** `jackson-jr-objects` **Version:** `2.15.3`
+**6** **Group:** `com.fasterxml.jackson.jr` **Name:** `jackson-jr-objects` **Version:** `2.16.0`
 > - **Project URL**: [https://github.com/FasterXML/jackson-jr](https://github.com/FasterXML/jackson-jr)
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
-> - **Embedded license files**: [jackson-jr-objects-2.15.3.jar/META-INF/LICENSE](jackson-jr-objects-2.15.3.jar/META-INF/LICENSE)
-    - [jackson-jr-objects-2.15.3.jar/META-INF/NOTICE](jackson-jr-objects-2.15.3.jar/META-INF/NOTICE)
+> - **Embedded license files**: [jackson-jr-objects-2.16.0.jar/META-INF/LICENSE](jackson-jr-objects-2.16.0.jar/META-INF/LICENSE)
+    - [jackson-jr-objects-2.16.0.jar/META-INF/NOTICE](jackson-jr-objects-2.16.0.jar/META-INF/NOTICE)
 
 **7** **Group:** `com.googlecode.concurrentlinkedhashmap` **Name:** `concurrentlinkedhashmap-lru` **Version:** `1.4.2`
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
@@ -241,7 +241,7 @@ _2023-11-20 15:01:46 EET_
 > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml-engine](https://bitbucket.org/snakeyaml/snakeyaml-engine)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
-**50** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.1`
+**50** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.2`
 > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)
 > - **POM Project URL**: [https://bitbucket.org/snakeyaml/snakeyaml](https://bitbucket.org/snakeyaml/snakeyaml)
 > - **POM License**: Apache License, Version 2.0 - [https://www.apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)