Skip to content

Remove redundant Java version settings from module build scripts #12689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gh-worker-dd-mergequeue-cf854d merged 1 commit into from
Sep 30, 2026
Merged

Remove redundant Java version settings from module build scripts #12689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions dd-java-agent/agent-aiguard/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/agent-profiling/profiling-controller-ddprof/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ tracerJava {
}

testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_11
excludeJdk = ['SEMERU11', 'SEMERU17']
}

Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/agent-profiling/profiling-controller-openjdk/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ tracerJava {
}

testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_11
// Zulu has backported profiling support
forceJdk = ['ZULU8']
excludeJdk = ['SEMERU11', 'SEMERU17']
Expand Down
6 changes: 0 additions & 6 deletions dd-java-agent/agent-tooling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
5 changes: 0 additions & 5 deletions dd-java-agent/benchmark-integration/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,3 @@ plugins {
}

description = 'Integration Level Agent benchmarks.'

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
}
10 changes: 0 additions & 10 deletions dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/datadog/profiling/exception-profiling/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ tracerJava {
}

testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_11
// Zulu has backported profiling support
forceJdk = ['ZULU8']
}
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-11.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-15.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion dd-java-agent/instrumentation/java/java-lang/java-lang-17.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 0 additions & 10 deletions dd-java-agent/instrumentation/java/java-lang/java-lang-22.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ tracerJava {
addSourceSetFor(JavaVersion.VERSION_25)
}

testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_25
}

idea {
module {
jdkName = '25'
Expand All @@ -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')
}
5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/java/java-net/java-net-11.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand All @@ -31,4 +27,3 @@ idea {
}
}


2 changes: 0 additions & 2 deletions dd-java-agent/instrumentation/java/java-nio-1.8/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
}
}
Expand Down
7 changes: 0 additions & 7 deletions dd-java-agent/instrumentation/karate/karate-1.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
6 changes: 0 additions & 6 deletions dd-java-agent/instrumentation/karate/karate-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,6 @@ idea {
}
}

project.tasks.withType(AbstractCompile).configureEach {
configureCompiler(it, JavaVersion.VERSION_1_8)
}

addTestSuiteForDir('latestDepTest', 'test')

dependencies {
Expand All @@ -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.+'
}

5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/resilience4j/resilience4j-reactor-2.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 0 additions & 6 deletions dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 0 additions & 4 deletions dd-java-agent/instrumentation/tomcat/tomcat-common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'}"
}
5 changes: 0 additions & 5 deletions dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-5.0/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,6 @@ tracerJava {
addSourceSetFor(JavaVersion.VERSION_11)
}

testJvmConstraints {
minJavaVersion = JavaVersion.VERSION_11
}

muzzle {
pass {
group = 'io.vertx'
Expand Down Expand Up @@ -69,4 +65,3 @@ dependencies {
exclude("server/Iast*.groovy")
}
}

Loading