From 961b36a5e867c7efd3554c119b3ac8280ca35eee Mon Sep 17 00:00:00 2001
From: Alexey Kuznetsov <alexey.kuznetsov@datadoghq.com>
Date: Fri, 13 Feb 2026 09:46:07 -0500
Subject: [PATCH] Rework #10551 to properly align Java 21+ modules with the
 latest Logback version.

---
 .../java-concurrent/java-concurrent-21.0/build.gradle | 10 +++-------
 .../java-concurrent/java-concurrent-25.0/build.gradle |  8 +++-----
 .../java/java-lang/java-lang-21.0/build.gradle        | 11 +++--------
 gradle/libs.versions.toml                             |  2 +-
 4 files changed, 10 insertions(+), 21 deletions(-)

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
index 28c7bc2eeea..4b50264c195 100644
--- 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
index 5dbe0eb48c5..5dd4fa41600 100644
--- 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
index 34694aac557..429448b643d 100644
--- 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
index 6ba14a7d599..dcfe5a9ed68 100644
--- 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"