Rework #10551 to properly align Java 21+ modules with the latest Logback version.

AlexeyKuznetsov-DD · AlexeyKuznetsov-DD · commit 961b36a5e867 · 2026-02-13T09:46:07.000-05:00
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-21.0/build.gradle
@@ -47,13 +47,9 @@ tasks.named("check") {
   dependsOn "previewTest"
 }
 
-// Use latest logback for Java 21+ tests with better virtual thread support.
-configurations.named("testRuntimeClasspath") {
-  resolutionStrategy {
-    force libs.logback.classic.latest
-  }
-}
-
 dependencies {
+  // Use latest logback for Java 21+ tests with better virtual thread support.
+  testImplementation(libs.logback.classic.latest)
+
   testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
 }
diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-25.0/build.gradle
@@ -16,9 +16,7 @@ idea {
   }
 }
 
-// Use latest logback for Java 21+ tests with better virtual thread support.
-configurations.named("testRuntimeClasspath") {
-  resolutionStrategy {
-    force libs.logback.classic.latest
-  }
+dependencies {
+  // Use latest logback for Java 21+ tests with better virtual thread support.
+  testImplementation(libs.logback.classic.latest)
 }
diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-21.0/build.gradle
@@ -26,13 +26,8 @@ tasks.named("compileTestJava", JavaCompile) {
 }
 
 dependencies {
-  testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
-}
+  // Use latest logback for Java 21+ tests with better virtual thread support.
+  testImplementation(libs.logback.classic.latest)
 
-// Use latest logback for Java 21+ tests with better virtual thread support.
-configurations.named("testRuntimeClasspath") {
-  resolutionStrategy {
-    force libs.logback.classic.latest
-  }
+  testImplementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation')
 }
-
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -57,7 +57,7 @@ lz4 = "1.7.1"
 # Logging
 slf4j = "1.7.30"
 logback = "1.2.13" # required by Java 8 modules.
-logback-latest = "1.5.27" # recommended for Java 11+ modules.
+logback-latest = "1.5.28" # recommended for Java 11+ modules.
 
 # JSON
 jackson = "2.20.0"

Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,7 @@ idea {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`		`-// Use latest logback for Java 21+ tests with better virtual thread support.`
`20`		`-configurations.named("testRuntimeClasspath") {`
`21`		`- resolutionStrategy {`
`22`		`- force libs.logback.classic.latest`
`23`		`- }`
	`19`	`+dependencies {`
	`20`	`+ // Use latest logback for Java 21+ tests with better virtual thread support.`
	`21`	`+ testImplementation(libs.logback.classic.latest)`
`24`	`22`	`}`