Decouple test JDK and gradle JDK in karate latestDepTest (#8234)

DataDog · Jan 17, 2025 · f05dac8 · f05dac8
1 parent f1d359b
commit f05dac8
Showing 1 changed file with 22 additions and 8 deletions.
diff --git a/dd-java-agent/instrumentation/karate/build.gradle b/dd-java-agent/instrumentation/karate/build.gradle
@@ -1,3 +1,8 @@
+ext {
+  // karate 1.4.0+ requires Java 11 or higher.
+  latestDepTestMinJavaVersionForTests = JavaVersion.VERSION_11
+}
+
 apply from: "$rootDir/gradle/java.gradle"
 
 muzzle {
@@ -16,6 +21,8 @@ muzzle {
 }
 
 addTestSuiteForDir('latestDepTest', 'test')
+// karate 1.3.1 is the last version supporting Java 8.
+addTestSuiteForDir('karate131Test', 'test')
 
 dependencies {
   compileOnly group: 'com.intuit.karate', name: 'karate-core', version: '1.0.0'
@@ -33,6 +40,15 @@ dependencies {
     exclude group: 'ch.qos.logback', module: 'logback-classic'
   }
 
+  karate131TestImplementation (group: 'com.intuit.karate', name: 'karate-core', version: '1.3.1') {
+    // excluding logback to avoid conflicts with libs.bundles.test.logging
+    exclude group: 'ch.qos.logback', module: 'logback-classic'
+  }
+  karate131TestImplementation (group: 'com.intuit.karate', name: 'karate-junit5', version: '1.3.1') {
+    // excluding logback to avoid conflicts with libs.bundles.test.logging
+    exclude group: 'ch.qos.logback', module: 'logback-classic'
+  }
+
   latestDepTestImplementation (group: 'com.intuit.karate', name: 'karate-core', version: '+') {
     // excluding logback to avoid conflicts with libs.bundles.test.logging
     exclude group: 'ch.qos.logback', module: 'logback-classic'
@@ -51,18 +67,16 @@ sourceSets {
       exclude '**/*.java'
     }
   }
+  karate131Test {
+    resources {
+      srcDir file('src/test/java')
+      exclude '**/*.java'
+    }
+  }
   latestDepTest {
     resources {
       srcDir file('src/test/java')
       exclude '**/*.java'
     }
   }
 }
-
-configurations.matching({ it.name.startsWith('latestDepTest') }).each({
-  it.resolutionStrategy {
-    // Karate 1.4.0+ is compiled with Java 11
-    force group: 'com.intuit.karate', name: 'karate-core', version: (JavaVersion.current().java11Compatible ? '+' : '1.3.1')
-    force group: 'com.intuit.karate', name: 'karate-junit5', version: (JavaVersion.current().java11Compatible ? '+' : '1.3.1')
-  }
-})