diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 78900005ef96..d03dd94dbe2b 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.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 index 5f9d89eb9c8e..b53d7691bbe2 100644 --- 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 index c657d22d1ebe..4052c3e737f0 100644 --- 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/licenses/jackson-annotations-2.15.2.jar/META-INF/LICENSE b/licenses/jackson-annotations-2.15.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-annotations-2.15.2.jar/META-INF/LICENSE rename to licenses/jackson-annotations-2.15.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-annotations-2.15.2.jar/META-INF/NOTICE b/licenses/jackson-annotations-2.15.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-annotations-2.15.2.jar/META-INF/NOTICE rename to licenses/jackson-annotations-2.15.3.jar/META-INF/NOTICE diff --git a/licenses/jackson-core-2.15.2.jar/META-INF/LICENSE b/licenses/jackson-core-2.15.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-core-2.15.2.jar/META-INF/LICENSE rename to licenses/jackson-core-2.15.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-core-2.15.2.jar/META-INF/NOTICE b/licenses/jackson-core-2.15.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-core-2.15.2.jar/META-INF/NOTICE rename to licenses/jackson-core-2.15.3.jar/META-INF/NOTICE diff --git a/licenses/jackson-databind-2.15.2.jar/META-INF/LICENSE b/licenses/jackson-databind-2.15.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-databind-2.15.2.jar/META-INF/LICENSE rename to licenses/jackson-databind-2.15.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-databind-2.15.2.jar/META-INF/NOTICE b/licenses/jackson-databind-2.15.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-databind-2.15.2.jar/META-INF/NOTICE rename to licenses/jackson-databind-2.15.3.jar/META-INF/NOTICE diff --git a/licenses/jackson-dataformat-yaml-2.15.2.jar/META-INF/LICENSE b/licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.15.2.jar/META-INF/LICENSE rename to licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-dataformat-yaml-2.15.2.jar/META-INF/NOTICE b/licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.15.2.jar/META-INF/NOTICE rename to licenses/jackson-dataformat-yaml-2.15.3.jar/META-INF/NOTICE diff --git a/licenses/jackson-jr-objects-2.15.2.jar/META-INF/LICENSE b/licenses/jackson-jr-objects-2.15.3.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-jr-objects-2.15.2.jar/META-INF/LICENSE rename to licenses/jackson-jr-objects-2.15.3.jar/META-INF/LICENSE diff --git a/licenses/jackson-jr-objects-2.15.2.jar/META-INF/NOTICE b/licenses/jackson-jr-objects-2.15.3.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-jr-objects-2.15.2.jar/META-INF/NOTICE rename to licenses/jackson-jr-objects-2.15.3.jar/META-INF/NOTICE diff --git a/licenses/licenses.md b/licenses/licenses.md index 63f7a9e73a8b..76c1224a74cb 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ # javaagent ## Dependency License Report -_2023-10-09 15:54:27 EEST_ +_2023-10-13 08:56:02 EEST_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -9,40 +9,40 @@ _2023-10-09 15:54:27 EEST_ > - **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.2` +**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.15.3` > - **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.2.jar/META-INF/LICENSE](jackson-annotations-2.15.2.jar/META-INF/LICENSE) - - [jackson-annotations-2.15.2.jar/META-INF/NOTICE](jackson-annotations-2.15.2.jar/META-INF/NOTICE) +> - **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) -**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.15.2` +**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.15.3` > - **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.2.jar/META-INF/LICENSE](jackson-core-2.15.2.jar/META-INF/LICENSE) - - [jackson-core-2.15.2.jar/META-INF/NOTICE](jackson-core-2.15.2.jar/META-INF/NOTICE) +> - **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) -**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.15.2` +**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.15.3` > - **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.2.jar/META-INF/LICENSE](jackson-databind-2.15.2.jar/META-INF/LICENSE) - - [jackson-databind-2.15.2.jar/META-INF/NOTICE](jackson-databind-2.15.2.jar/META-INF/NOTICE) +> - **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) -**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.15.2` +**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.15.3` > - **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.2.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.15.2.jar/META-INF/LICENSE) - - [jackson-dataformat-yaml-2.15.2.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.15.2.jar/META-INF/NOTICE) +> - **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) -**6** **Group:** `com.fasterxml.jackson.jr` **Name:** `jackson-jr-objects` **Version:** `2.15.2` +**6** **Group:** `com.fasterxml.jackson.jr` **Name:** `jackson-jr-objects` **Version:** `2.15.3` > - **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.2.jar/META-INF/LICENSE](jackson-jr-objects-2.15.2.jar/META-INF/LICENSE) - - [jackson-jr-objects-2.15.2.jar/META-INF/NOTICE](jackson-jr-objects-2.15.2.jar/META-INF/NOTICE) +> - **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) **7** **Group:** `com.googlecode.concurrentlinkedhashmap` **Name:** `concurrentlinkedhashmap-lru` **Version:** `1.4.2` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged) @@ -245,7 +245,7 @@ _2023-10-09 15:54:27 EEST_ > - **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) -**51** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.0` +**51** **Group:** `org.yaml` **Name:** `snakeyaml` **Version:** `2.1` > - **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)