Merge branch 'main' into log4j-appender

oliver-zhang · web-flow · commit fdb78cb9b3bd · 2025-06-26T16:16:26.000+08:00
diff --git a/smoke-tests/build.gradle.kts b/smoke-tests/build.gradle.kts
@@ -15,7 +15,7 @@ otelJava {
   maxJavaVersionForTests.set(JavaVersion.VERSION_11)
 }
 
-val dockerJavaVersion = "3.5.1"
+val dockerJavaVersion = "3.5.2"
 dependencies {
   testCompileOnly("com.google.auto.value:auto-value-annotations")
   testAnnotationProcessor("com.google.auto.value:auto-value")

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ otelJava {`
`15`	`15`	`maxJavaVersionForTests.set(JavaVersion.VERSION_11)`
`16`	`16`	`}`
`17`	`17`
`18`		`-val dockerJavaVersion = "3.5.1"`
	`18`	`+val dockerJavaVersion = "3.5.2"`
`19`	`19`	`dependencies {`
`20`	`20`	`testCompileOnly("com.google.auto.value:auto-value-annotations")`
`21`	`21`	`testAnnotationProcessor("com.google.auto.value:auto-value")`