diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 2fda94046929..6b91fde6262b 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -27,7 +27,7 @@ val DEPENDENCY_BOMS = listOf( // for some reason boms show up as runtime dependencies in license and vulnerability scans // even if they are only used by test dependencies, so not using junit bom since it is LGPL - "com.fasterxml.jackson:jackson-bom:2.19.2", + "com.fasterxml.jackson:jackson-bom:2.20.0", "com.google.guava:guava-bom:33.4.8-jre", "org.apache.groovy:groovy-bom:${groovyVersion}", "io.opentelemetry:opentelemetry-bom:${otelSdkVersion}", diff --git a/examples/distro/smoke-tests/build.gradle b/examples/distro/smoke-tests/build.gradle index 6f6488de3cd1..0b5639f5de48 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.21.3") - testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.2") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0") testImplementation("com.google.protobuf:protobuf-java-util:4.32.0") testImplementation("com.squareup.okhttp3:okhttp:5.1.0") testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.7.0-alpha") diff --git a/examples/extension/build.gradle b/examples/extension/build.gradle index 68228e403e29..8ac43c4f9bd5 100644 --- a/examples/extension/build.gradle +++ b/examples/extension/build.gradle @@ -99,7 +99,7 @@ dependencies { //All dependencies below are only for tests testImplementation("org.testcontainers:testcontainers:1.21.3") - testImplementation("com.fasterxml.jackson.core:jackson-databind:2.19.2") + testImplementation("com.fasterxml.jackson.core:jackson-databind:2.20.0") testImplementation("com.google.protobuf:protobuf-java-util:4.32.0") testImplementation("com.squareup.okhttp3:okhttp:5.1.0") testImplementation("io.opentelemetry:opentelemetry-api") diff --git a/instrumentation-docs/build.gradle.kts b/instrumentation-docs/build.gradle.kts index 280cf2bf3bed..67baa10504a9 100644 --- a/instrumentation-docs/build.gradle.kts +++ b/instrumentation-docs/build.gradle.kts @@ -9,7 +9,7 @@ otelJava { dependencies { implementation("org.yaml:snakeyaml:2.4") - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0") implementation("io.opentelemetry:opentelemetry-sdk-common") testImplementation(enforcedPlatform("org.junit:junit-bom:5.13.4")) diff --git a/instrumentation/finatra-2.9/javaagent/build.gradle.kts b/instrumentation/finatra-2.9/javaagent/build.gradle.kts index 9749ad1c57bc..cbf109a0e37e 100644 --- a/instrumentation/finatra-2.9/javaagent/build.gradle.kts +++ b/instrumentation/finatra-2.9/javaagent/build.gradle.kts @@ -89,3 +89,16 @@ tasks { systemProperty("collectMetadata", findProperty("collectMetadata")?.toString() ?: "false") } } + +if (findProperty("testLatestDeps") as Boolean) { + configurations.named("latestDepTestRuntimeClasspath") { + resolutionStrategy { + eachDependency { + // finatra 24.2.0 doesn't work with jackson 2.20.0 + if (requested.group.startsWith("com.fasterxml.jackson")) { + useVersion("2.19.2") + } + } + } + } +} diff --git a/licenses/jackson-annotations-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-annotations-2.20.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-annotations-2.19.2.jar/META-INF/LICENSE rename to licenses/jackson-annotations-2.20.jar/META-INF/LICENSE diff --git a/licenses/jackson-annotations-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-annotations-2.20.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-annotations-2.19.2.jar/META-INF/NOTICE rename to licenses/jackson-annotations-2.20.jar/META-INF/NOTICE diff --git a/licenses/jackson-core-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-core-2.20.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-core-2.19.2.jar/META-INF/LICENSE rename to licenses/jackson-core-2.20.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-core-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-core-2.20.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-core-2.19.2.jar/META-INF/NOTICE rename to licenses/jackson-core-2.20.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-databind-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-databind-2.20.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-databind-2.19.2.jar/META-INF/LICENSE rename to licenses/jackson-databind-2.20.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-databind-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-databind-2.20.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-databind-2.19.2.jar/META-INF/NOTICE rename to licenses/jackson-databind-2.20.0.jar/META-INF/NOTICE diff --git a/licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/LICENSE b/licenses/jackson-dataformat-yaml-2.20.0.jar/META-INF/LICENSE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/LICENSE rename to licenses/jackson-dataformat-yaml-2.20.0.jar/META-INF/LICENSE diff --git a/licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/NOTICE b/licenses/jackson-dataformat-yaml-2.20.0.jar/META-INF/NOTICE similarity index 100% rename from licenses/jackson-dataformat-yaml-2.19.2.jar/META-INF/NOTICE rename to licenses/jackson-dataformat-yaml-2.20.0.jar/META-INF/NOTICE diff --git a/licenses/licenses.md b/licenses/licenses.md index 5a4b7dfe1d5d..389136bacf4a 100644 --- a/licenses/licenses.md +++ b/licenses/licenses.md @@ -12,33 +12,33 @@ > - **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) -**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.19.2` +**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.20` > - **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.19.2.jar/META-INF/LICENSE](jackson-annotations-2.19.2.jar/META-INF/LICENSE) - - [jackson-annotations-2.19.2.jar/META-INF/NOTICE](jackson-annotations-2.19.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-annotations-2.20.jar/META-INF/LICENSE](jackson-annotations-2.20.jar/META-INF/LICENSE) + - [jackson-annotations-2.20.jar/META-INF/NOTICE](jackson-annotations-2.20.jar/META-INF/NOTICE) -**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.19.2` +**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.20.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.19.2.jar/META-INF/LICENSE](jackson-core-2.19.2.jar/META-INF/LICENSE) - - [jackson-core-2.19.2.jar/META-INF/NOTICE](jackson-core-2.19.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-core-2.20.0.jar/META-INF/LICENSE](jackson-core-2.20.0.jar/META-INF/LICENSE) + - [jackson-core-2.20.0.jar/META-INF/NOTICE](jackson-core-2.20.0.jar/META-INF/NOTICE) -**5** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.19.2` +**5** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.20.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.19.2.jar/META-INF/LICENSE](jackson-databind-2.19.2.jar/META-INF/LICENSE) - - [jackson-databind-2.19.2.jar/META-INF/NOTICE](jackson-databind-2.19.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-databind-2.20.0.jar/META-INF/LICENSE](jackson-databind-2.20.0.jar/META-INF/LICENSE) + - [jackson-databind-2.20.0.jar/META-INF/NOTICE](jackson-databind-2.20.0.jar/META-INF/NOTICE) -**6** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.19.2` +**6** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.20.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.19.2.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.19.2.jar/META-INF/LICENSE) - - [jackson-dataformat-yaml-2.19.2.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.19.2.jar/META-INF/NOTICE) +> - **Embedded license files**: [jackson-dataformat-yaml-2.20.0.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.20.0.jar/META-INF/LICENSE) + - [jackson-dataformat-yaml-2.20.0.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.20.0.jar/META-INF/NOTICE) **7** **Group:** `com.google.cloud.opentelemetry` **Name:** `detector-resources-support` **Version:** `0.36.0` > - **POM Project URL**: [https://github.com/GoogleCloudPlatform/opentelemetry-operations-java](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java) diff --git a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java index 4090ff8a766a..6ee382d89b88 100644 --- a/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java +++ b/testing-common/src/main/java/io/opentelemetry/instrumentation/testing/recording/YamlFileMappingsSource.java @@ -53,7 +53,7 @@ final class YamlFileMappingsSource implements MappingsSource { .enable(YAMLGenerator.Feature.ALWAYS_QUOTE_NUMBERS_AS_STRINGS) // For non-YAML, follow // https://github.com/wiremock/wiremock/blob/master/src/main/java/com/github/tomakehurst/wiremock/common/Json.java#L41 - .setSerializationInclusion(Include.NON_NULL) + .setDefaultPropertyInclusion(Include.NON_NULL) .configure(JsonNodeFeature.STRIP_TRAILING_BIGDECIMAL_ZEROES, false) .configure(JsonParser.Feature.ALLOW_COMMENTS, true) .configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true) diff --git a/testing/wiremock-shaded-for-testing/build.gradle.kts b/testing/wiremock-shaded-for-testing/build.gradle.kts index 21a9512ed2c5..bcbe39728314 100644 --- a/testing/wiremock-shaded-for-testing/build.gradle.kts +++ b/testing/wiremock-shaded-for-testing/build.gradle.kts @@ -8,7 +8,7 @@ dependencies { // class conflict reported in the failure. implementation("com.github.tomakehurst:wiremock-jre8:2.35.2") implementation("com.google.errorprone:error_prone_annotations") - implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.19.2") + implementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.20.0") } tasks {