Merge branch 'main' into zhaez/merge-releases

ezhang6811 · web-flow · commit b53c29e15c98 · 2025-09-08T16:56:20.000-07:00
diff --git a/instrumentation/log4j-2.13.2/build.gradle.kts b/instrumentation/log4j-2.13.2/build.gradle.kts
@@ -25,5 +25,5 @@ dependencies {
   compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")
   compileOnly("net.bytebuddy:byte-buddy")
 
-  compileOnly("org.apache.logging.log4j:log4j-core:2.22.1")
+  compileOnly("org.apache.logging.log4j:log4j-core:2.25.1")
 }

Original file line number	Diff line number	Diff line change
`@@ -25,5 +25,5 @@ dependencies {`
`25`	`25`	`compileOnly("io.opentelemetry.javaagent:opentelemetry-javaagent-extension-api")`
`26`	`26`	`compileOnly("net.bytebuddy:byte-buddy")`
`27`	`27`
`28`		`- compileOnly("org.apache.logging.log4j:log4j-core:2.22.1")`
	`28`	`+ compileOnly("org.apache.logging.log4j:log4j-core:2.25.1")`
`29`	`29`	`}`