Skip to content

Commit 38f9628

Browse files
authored
BlockHound and debug agent tests use toolchains (#3919)
Running BlockHound and debug agent tests using JDK greater than 8 would fail due to improper version checks. `JavaVersion.current()` reports the JDK used to run gradle, while we are interested in the JDK currently in use by the current toolchain. Signed-off-by: Dariusz Jędrzejczyk <[email protected]>
1 parent 3473c9f commit 38f9628

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

reactor-core/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -369,10 +369,10 @@ if (!JavaVersion.current().isJava9Compatible()) {
369369
}
370370
}
371371

372-
if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_13)) {
373-
blockHoundTest {
374-
jvmArgs = ["-XX:+AllowRedefinitionToAddDeleteMethods"]
375-
}
372+
blockHoundTest {
373+
if (javaLauncher.get().metadata.languageVersion.canCompileOrRun(13)) {
374+
jvmArgs = ["-XX:+AllowRedefinitionToAddDeleteMethods"]
375+
}
376376
}
377377

378378
jar {

reactor-tools/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ test {
9797
maxParallelForks = 1
9898
jvmArgs = [
9999
"-Xverify:all",
100-
JavaVersion.current().isJava9Compatible()
100+
javaLauncher.get().metadata.languageVersion.canCompileOrRun(9)
101101
? "-Xlog:redefine+class*=warning"
102102
: "-XX:TraceRedefineClasses=2"
103103
]
@@ -181,7 +181,7 @@ javaAgentTest {
181181
jvmArgs = [
182182
"-javaagent:${shadowJar.outputs.files.singleFile}",
183183
"-Xverify:all",
184-
JavaVersion.current().isJava9Compatible()
184+
javaLauncher.get().metadata.languageVersion.canCompileOrRun(9)
185185
? "-Xlog:redefine+class*=warning"
186186
: "-XX:TraceRedefineClasses=2"
187187
]

0 commit comments

Comments
 (0)