From fd537e7d5a0670cb5299d0c1d01f0d047b6a1885 Mon Sep 17 00:00:00 2001 From: Dmitriy Novozhilov Date: Tue, 20 Jul 2021 15:41:53 +0300 Subject: [PATCH] [Build] Detect JDK 17 in old way using environment variables There is a problem that toolchains can not detect JDK 17 EAP on windows agents. This commit will be reverted after JDK 17 release in adoptopenjdk.net --- compiler/tests-common-new/build.gradle.kts | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/compiler/tests-common-new/build.gradle.kts b/compiler/tests-common-new/build.gradle.kts index b174a20e1c3..71751c43f44 100644 --- a/compiler/tests-common-new/build.gradle.kts +++ b/compiler/tests-common-new/build.gradle.kts @@ -56,23 +56,6 @@ projectTest(jUnit5Enabled = true) { maxHeapSize = "3g" useJUnitPlatform() - - doFirst { - systemProperty( - "JDK_9", - project.getToolchainLauncherFor(JdkMajorVersion.JDK_9).get().metadata.installationPath.asFile.absolutePath - ) - - systemProperty( - "JDK_15_0", - project.getToolchainLauncherFor(JdkMajorVersion.JDK_15).get().metadata.installationPath.asFile.absolutePath - ) - - systemProperty( - "JDK_17_0", - project.getToolchainLauncherFor(JdkMajorVersion.JDK_17).get().metadata.installationPath.asFile.absolutePath - ) - } } testsJar()