honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

If not set JAVA_HOME then use the JDK that Gradle was run with instead (for master) (#40622) 

Extending the IDE behavior to the cli
This commit is contained in:
Ricky(道离) 2019-04-01 14:00:28 +08:00 committed by Alpar Torok
parent e596b33ce8
commit 74bf4b8292
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
buildSrc/src/main/groovy/org/elasticsearch/gradle/BuildPlugin.groovy
View File

@ -361,16 +361,8 @@ class BuildPlugin implements Plugin<Project> {
compilerJavaHome = findJavaHome(compilerJavaProperty) compilerJavaHome = findJavaHome(compilerJavaProperty)
} }
if (compilerJavaHome == null) { if (compilerJavaHome == null) {
if (System.getProperty("idea.active") != null || System.getProperty("eclipse.launcher") != null) { // if JAVA_HOME does not set,so we use the JDK that Gradle was run with.
// IntelliJ does not set JAVA_HOME, so we use the JDK that Gradle was run with
return Jvm.current().javaHome return Jvm.current().javaHome
} else {
throw new GradleException(
"JAVA_HOME must be set to build Elasticsearch. " +
"Note that if the variable was just set you might have to run `./gradlew --stop` for " +
"it to be picked up. See https://github.com/elastic/elasticsearch/issues/31399 details."
)
}
} }
return compilerJavaHome return compilerJavaHome
} }