diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 7ff0c12700..1c5f151eda 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -31,7 +31,7 @@ val groovyVersion = "4.0.6" // configurations.testRuntimeClasspath.resolutionStrategy.force "com.google.guava:guava:19.0" val DEPENDENCY_BOMS = listOf( - "com.fasterxml.jackson:jackson-bom:2.13.4.20221013", + "com.fasterxml.jackson:jackson-bom:2.14.0", "com.google.guava:guava-bom:31.1-jre", "org.apache.groovy:groovy-bom:${groovyVersion}", "io.opentelemetry:opentelemetry-bom:${otelVersion}", diff --git a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java index 9ab4e6c8b2..6809d864f2 100644 --- a/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java +++ b/javaagent-tooling/src/main/java/io/opentelemetry/javaagent/tooling/ignore/AdditionalLibraryIgnoredTypesConfigurer.java @@ -265,7 +265,8 @@ public class AdditionalLibraryIgnoredTypesConfigurer implements IgnoredTypesConf builder .ignoreClass("com.fasterxml.jackson.") - .allowClass("com.fasterxml.jackson.module.afterburner.util.MyClassLoader"); + .allowClass("com.fasterxml.jackson.module.afterburner.util.MyClassLoader") + .allowClass("com.fasterxml.jackson.databind.util.internal.PrivateMaxEntriesMap$AddTask"); // kotlin, note we do not ignore kotlinx because we instrument coroutines code builder.ignoreClass("kotlin.").allowClass("kotlin.coroutines.jvm.internal.DebugProbesKt"); diff --git a/licenses/jackson-core-2.13.4.jar/META-INF/LICENSE b/licenses/jackson-core-2.14.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-core-2.13.4.jar/META-INF/LICENSE rename to licenses/jackson-core-2.14.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-core-2.13.4.jar/META-INF/NOTICE b/licenses/jackson-core-2.14.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-core-2.13.4.jar/META-INF/NOTICE rename to licenses/jackson-core-2.14.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-jr-objects-2.13.4.jar/META-INF/LICENSE b/licenses/jackson-jr-objects-2.14.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-jr-objects-2.13.4.jar/META-INF/LICENSE rename to licenses/jackson-jr-objects-2.14.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-jr-objects-2.13.4.jar/META-INF/NOTICE b/licenses/jackson-jr-objects-2.14.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-jr-objects-2.13.4.jar/META-INF/NOTICE rename to licenses/jackson-jr-objects-2.14.0.jar/META-INF/NOTICE diff --git a/licenses/licenses.md b/licenses/licenses.md index 57faf575b7..a3e54c0f95 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -1,7 +1,7 @@ #javaagent ##Dependency License Report -_2022-10-11 13:01:17 PDT_ +_2022-11-07 16:43:40 PST_ ## Apache License, Version 2.0 **1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18` @@ -9,19 +9,19 @@ _2022-10-11 13:01:17 PDT_ > - **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-core` **Version:** `2.13.4` +**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.14.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.13.4.jar/META-INF/LICENSE](jackson-core-2.13.4.jar/META-INF/LICENSE) - - [jackson-core-2.13.4.jar/META-INF/NOTICE](jackson-core-2.13.4.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-core-2.14.0.jar/META-INF/LICENSE](jackson-core-2.14.0.jar/META-INF/LICENSE) + - [jackson-core-2.14.0.jar/META-INF/NOTICE](jackson-core-2.14.0.jar/META-INF/NOTICE) -**3** **Group:** `com.fasterxml.jackson.jr` **Name:** `jackson-jr-objects` **Version:** `2.13.4` -> - **Project URL**: [http://wiki.fasterxml.com/JacksonHome](http://wiki.fasterxml.com/JacksonHome) +**3** **Group:** `com.fasterxml.jackson.jr` **Name:** `jackson-jr-objects` **Version:** `2.14.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.13.4.jar/META-INF/LICENSE](jackson-jr-objects-2.13.4.jar/META-INF/LICENSE) - - [jackson-jr-objects-2.13.4.jar/META-INF/NOTICE](jackson-jr-objects-2.13.4.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-jr-objects-2.14.0.jar/META-INF/LICENSE](jackson-jr-objects-2.14.0.jar/META-INF/LICENSE) + - [jackson-jr-objects-2.14.0.jar/META-INF/NOTICE](jackson-jr-objects-2.14.0.jar/META-INF/NOTICE) **4** **Group:** `com.googlecode.concurrentlinkedhashmap` **Name:** `concurrentlinkedhashmap-lru` **Version:** `1.4.2` > - **Manifest License**: Apache License, Version 2.0 (Not Packaged)