Skip to content

Commit e955cc3

Browse files
committed
Merge branch 'main' of github.com:open-telemetry/opentelemetry-java-instrumentation into semconv-stable-code
2 parents d36b345 + e25ee40 commit e955cc3

File tree

63 files changed

+1577
-676
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+1577
-676
lines changed

dependencyManagement/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ val DEPENDENCY_BOMS = listOf(
2727
// for some reason boms show up as runtime dependencies in license and vulnerability scans
2828
// even if they are only used by test dependencies, so not using junit bom since it is LGPL
2929

30-
"com.fasterxml.jackson:jackson-bom:2.19.0",
31-
"com.squareup.okio:okio-bom:3.12.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
30+
"com.fasterxml.jackson:jackson-bom:2.19.1",
31+
"com.squareup.okio:okio-bom:3.13.0", // see https://github.com/open-telemetry/opentelemetry-java/issues/5637
3232
"com.google.guava:guava-bom:33.4.8-jre",
3333
"org.apache.groovy:groovy-bom:${groovyVersion}",
3434
"io.opentelemetry:opentelemetry-bom:${otelSdkVersion}",

0 commit comments

Comments
 (0)