diff --git a/gradle/runtime-jdk-provision.gradle b/gradle/runtime-jdk-provision.gradle index e67d1d44f50..4deb9c0a756 100644 --- a/gradle/runtime-jdk-provision.gradle +++ b/gradle/runtime-jdk-provision.gradle @@ -5,20 +5,23 @@ import org.elasticsearch.gradle.info.BuildParams apply plugin: 'elasticsearch.jdk-download' jdks { - provisioned_runtime { - vendor = VersionProperties.bundledJdkVendor - version = VersionProperties.getBundledJdk(OS.current().name().toLowerCase()) - platform = OS.current().name().toLowerCase() - } + provisioned_runtime { + vendor = VersionProperties.bundledJdkVendor + version = VersionProperties.getBundledJdk(OS.current().name().toLowerCase()) + platform = OS.current().name().toLowerCase() + } } allprojects { + if (project.path != ":build-tools") { + // Build tools doesn't support java 8 still used in CI project.tasks.withType(Test).configureEach { Test test -> - if (BuildParams.getIsRuntimeJavaHomeSet()) { - test.executable = "${BuildParams.runtimeJavaHome}/bin/java" - } else { - test.dependsOn(rootProject.jdks.provisioned_runtime) - test.executable = rootProject.jdks.provisioned_runtime.getBinJavaPath() - } + if (BuildParams.getIsRuntimeJavaHomeSet()) { + test.executable = "${BuildParams.runtimeJavaHome}/bin/java" + } else { + test.dependsOn(rootProject.jdks.provisioned_runtime) + test.executable = rootProject.jdks.provisioned_runtime.getBinJavaPath() + } } -} \ No newline at end of file + } +}