chore: Moved additional test suite constraints to new test task extension

bric3 · bric3 · commit c6cda9f0b7fd · 2025-10-27T14:42:19.000-04:00
# Conflicts:
#	dd-java-agent/instrumentation/aerospike-4.0/build.gradle
#	dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
diff --git a/dd-java-agent/instrumentation/aerospike-4.0/build.gradle b/dd-java-agent/instrumentation/aerospike-4.0/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_21
-  latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_21
-}
 muzzle {
   pass {
     group = 'com.aerospike'
@@ -18,6 +14,18 @@ addTestSuiteForDir("latest7DepTest", "test")
 addTestSuiteExtendingForDir("latestDepForkedTest", "latestDepTest", "test")
 addTestSuiteExtendingForDir("latest7DepForkedTest", "latest7DepTest", "test")
 
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_21
+  }
+}
+
+tasks.named("latestDepForkedTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_21
+  }
+}
+
 dependencies {
   compileOnly group: 'com.aerospike', name: 'aerospike-client', version: '4.0.0'
 
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
@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  lagomTestMaxJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'scala'
 apply plugin: 'call-site-instrumentation'
@@ -22,6 +17,12 @@ addTestSuiteForDir 'version101IastTest', 'iastTest'
 addTestSuiteForDir 'version102IastTest', 'iastTest'
 addTestSuiteForDir 'latestDepIastTest', 'iastTest'
 
+tasks.named("lagomTest", Test) {
+  jvmConstraint {
+    maxJavaVersionForTests = JavaVersion.VERSION_1_8
+  }
+}
+
 tasks.named("compileLagomTestJava", JavaCompile) {
   sourceCompatibility = JavaVersion.VERSION_1_8
   targetCompatibility = JavaVersion.VERSION_1_8
diff --git a/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle b/dd-java-agent/instrumentation/armeria/armeria-jetty-1.24/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  jetty11TestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 muzzle {
   pass {
     group = "com.linecorp.armeria"
@@ -25,6 +21,12 @@ addTestSuiteForDir("jetty11Test", "test/jetty11")
 addTestSuiteExtendingForDir("jetty9LatestDepTest", "latestDepTest", "test/jetty9")
 addTestSuiteExtendingForDir("jetty11LatestDepTest", "latestDepTest", "test/jetty11")
 
+tasks.named("jetty11Test", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
 configureGroovyCompiler(11, "compileJetty11TestGroovy", "compileJetty11LatestDepTestGroovy")
 
 ["jetty11Test", "jetty11LatestDepTest"].each { name ->
diff --git a/dd-java-agent/instrumentation/avro/build.gradle b/dd-java-agent/instrumentation/avro/build.gradle
@@ -1,6 +1,3 @@
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
 muzzle {
   pass {
     group = 'org.apache.avro'
@@ -14,6 +11,13 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest','test')
 addTestSuiteForDir('latestDepTest8','test')
+
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
 dependencies {
   compileOnly group: 'org.apache.avro', name: 'avro', version: '1.11.3'
   testImplementation group: 'org.apache.avro', name: 'avro', version: '1.11.3'
diff --git a/dd-java-agent/instrumentation/axis2-1.3/build.gradle b/dd-java-agent/instrumentation/axis2-1.3/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-  latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
 muzzle {
   pass {
     group = "org.apache.axis2"
@@ -14,6 +10,19 @@ apply from: "$rootDir/gradle/java.gradle"
 
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('latestDepForkedTest', 'test')
+
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
+tasks.named("latestDepForkedTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
 configurations.configureEach {
   // the version used by axis2 isn't available in a public repository - we don't need it, so exclude it
   exclude group: 'org.apache.woden', module: 'woden'
diff --git a/dd-java-agent/instrumentation/cxf-2.1/build.gradle b/dd-java-agent/instrumentation/cxf-2.1/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  cxf3LatestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_17
-}
 muzzle {
   pass {
     group = "org.apache.cxf"
@@ -23,6 +19,18 @@ apply from: "${rootDir}/gradle/java.gradle"
 addTestSuite('latestDepTest')
 addTestSuiteForDir('cxf3LatestDepTest', 'test')
 
+tasks.named("cxf3LatestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_17
+  }
+}
+
 tasks.named("compileCxf3LatestDepTestJava", JavaCompile) {
   configureCompiler(it, 11, JavaVersion.VERSION_1_8)
 }
diff --git a/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle b/dd-java-agent/instrumentation/graphql-java/graphql-java-20.0/build.gradle
@@ -1,9 +1,3 @@
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-  latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_11
-  graphql21LatestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-  graphql21LatestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
 // there are a lot of invalid version using dates (i.e. com.graphql-java-graphql-java-2018-06-04T04-23-07)
 // so we limit by chunks
 muzzle {
@@ -67,3 +61,16 @@ dependencies {
     configureCompiler(it, 11)
   }
 }
+
+tasks.matching {
+  it.name in [
+      "latestDepTest",
+      "latestDepForkedTest",
+      "graphql21LatestDepTest",
+      "graphql21LatestDepForkedTest"
+  ]
+}.configureEach {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
diff --git a/dd-java-agent/instrumentation/ignite-2.0/build.gradle b/dd-java-agent/instrumentation/ignite-2.0/build.gradle
@@ -2,9 +2,6 @@ ext {
   // See https://ignite.apache.org/docs/latest/quick-start/java#running-ignite-with-java-11-or-later
   // FIXME: Because of this condition, tests only run in Java 8, and latestDepTest never run, as they require Java 11+.
   maxJavaVersionForTests = JavaVersion.VERSION_1_8
-  // ignite 2.17.0+ requires Java 11+
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-  latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_11
 }
 
 muzzle {
@@ -48,3 +45,16 @@ for (task in ['compileLatestDepTestGroovy', 'compileLatestDepForkedTestGroovy'])
     configureCompiler(it, 11)
   }
 }
+
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
+tasks.named("latestDepForkedTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
diff --git a/dd-java-agent/instrumentation/jdbc/build.gradle b/dd-java-agent/instrumentation/jdbc/build.gradle
@@ -3,10 +3,6 @@ plugins {
   id 'me.champeau.jmh'
 }
 
-ext {
-  latestDepJava11TestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 muzzle {
   pass {
     coreJdk()
@@ -99,3 +95,10 @@ tasks.withType(GroovyCompile).configureEach {
 tasks.withType(Test).configureEach {
   usesService(testcontainersLimit)
 }
+
+tasks.named("latestDepJava11Test", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
diff --git a/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/build.gradle
@@ -22,10 +22,6 @@ muzzle {
   }
 }
 
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_17
-}
-
 addTestSuiteForDir('v513Test', 'test')
 addTestSuiteForDir('latest5Test', 'test')
 addTestSuiteForDir('latestDepTest', 'test')
@@ -66,3 +62,9 @@ configurations.matching { it.name.startsWith('test') }.configureEach {
 tasks.named("compileLatestDepTestJava", JavaCompile) {
   configureCompiler(it, 17, JavaVersion.VERSION_1_8)
 }
+
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_17
+  }
+}
diff --git a/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle b/dd-java-agent/instrumentation/junit/junit-5.3/junit-5.8/build.gradle
@@ -23,10 +23,6 @@ muzzle {
   }
 }
 
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_17
-}
-
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {
@@ -61,3 +57,8 @@ tasks.named("compileLatestDepTestJava", JavaCompile) {
   configureCompiler(it, 17, JavaVersion.VERSION_1_8)
 }
 
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_17
+  }
+}
diff --git a/dd-java-agent/instrumentation/karate/build.gradle b/dd-java-agent/instrumentation/karate/build.gradle
@@ -1,8 +1,3 @@
-ext {
-  // karate 1.4.0+ requires Java 11 or higher.
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 
 muzzle {
@@ -84,3 +79,11 @@ sourceSets {
 tasks.named("compileLatestDepTestJava", JavaCompile) {
   configureCompiler(it, 11, JavaVersion.VERSION_1_8)
 }
+
+tasks.named("latestDepTest", Test) {
+  // karate 1.4.0+ requires Java 11 or higher.
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
diff --git a/dd-java-agent/instrumentation/mule-4.5/build.gradle b/dd-java-agent/instrumentation/mule-4.5/build.gradle
@@ -1,9 +1,3 @@
-ext {
-  forkedTestMaxJavaVersionForTests = JavaVersion.VERSION_11
-  mule46ForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_11
-  latestDepForkedTestMinJavaVersionForTests = JavaVersion.VERSION_17
-  latestDepForkedTestMaxJavaVersionForTests = JavaVersion.VERSION_17
-}
 def muleVersion = '4.5.0'
 def appDir = "$projectDir/application"
 
@@ -112,6 +106,12 @@ tasks.named("forbiddenApisMain_java11") {
   failOnMissingClasses = false
 }
 
+tasks.named("forkedTest", Test) {
+  jvmConstraint {
+    maxJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
 tasks.named("compileTestGroovy", GroovyCompile) {
   dependsOn 'mvnPackage', 'extractMuleServices'
 }
@@ -129,6 +129,19 @@ tasks.named("compileLatestDepForkedTestJava", JavaCompile) {
   configureCompiler(it, 17)
 }
 
+tasks.named("mule46ForkedTest", Test) {
+  jvmConstraint {
+    maxJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
+tasks.named("latestDepForkedTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_17
+    maxJavaVersionForTests = JavaVersion.VERSION_17
+  }
+}
+
 dependencies {
   compileOnly group: 'org.mule.runtime', name: 'mule-core', version: muleVersion
   compileOnly group: 'org.mule.runtime', name: 'mule-tracer-customization-impl', version: muleVersion
diff --git a/dd-java-agent/instrumentation/quartz-2.0/build.gradle b/dd-java-agent/instrumentation/quartz-2.0/build.gradle
@@ -1,7 +1,3 @@
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-  version40TestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
 muzzle {
   pass {
     group = 'org.quartz-scheduler'
@@ -17,7 +13,6 @@ apply from: "$rootDir/gradle/java.gradle"
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteForDir('version40Test', 'test')
 
-
 dependencies {
   compileOnly group: 'org.quartz-scheduler', name: 'quartz', version: '2.0.0'
   testImplementation group: 'org.quartz-scheduler', name: 'quartz', version: '2.0.0'
@@ -42,3 +37,15 @@ dependencies {
     configureCompiler(it, 11)
   }
 }
+
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
+tasks.named("version40Test", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
diff --git a/dd-java-agent/instrumentation/selenium/build.gradle b/dd-java-agent/instrumentation/selenium/build.gradle
@@ -2,10 +2,6 @@ plugins {
   id 'java-test-fixtures'
 }
 
-ext {
-  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 
 muzzle {
@@ -45,3 +41,10 @@ configurations.matching({ it.name.startsWith('test') || it.name.startsWith('late
 tasks.named("compileLatestDepTestJava", JavaCompile) {
   configureCompiler(it, 11, JavaVersion.VERSION_1_8)
 }
+
+tasks.named("latestDepTest", Test) {
+  jvmConstraint {
+    minJavaVersionForTests = JavaVersion.VERSION_11
+  }
+}
+
diff --git a/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle b/dd-java-agent/instrumentation/spring/spring-boot-1.3/build.gradle
diff --git a/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle b/dd-java-agent/instrumentation/spring/spring-scheduling-3.1/build.gradle
diff --git a/dd-java-agent/instrumentation/testng/testng-7/build.gradle b/dd-java-agent/instrumentation/testng/testng-7/build.gradle
diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/build.gradle
diff --git a/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle b/dd-java-agent/instrumentation/undertow/undertow-2.2/build.gradle
diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/build.gradle
diff --git a/dd-java-agent/instrumentation/wildfly-9.0/build.gradle b/dd-java-agent/instrumentation/wildfly-9.0/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -22,10 +22,6 @@ muzzle {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-ext {`
`26`		`- latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_17`
`27`		`-}`
`28`		`-`
`29`	`25`	`addTestSuiteForDir('v513Test', 'test')`
`30`	`26`	`addTestSuiteForDir('latest5Test', 'test')`
`31`	`27`	`addTestSuiteForDir('latestDepTest', 'test')`
`@@ -66,3 +62,9 @@ configurations.matching { it.name.startsWith('test') }.configureEach {`
`66`	`62`	`tasks.named("compileLatestDepTestJava", JavaCompile) {`
`67`	`63`	`configureCompiler(it, 17, JavaVersion.VERSION_1_8)`
`68`	`64`	`}`
	`65`	`+`
	`66`	`+tasks.named("latestDepTest", Test) {`
	`67`	`+ jvmConstraint {`
	`68`	`+ minJavaVersionForTests = JavaVersion.VERSION_17`
	`69`	`+ }`
	`70`	`+}`