From a7b78bf67aee91bb681e0e9627468c9209527d2e Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Mon, 9 Nov 2015 08:12:08 -0500 Subject: [PATCH] [build] Use always set java.home `System.getenv('JAVA_HOME')` relies on JAVA_HOME being setup by the user. `System.getProperty('java.home')` is set by Java all the time. Closes #14614 --- .../elasticsearch/gradle/test/ClusterFormationTasks.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy index 0b835872ec1..e1d408ead9e 100644 --- a/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy +++ b/buildSrc/src/main/groovy/org/elasticsearch/gradle/test/ClusterFormationTasks.groovy @@ -279,7 +279,7 @@ class ClusterFormationTasks { onlyIf { pidFile.exists() } // the pid file won't actually be read until execution time, since the read is wrapped within an inner closure of the GString ext.pid = "${ -> pidFile.getText('UTF-8').trim()}" - commandLine new File(System.getenv('JAVA_HOME'), 'bin/jps'), '-l' + commandLine new File(System.getProperty('java.home'), 'bin/jps'), '-l' standardOutput = new ByteArrayOutputStream() doLast { String out = standardOutput.toString() @@ -336,4 +336,4 @@ class ClusterFormationTasks { static File pidFile(File dir) { return new File(dir, 'es.pid') } -} \ No newline at end of file +}