refactor: Convert remaining usage of min/max jdk properties to our extension

Author: bric3

dd-java-agent/agent-profiling/profiling-controller-jfr/implementation/build.gradle

@@ -1,13 +1,12 @@
 import de.thetaphi.forbiddenapis.gradle.CheckForbiddenApis
 
 // Set properties before any plugins get loaded
-ext {
-  minJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 apply from: "$rootDir/gradle/java.gradle"
 apply plugin: 'idea'
 
+testJvmConstraint {
+  minJavaVersionForTests = JavaVersion.VERSION_1_8
+}
 
 sourceSets {
   "main_java11" {

dd-java-agent/instrumentation/classloading/jboss-testing/build.gradle

@@ -1,9 +1,10 @@
-ext {
+apply from: "$rootDir/gradle/java.gradle"
+
+testJvmConstraint {
   // TODO Java 17: This version of jboss-modules doesn't support Java 17
   //  __redirected.__SAXParserFactory can't access com.sun.org.apache.xerces.internal.jaxp
   maxJavaVersionForTests = JavaVersion.VERSION_15
 }
-apply from: "$rootDir/gradle/java.gradle"
 
 dependencies {
   testImplementation project(':dd-java-agent:instrumentation:classloading')

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/build.gradle

@@ -1,13 +1,8 @@
-// Set properties before any plugins get loaded
 ext {
-  // Test use Cassandra 3 which requires Java 8. (Currently incompatible with Java 9.)
-  maxJavaVersionForTests = JavaVersion.VERSION_1_8
   cassandraDriverTestVersions = "[3.0,4.0)"
 }
 
-
 muzzle {
-
   pass {
     group = "com.datastax.cassandra"
     module = "cassandra-driver-core"
@@ -43,6 +38,12 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+
+testJvmConstraint {
+  // Test use Cassandra 3 which requires Java 8. (Currently incompatible with Java 9.)
+  maxJavaVersionForTests = JavaVersion.VERSION_1_8
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.8/build.gradle

@@ -1,13 +1,8 @@
-// Set properties before any plugins get loaded
 ext {
-  // Test use Cassandra 3 which requires Java 8. (Currently incompatible with Java 9.)
-  maxJavaVersionForTests = JavaVersion.VERSION_1_8
   cassandraDriverTestVersions = "[3.8,4.0)"
 }
 
-
 muzzle {
-
   pass {
     group = "com.datastax.cassandra"
     module = "cassandra-driver-core"
@@ -19,6 +14,11 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+testJvmConstraint {
+  // Test use Cassandra 3 which requires Java 8. (Currently incompatible with Java 9.)
+  maxJavaVersionForTests = JavaVersion.VERSION_1_8
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {

dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-4.0/build.gradle

@@ -1,9 +1,3 @@
-ext {
-  // TODO Java 17: The embedded cassandra deadlocks on start every time on Java 17
-  //  This can be changed to use test-containers
-  maxJavaVersionForTests = JavaVersion.VERSION_15
-}
-
 muzzle {
   pass {
     group = "com.datastax.oss"
@@ -15,6 +9,12 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+testJvmConstraint {
+  // TODO Java 17: The embedded cassandra deadlocks on start every time on Java 17
+  //  This can be changed to use test-containers
+  maxJavaVersionForTests = JavaVersion.VERSION_15
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {

dd-java-agent/instrumentation/elasticsearch/rest-5/build.gradle

@@ -1,10 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  // TODO Java 17: The embedded elastic search server doesn't work on Java 17
-  //  This can be changed to use test-containers
-  maxJavaVersionForTests = JavaVersion.VERSION_15
-}
-
 muzzle {
   pass {
     group = "org.elasticsearch.client"
@@ -24,6 +17,12 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+testJvmConstraint {
+  // TODO Java 17: The embedded elastic search server doesn't work on Java 17
+  //  This can be changed to use test-containers
+  maxJavaVersionForTests = JavaVersion.VERSION_15
+}
+
 addTestSuite('latestDepTest')
 
 dependencies {

dd-java-agent/instrumentation/elasticsearch/transport-2/build.gradle

@@ -1,8 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  maxJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 muzzle {
   pass {
     group = "org.elasticsearch"
@@ -15,6 +10,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+testJvmConstraint {
+  maxJavaVersionForTests = JavaVersion.VERSION_1_8
+}
+
 addTestSuiteForDir('latestDepTest', 'latestDepTest')
 
 dependencies {

dd-java-agent/instrumentation/elasticsearch/transport-5/build.gradle

@@ -1,10 +1,3 @@
-// Set properties before any plugins get loaded
-ext {
-  // TODO Java 17: The embedded elastic search server doesn't work on Java 17
-  //  This can be changed to use test-containers
-  maxJavaVersionForTests = JavaVersion.VERSION_15
-}
-
 muzzle {
   pass {
     group = "org.elasticsearch.client"
@@ -24,6 +17,12 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+testJvmConstraint {
+  // TODO Java 17: The embedded elastic search server doesn't work on Java 17
+  //  This can be changed to use test-containers
+  maxJavaVersionForTests = JavaVersion.VERSION_15
+}
+
 dependencies {
   compileOnly group: 'org.elasticsearch.client', name: 'transport', version: '5.0.0'
 

dd-java-agent/instrumentation/glassfish-3.0/build.gradle

@@ -1,7 +1,3 @@
-ext {
-  maxJavaVersionForTests = JavaVersion.VERSION_1_8
-}
-
 muzzle {
   pass {
     group = 'org.glassfish.main.extras'
@@ -14,6 +10,10 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+testJvmConstraint {
+  maxJavaVersionForTests = JavaVersion.VERSION_1_8
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 
 dependencies {

dd-java-agent/instrumentation/ignite-2.0/build.gradle

@@ -1,9 +1,3 @@
-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
-}
-
 muzzle {
   pass {
     group = 'org.apache.ignite'
@@ -21,16 +15,18 @@ muzzle {
 
 apply from: "$rootDir/gradle/java.gradle"
 
+testJvmConstraint {
+  // 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
+}
+
 addTestSuiteForDir('latestDepTest', 'test')
 addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test')
 // ignite 2.16.0 latest version compatible with Java 8
 addTestSuiteForDir('ignite216Test', 'test')
 addTestSuiteExtendingForDir('ignite216ForkedTest', 'ignite216Test', 'test')
 
-testJvmConstraint {
-  minJavaVersionForTests = JavaVersion.VERSION_11
-}
-
 dependencies {
   compileOnly group: 'org.apache.ignite', name: 'ignite-core', version: '2.0.0'
 
@@ -44,8 +40,17 @@ dependencies {
   latestDepTestImplementation group: 'org.apache.ignite', name: 'ignite-indexing', version: '2.+'
 }
 
-for (task in ['compileLatestDepTestGroovy', 'compileLatestDepForkedTestGroovy']) {
-  tasks.named(task, GroovyCompile) {
+for (taskName in ['compileLatestDepTestGroovy', 'compileLatestDepForkedTestGroovy']) {
+  tasks.named(taskName, GroovyCompile) {
     configureCompiler(it, 11)
   }
 }
+
+for (taskName in ['latestDepTest', 'latestDepForkedTest']) {
+  tasks.named(taskName, Test) {
+    testJvmConstraint {
+      // ignite 2.17.0+ requires Java 11+
+      minJavaVersionForTests = JavaVersion.VERSION_11
+    }
+  }
+}