Merge branch 'open-telemetry:main' into feat/nodejs/upgrade-otel-sdk

wpessers · web-flow · commit c1210a447444 · 2025-05-07T00:46:58.000+02:00
diff --git a/java/dependencyManagement/build.gradle.kts b/java/dependencyManagement/build.gradle.kts
@@ -11,7 +11,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li
 val DEPENDENCY_BOMS = listOf(
     "io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.15.0-alpha",
     "org.apache.logging.log4j:log4j-bom:2.24.3",
-    "software.amazon.awssdk:bom:2.31.25"
+    "software.amazon.awssdk:bom:2.31.30"
 )
 
 val DEPENDENCIES = listOf(

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ data class DependencySet(val group: String, val version: String, val modules: Li`
`11`	`11`	`val DEPENDENCY_BOMS = listOf(`
`12`	`12`	`"io.opentelemetry.instrumentation:opentelemetry-instrumentation-bom-alpha:2.15.0-alpha",`
`13`	`13`	`"org.apache.logging.log4j:log4j-bom:2.24.3",`
`14`		`- "software.amazon.awssdk:bom:2.31.25"`
	`14`	`+ "software.amazon.awssdk:bom:2.31.30"`
`15`	`15`	`)`
`16`	`16`
`17`	`17`	`val DEPENDENCIES = listOf(`