Fix declaring dedicated toolchain java home

breskeby · Oct 10, 2023 · 31b5a7a · 31b5a7a
1 parent 0efd101
commit 31b5a7a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...-internal/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java b/...-internal/src/main/java/org/elasticsearch/gradle/internal/info/GlobalBuildInfoPlugin.java
@@ -149,12 +149,12 @@ public void apply(Project project) {
     }
 
     private Provider<MetadataBasedToolChainMatcher> resolveToolchainSpecFromEnv() {
-        return providers.environmentVariable("JAVA_TOOLCHAIN_HOME").map(toolChainEnvVariable -> {
+        return providers.environmentVariable("TOOLCHAIN_JAVA_HOME").map(toolChainEnvVariable -> {
             File toolChainDir = new File(toolChainEnvVariable);
             JvmInstallationMetadata metadata = metadataDetector.getMetadata(getJavaInstallation(toolChainDir));
             if (metadata.isValidInstallation() == false) {
                 throw new GradleException(
-                    "Configured JAVA_TOOLCHAIN_HOME " + toolChainEnvVariable + " does not point to a valid jdk installation."
+                    "Configured TOOLCHAIN_JAVA_HOME " + toolChainEnvVariable + " does not point to a valid jdk installation."
                 );
             }
             return new MetadataBasedToolChainMatcher(metadata);
@@ -205,9 +205,9 @@ private void logGlobalBuildInfo() {
             LOGGER.quiet("  JDK Version           : " + gradleJvmImplementationVersion + " (" + gradleJvmVendorDetails + ")");
             LOGGER.quiet("  JAVA_HOME             : " + gradleJvm.getJavaHome());
         }
-        String javaToolchainHome = System.getenv("JAVA_TOOLCHAIN_HOME");
+        String javaToolchainHome = System.getenv("TOOLCHAIN_JAVA_HOME");
         if (javaToolchainHome != null) {
-            LOGGER.quiet("  JAVA_TOOLCHAIN_HOME   : " + javaToolchainHome);
+            LOGGER.quiet("  TOOLCHAIN_JAVA_HOME   : " + javaToolchainHome);
         }
         LOGGER.quiet("  Random Testing Seed   : " + BuildParams.getTestSeed());
         LOGGER.quiet("  In FIPS 140 mode      : " + BuildParams.isInFipsJvm());

diff --git a/gradle.properties b/gradle.properties
@@ -16,5 +16,5 @@ org.gradle.java.installations.auto-detect=false
 # log some dependency verification info to console
 org.gradle.dependency.verification.console=verbose
 
-# allow user to specify toolchain via the RUNTIME_JAVA_HOME environment variable
-org.gradle.java.installations.fromEnv=RUNTIME_JAVA_HOME
+# allow user to specify toolchain via the RUNTIME_JAVA_HOME and TOOLCHAIN_JAVA_HOME environment variable
+org.gradle.java.installations.fromEnv=RUNTIME_JAVA_HOME,TOOLCHAIN_JAVA_HOME