diff --git a/dd-java-agent/agent-aiguard/build.gradle b/dd-java-agent/agent-aiguard/build.gradle index 7047ed3d34c..c8ab2ba2874 100644 --- a/dd-java-agent/agent-aiguard/build.gradle +++ b/dd-java-agent/agent-aiguard/build.gradle @@ -6,11 +6,6 @@ plugins { id 'dd-trace-java.module.product-subsystem' } -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - dependencies { api libs.slf4j implementation libs.moshi diff --git a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle index 8e4e7c7af6e..b2c1e46f57f 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle @@ -12,7 +12,6 @@ tracerJava { } testJvmConstraints { - minJavaVersion = JavaVersion.VERSION_11 excludeJdk = ['SEMERU11', 'SEMERU17'] } diff --git a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle index 5e252fc0178..fa8f9c5f6da 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle @@ -12,7 +12,6 @@ tracerJava { } testJvmConstraints { - minJavaVersion = JavaVersion.VERSION_11 // Zulu has backported profiling support forceJdk = ['ZULU8'] excludeJdk = ['SEMERU11', 'SEMERU17'] diff --git a/dd-java-agent/agent-tooling/build.gradle b/dd-java-agent/agent-tooling/build.gradle index 3b339d04b4a..7c7d6d20ffc 100644 --- a/dd-java-agent/agent-tooling/build.gradle +++ b/dd-java-agent/agent-tooling/build.gradle @@ -72,12 +72,6 @@ tasks.named("compileTest_java11Java") { configureCompiler(it, JavaVersion.VERSION_11) } -tasks.named("compileTest_java21Java") { - // Relies on the daemon JDK (>= 18/19) so javac emits `invokeinterface` for `java.lang.Object` - // methods on an interface type. See https://bugs.openjdk.org/browse/JDK-8272715. - configureCompiler(it, JavaVersion.VERSION_1_8) -} - tasks.named("jmh") { dependsOn(tasks.named("compileTestJava")) outputs.upToDateWhen { false } diff --git a/dd-java-agent/benchmark-integration/build.gradle b/dd-java-agent/benchmark-integration/build.gradle index c1432ba79f8..01c13633e36 100644 --- a/dd-java-agent/benchmark-integration/build.gradle +++ b/dd-java-agent/benchmark-integration/build.gradle @@ -3,8 +3,3 @@ plugins { } description = 'Integration Level Agent benchmarks.' - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle index 6e16d171d69..57739ecbbd5 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle @@ -25,16 +25,6 @@ tasks.named("lagomTest", Test) { } } -tasks.named("compileLagomTestJava", JavaCompile) { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - -tasks.named("compileLagomTestGroovy", GroovyCompile) { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - muzzle { pass { group = 'com.typesafe.akka' diff --git a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle index 0eb7d0211d2..5f2b00b341f 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle +++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle @@ -12,7 +12,6 @@ tracerJava { } testJvmConstraints { - minJavaVersion = JavaVersion.VERSION_11 // Zulu has backported profiling support forceJdk = ['ZULU8'] } diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle index 7c6ec2abab7..7b05d2326d6 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle @@ -33,7 +33,6 @@ dependencies { project.tasks.withType(AbstractCompile).configureEach { switch (it.name) { case 'compileCsiJava': - configureCompiler(it, JavaVersion.VERSION_1_8) break default: configureCompiler(it, JavaVersion.VERSION_11) diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle index 37eb711face..e7c9fd8cc1f 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle @@ -34,7 +34,6 @@ dependencies { tasks.withType(AbstractCompile).configureEach { switch (it.name) { case 'compileCsiJava': - configureCompiler(it, JavaVersion.VERSION_1_8) break default: configureCompiler(it, JavaVersion.VERSION_15) diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle index e1afdff2569..3ef786ba1a6 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle @@ -33,7 +33,6 @@ dependencies { project.tasks.withType(AbstractCompile).configureEach { switch (it.name) { case 'compileCsiJava': - configureCompiler(it, JavaVersion.VERSION_1_8) break default: configureCompiler(it, JavaVersion.VERSION_17) diff --git a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle index 73a34687af5..86cb2b3a59d 100644 --- a/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle @@ -14,10 +14,6 @@ tracerJava { addSourceSetFor(JavaVersion.VERSION_25) } -testJvmConstraints { - minJavaVersion = JavaVersion.VERSION_25 -} - idea { module { jdkName = '25' @@ -30,12 +26,6 @@ tasks.named("compileMain_java25Java", JavaCompile) { configureCompiler(it, JavaVersion.VERSION_1_8, "Uses Foreign Function & Memory API (java.lang.foreign, Java 22+) at Java 8 bytecode") } -// TODO Drop Groovy here -tasks.named("compileTestGroovy", GroovyCompile) { - // Groovy 3 cannot emit bytecode newer than Java 17. Keep the existing Java 8 bytecode while - // compiling against the Java 25 Foreign Function & Memory API used by this Java 25-only test. - configureCompiler(it, JavaVersion.VERSION_1_8) -} dependencies { implementation project(':dd-java-agent:instrumentation:datadog:tracing:trace-annotation') } diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle index 97eab9cee6e..a5b7d0f4e40 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle @@ -17,10 +17,6 @@ dependencies { testRuntimeOnly(project(":dd-java-agent:instrumentation:java:java-lang:java-lang-9.0")) } -tasks.named("compileMain_java11Java", JavaCompile) { - configureCompiler(it, JavaVersion.VERSION_11) -} - tasks.named("compileTestGroovy", GroovyCompile) { configureCompiler(it, JavaVersion.VERSION_11) } @@ -31,4 +27,3 @@ idea { } } - diff --git a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle index 43aa70cb975..b8b2ecf519c 100644 --- a/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle +++ b/dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle @@ -14,13 +14,11 @@ tracerJava { } testJvmConstraints { - minJavaVersion = JavaVersion.VERSION_11 excludeJdk = ['SEMERU11', 'SEMERU17'] } ["compileMain_java11Java", "compileTestJava"].each { name -> tasks.named(name, JavaCompile) { - configureCompiler(it, JavaVersion.VERSION_11) it.options.compilerArgs.addAll(['-Xlint:all,-processing,-options,-path']) } } diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/build.gradle b/dd-java-agent/instrumentation/karate/karate-1.0/build.gradle index 1d1c87cf04d..d8adcbb11cd 100644 --- a/dd-java-agent/instrumentation/karate/karate-1.0/build.gradle +++ b/dd-java-agent/instrumentation/karate/karate-1.0/build.gradle @@ -113,17 +113,10 @@ sourceSets { } // karate 1.4.0+ requires Java 11: https://github.com/karatelabs/karate/releases/tag/v1.4.0 -tasks.named("compileKarate141TestJava", JavaCompile) { - configureCompiler(it, JavaVersion.VERSION_1_8) -} tasks.named("karate141Test", Test) { onlyIf { javaVersion.isJava11Compatible() } } -tasks.named("compileLatestDepTestJava", JavaCompile) { - configureCompiler(it, JavaVersion.VERSION_1_8) -} - tasks.named("latestDepTest", Test) { onlyIf { javaVersion >= JavaVersion.VERSION_17 } } diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/build.gradle b/dd-java-agent/instrumentation/karate/karate-2.0/build.gradle index 53d43047c19..510e4b6c648 100644 --- a/dd-java-agent/instrumentation/karate/karate-2.0/build.gradle +++ b/dd-java-agent/instrumentation/karate/karate-2.0/build.gradle @@ -17,12 +17,6 @@ muzzle { } } -["compileMain_java21Java", "compileTestJava"].each { - tasks.named(it, JavaCompile) { - configureCompiler(it, JavaVersion.VERSION_21) - } -} - tasks.withType(GroovyCompile).configureEach { configureCompiler(it, JavaVersion.VERSION_21) } diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle index 3ba0bc67e1e..f8b4000eef5 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle @@ -23,10 +23,6 @@ idea { } } -project.tasks.withType(AbstractCompile).configureEach { - configureCompiler(it, JavaVersion.VERSION_1_8) -} - addTestSuiteForDir('latestDepTest', 'test') dependencies { @@ -35,4 +31,3 @@ dependencies { testImplementation group: 'io.github.resilience4j', name: 'resilience4j-all', version: '2.0.0' latestDepTestImplementation group: 'io.github.resilience4j', name: 'resilience4j-all', version: '2.+' } - diff --git a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle index 7a1453e23e1..38550a78636 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle @@ -23,11 +23,6 @@ idea { } } -// Set all compile tasks to use JDK17 but let instrumentation code target 1.8 compatibility -project.tasks.withType(AbstractCompile).configureEach { - configureCompiler(it, JavaVersion.VERSION_1_8) -} - addTestSuiteForDir('latestDepTest', 'test') dependencies { diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle index c3a1568885c..3cf94a845d9 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle @@ -79,12 +79,6 @@ configurations.configureEach { } } -["compileLatestDepTestJava", "compileLatest10TestJava"].each { name -> - tasks.named(name, JavaCompile) { - configureCompiler(it, JavaVersion.VERSION_1_8) - } -} - tasks.named("compileLatestDepTestGroovy", GroovyCompile) { configureCompiler(it, JavaVersion.VERSION_17) } diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle index fc4bad7faf4..cc2912bb3d5 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle +++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle @@ -26,10 +26,6 @@ jmh { includeTests = false } -tasks.named('compileJmhJava', JavaCompile) { - configureCompiler(it, JavaVersion.VERSION_1_8) -} - dependencies { jmh "org.apache.tomcat.embed:tomcat-embed-core:${findProperty('jmhTomcatVersion') ?: '11.0.26'}" } diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle index d166c204b23..f5de0c3247f 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle @@ -6,10 +6,6 @@ tracerJava { addSourceSetFor(JavaVersion.VERSION_11) } -testJvmConstraints { - minJavaVersion = JavaVersion.VERSION_11 -} - muzzle { pass { group = 'io.vertx' @@ -69,4 +65,3 @@ dependencies { exclude("server/Iast*.groovy") } } -