Merge pull request #14629 from jasontedor/path-to-jps
Get jps path relative to the JVM running Gradle
This commit is contained in:
commit
a08657a098
|
@ -18,6 +18,10 @@
|
||||||
*/
|
*/
|
||||||
package org.elasticsearch.gradle.test
|
package org.elasticsearch.gradle.test
|
||||||
|
|
||||||
|
import org.gradle.internal.jvm.Jvm
|
||||||
|
|
||||||
|
import java.nio.file.Paths
|
||||||
|
|
||||||
import org.apache.tools.ant.taskdefs.condition.Os
|
import org.apache.tools.ant.taskdefs.condition.Os
|
||||||
import org.elasticsearch.gradle.ElasticsearchProperties
|
import org.elasticsearch.gradle.ElasticsearchProperties
|
||||||
import org.gradle.api.DefaultTask
|
import org.gradle.api.DefaultTask
|
||||||
|
@ -279,7 +283,11 @@ class ClusterFormationTasks {
|
||||||
onlyIf { pidFile.exists() }
|
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
|
// 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()}"
|
ext.pid = "${ -> pidFile.getText('UTF-8').trim()}"
|
||||||
commandLine new File(System.getenv('JAVA_HOME'), 'bin/jps'), '-l'
|
File jps = Paths.get(Jvm.current().javaHome.toString(), "bin/jps").toFile()
|
||||||
|
if (!jps.exists()) {
|
||||||
|
throw new GradleException("jps executable not found; ensure that you're running Gradle with the JDK rather than the JRE")
|
||||||
|
}
|
||||||
|
commandLine jps, '-l'
|
||||||
standardOutput = new ByteArrayOutputStream()
|
standardOutput = new ByteArrayOutputStream()
|
||||||
doLast {
|
doLast {
|
||||||
String out = standardOutput.toString()
|
String out = standardOutput.toString()
|
||||||
|
|
Loading…
Reference in New Issue