fix(deps): update jackson packages to v2.17.0 (main) (minor) (#10828)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Lauri Tulmin <ltulmin@splunk.com>
This commit is contained in:
renovate[bot] 2024-03-13 12:51:35 +02:00 committed by GitHub
parent d93fb1e93d
commit f60af5d162
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
16 changed files with 24 additions and 20 deletions

View File

@ -27,7 +27,7 @@ val groovyVersion = "4.0.19"
// configurations.testRuntimeClasspath.resolutionStrategy.force "com.google.guava:guava:19.0"
val DEPENDENCY_BOMS = listOf(
"com.fasterxml.jackson:jackson-bom:2.16.2",
"com.fasterxml.jackson:jackson-bom:2.17.0",
"com.squareup.okio:okio-bom:3.9.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
"com.google.guava:guava-bom:33.0.0-jre",
"org.apache.groovy:groovy-bom:${groovyVersion}",

View File

@ -4,7 +4,7 @@ plugins {
dependencies {
testImplementation("org.testcontainers:testcontainers:1.19.7")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.2")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
testImplementation("com.google.protobuf:protobuf-java-util:3.25.3")
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("io.opentelemetry.proto:opentelemetry-proto:1.1.0-alpha")

View File

@ -100,7 +100,7 @@ dependencies {
//All dependencies below are only for tests
testImplementation("org.testcontainers:testcontainers:1.19.7")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.16.2")
testImplementation("com.fasterxml.jackson.core:jackson-databind:2.17.0")
testImplementation("com.google.protobuf:protobuf-java-util:3.25.3")
testImplementation("com.squareup.okhttp3:okhttp:4.12.0")
testImplementation("io.opentelemetry:opentelemetry-api")

View File

@ -32,7 +32,7 @@ final class HeadersFactory {
}
while (parser.nextToken() != JsonToken.END_OBJECT) {
parser.nextToken();
if (!parser.getCurrentName().equals("headers")) {
if (!parser.currentName().equals("headers")) {
parser.skipChildren();
continue;
}
@ -46,7 +46,7 @@ final class HeadersFactory {
while (parser.nextToken() != JsonToken.END_OBJECT) {
String value = parser.nextTextValue();
if (value != null) {
headers.put(parser.getCurrentName(), value);
headers.put(parser.currentName(), value);
}
}
return headers;

View File

@ -146,7 +146,7 @@ public class AwsLambdaStreamWrapperHttpPropagationTest {
parser.nextToken();
while (parser.nextToken() != JsonToken.END_OBJECT) {
parser.nextToken();
if (!parser.getCurrentName().equals("body")) {
if (!parser.currentName().equals("body")) {
parser.skipChildren();
continue;
}

View File

@ -23,7 +23,10 @@ dependencies {
implementation("io.opentelemetry:opentelemetry-extension-kotlin")
implementation("io.opentelemetry:opentelemetry-extension-trace-propagators")
// the incubator's ViewConfigCustomizer is used to support loading yaml-based metric views
implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator")
implementation("io.opentelemetry:opentelemetry-sdk-extension-incubator") {
// we use byte-buddy-dep
exclude("net.bytebuddy", "byte-buddy")
}
// Exporters with dependencies
implementation("io.opentelemetry:opentelemetry-exporter-logging")

26
licenses/licenses.md generated
View File

@ -1,7 +1,7 @@
# javaagent
## Dependency License Report
_2024-03-13 09:50:25 EET_
_2024-03-13 10:54:35 EET_
## Apache License, Version 2.0
**1** **Group:** `com.blogspot.mydailyjava` **Name:** `weak-lock-free` **Version:** `0.18`
@ -9,33 +9,33 @@ _2024-03-13 09:50:25 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.16.2`
**2** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-annotations` **Version:** `2.17.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.16.2.jar/META-INF/LICENSE](jackson-annotations-2.16.2.jar/META-INF/LICENSE)
- [jackson-annotations-2.16.2.jar/META-INF/NOTICE](jackson-annotations-2.16.2.jar/META-INF/NOTICE)
> - **Embedded license files**: [jackson-annotations-2.17.0.jar/META-INF/LICENSE](jackson-annotations-2.17.0.jar/META-INF/LICENSE)
- [jackson-annotations-2.17.0.jar/META-INF/NOTICE](jackson-annotations-2.17.0.jar/META-INF/NOTICE)
**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.16.2`
**3** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-core` **Version:** `2.17.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.16.2.jar/META-INF/LICENSE](jackson-core-2.16.2.jar/META-INF/LICENSE)
- [jackson-core-2.16.2.jar/META-INF/NOTICE](jackson-core-2.16.2.jar/META-INF/NOTICE)
> - **Embedded license files**: [jackson-core-2.17.0.jar/META-INF/LICENSE](jackson-core-2.17.0.jar/META-INF/LICENSE)
- [jackson-core-2.17.0.jar/META-INF/NOTICE](jackson-core-2.17.0.jar/META-INF/NOTICE)
**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.16.2`
**4** **Group:** `com.fasterxml.jackson.core` **Name:** `jackson-databind` **Version:** `2.17.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.16.2.jar/META-INF/LICENSE](jackson-databind-2.16.2.jar/META-INF/LICENSE)
- [jackson-databind-2.16.2.jar/META-INF/NOTICE](jackson-databind-2.16.2.jar/META-INF/NOTICE)
> - **Embedded license files**: [jackson-databind-2.17.0.jar/META-INF/LICENSE](jackson-databind-2.17.0.jar/META-INF/LICENSE)
- [jackson-databind-2.17.0.jar/META-INF/NOTICE](jackson-databind-2.17.0.jar/META-INF/NOTICE)
**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.16.2`
**5** **Group:** `com.fasterxml.jackson.dataformat` **Name:** `jackson-dataformat-yaml` **Version:** `2.17.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.16.2.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.16.2.jar/META-INF/LICENSE)
- [jackson-dataformat-yaml-2.16.2.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.16.2.jar/META-INF/NOTICE)
> - **Embedded license files**: [jackson-dataformat-yaml-2.17.0.jar/META-INF/LICENSE](jackson-dataformat-yaml-2.17.0.jar/META-INF/LICENSE)
- [jackson-dataformat-yaml-2.17.0.jar/META-INF/NOTICE](jackson-dataformat-yaml-2.17.0.jar/META-INF/NOTICE)
**6** **Group:** `com.google.cloud.opentelemetry` **Name:** `detector-resources-support` **Version:** `0.27.0`
> - **POM Project URL**: [https://github.com/GoogleCloudPlatform/opentelemetry-operations-java](https://github.com/GoogleCloudPlatform/opentelemetry-operations-java)

View File

@ -19,6 +19,7 @@ tasks {
// Ensures tests are not affected by Armeria instrumentation
relocate("com.linecorp.armeria", "io.opentelemetry.testing.internal.armeria")
relocate("com.fasterxml.jackson", "io.opentelemetry.testing.internal.jackson")
relocate("net.bytebuddy", "io.opentelemetry.testing.internal.bytebuddy")
// Allows tests of Netty instrumentations which would otherwise conflict.
// The relocation must end with io.netty to allow Netty to detect shaded native libraries.