diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index f54edbbcc5fd..8c49ee1e5b65 100644 --- 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.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}", diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle index 38977302f0c0..c80d08702a36 100644 --- 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.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") diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index d19cbc1ed5ab..c50f8461b613 100644 --- 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.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") diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts index 87b5a3ee9062..f357a19f885d 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/javaagent/build.gradle.kts +++ b/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") + } + } + } + } +} diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts index f12de2b7f8b7..6cf49a21c49a 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library-autoconfigure/build.gradle.kts +++ b/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") + } + } + } + } +} diff --git a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts b/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts index cf76b0521767..bfe844e413c4 100644 --- a/instrumentation/aws-sdk/aws-sdk-1.11/library/build.gradle.kts +++ b/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") + } + } + } + } +} diff --git a/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts b/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts index aef551a103c2..601f5e8e6205 100644 --- a/instrumentation/dropwizard/dropwizard-testing/build.gradle.kts +++ b/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") } } diff --git a/licenses/jackson-annotations-2.15.3.jar/META-INF/LICENSE b/licenses/jackson-annotations-2.16.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-annotations-2.15.3.jar/META-INF/LICENSE rename to licenses/jackson-annotations-2.16.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-annotations-2.15.3.jar/META-INF/NOTICE b/licenses/jackson-annotations-2.16.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-annotations-2.15.3.jar/META-INF/NOTICE rename to licenses/jackson-annotations-2.16.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-core-2.15.3.jar/META-INF/LICENSE b/licenses/jackson-core-2.16.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-core-2.15.3.jar/META-INF/LICENSE rename to licenses/jackson-core-2.16.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-core-2.15.3.jar/META-INF/NOTICE b/licenses/jackson-core-2.16.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-core-2.15.3.jar/META-INF/NOTICE rename to licenses/jackson-core-2.16.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-databind-2.15.3.jar/META-INF/LICENSE b/licenses/jackson-databind-2.16.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-databind-2.15.3.jar/META-INF/LICENSE rename to licenses/jackson-databind-2.16.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-databind-2.15.3.jar/META-INF/NOTICE b/licenses/jackson-databind-2.16.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-databind-2.15.3.jar/META-INF/NOTICE rename to licenses/jackson-databind-2.16.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/LICENSE b/licenses/jackson-dataformat-yaml-2.16.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/LICENSE rename to licenses/jackson-dataformat-yaml-2.16.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/NOTICE b/licenses/jackson-dataformat-yaml-2.16.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/NOTICE rename to licenses/jackson-dataformat-yaml-2.16.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-jr-objects-2.15.3.jar/META-INF/LICENSE b/licenses/jackson-jr-objects-2.16.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-jr-objects-2.15.3.jar/META-INF/LICENSE rename to licenses/jackson-jr-objects-2.16.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-jr-objects-2.15.3.jar/META-INF/NOTICE b/licenses/jackson-jr-objects-2.16.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-jr-objects-2.15.3.jar/META-INF/NOTICE rename to licenses/jackson-jr-objects-2.16.0.jar/META-INF/NOTICE diff --git a/licenses/licenses.md b/licenses/licenses.md index 52756f1bce21..df4240cce0d8 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # javaagent ## Dependency License Report -_2023-11-13 19:19:44 PST_ +_2024-01-09 13:58:07 PST_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -9,40 +9,40 @@ _2023-11-13 19:19:44 PST_ > - **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-13 19:19:44 PST_ > - **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)