diff options
| author | Sean Owen <sowen@cloudera.com> | 2017-02-16 18:43:38 +0000 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2017-02-16 18:43:38 +0000 |
| commit | dcc2d540a53f0bd04baead43fdee1c170ef2b9f3 (patch) | |
| tree | c69869c517d91df6756b329cde7bffc708ebba5f /dev/mima | |
| parent | 54a30c8a70c86294059e6eb6b30cb81978b47b54 (diff) | |
| download | spark-dcc2d540a53f0bd04baead43fdee1c170ef2b9f3.tar.gz spark-dcc2d540a53f0bd04baead43fdee1c170ef2b9f3.tar.bz2 spark-dcc2d540a53f0bd04baead43fdee1c170ef2b9f3.zip | |
[SPARK-19550][HOTFIX][BUILD] Use JAVA_HOME/bin/java if JAVA_HOME is set in dev/mima
## What changes were proposed in this pull request?
Use JAVA_HOME/bin/java if JAVA_HOME is set in dev/mima script to run MiMa
This follows on https://github.com/apache/spark/pull/16871 -- it's a slightly separate issue, but, is currently causing a build failure.
## How was this patch tested?
Manually tested.
Author: Sean Owen <sowen@cloudera.com>
Closes #16957 from srowen/SPARK-19550.2.
Diffstat (limited to 'dev/mima')
| -rwxr-xr-x | dev/mima | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -30,7 +30,13 @@ OLD_DEPS_CLASSPATH="$(build/sbt -DcopyDependencies=false $SPARK_PROFILES "export rm -f .generated-mima* -java \ +if [[ -x "$JAVA_HOME/bin/java" ]]; then + JAVA_CMD="$JAVA_HOME/bin/java" +else + JAVA_CMD=java +fi + +$JAVA_CMD \ -Xmx2g \ -cp "$TOOLS_CLASSPATH:$OLD_DEPS_CLASSPATH" \ org.apache.spark.tools.GenerateMIMAIgnore |