From cbdc13b5875ce3fa746245dc9344fc6087e62915 Mon Sep 17 00:00:00 2001 From: Santiago Mola Date: Fri, 21 Feb 2025 18:54:34 +0100 Subject: [PATCH] Fix ignite-2.0 latestDepTest compilation --- .../instrumentation/ignite-2.0/build.gradle | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dd-java-agent/instrumentation/ignite-2.0/build.gradle b/dd-java-agent/instrumentation/ignite-2.0/build.gradle index e3571337462..543b1050085 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/build.gradle +++ b/dd-java-agent/instrumentation/ignite-2.0/build.gradle @@ -1,6 +1,10 @@ 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 { @@ -21,6 +25,10 @@ muzzle { apply from: "$rootDir/gradle/java.gradle" addTestSuiteForDir('latestDepTest', 'test') +addTestSuiteExtendingForDir('latestDepForkedTest', 'latestDepTest', 'test') +// ignite 2.16.0 latest version compatible with Java 8 +addTestSuiteForDir('ignite216Test', 'test') +addTestSuiteExtendingForDir('ignite216ForkedTest', 'ignite216Test', 'test') dependencies { compileOnly group: 'org.apache.ignite', name: 'ignite-core', version: '2.0.0' @@ -28,6 +36,15 @@ dependencies { testImplementation group: 'org.apache.ignite', name: 'ignite-core', version: '2.0.0' testImplementation group: 'org.apache.ignite', name: 'ignite-indexing', version: '2.0.0' + ignite216TestImplementation group: 'org.apache.ignite', name: 'ignite-core', version: '2.16.0' + ignite216TestImplementation group: 'org.apache.ignite', name: 'ignite-indexing', version: '2.16.0' + latestDepTestImplementation group: 'org.apache.ignite', name: 'ignite-core', version: '2.+' latestDepTestImplementation group: 'org.apache.ignite', name: 'ignite-indexing', version: '2.+' } + +for (task in ['compileLatestDepTestGroovy', 'compileLatestDepForkedTestGroovy']) { + tasks.named(task, GroovyCompile) { + it.javaLauncher = getJavaLauncherFor(11) + } +}