Skip to content

Commit

Permalink
SPARK-1737: Warn rather than fail when Java 7+ is used to create dist…
Browse files Browse the repository at this point in the history
…ributions

Also moves a few lines of code around in make-distribution.sh.

Author: Patrick Wendell <[email protected]>

Closes mesos#669 from pwendell/make-distribution and squashes the following commits:

8bfac49 [Patrick Wendell] Small fix
46918ec [Patrick Wendell] SPARK-1737: Warn rather than fail when Java 7+ is used to create distributions.
  • Loading branch information
pwendell committed May 6, 2014
1 parent 951a5d9 commit 39b8b14
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions make-distribution.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,18 +39,11 @@
# 5) ./bin/spark-shell --master spark://my-master-ip:7077
#

set -o pipefail
# Figure out where the Spark framework is installed
FWDIR="$(cd `dirname $0`; pwd)"
DISTDIR="$FWDIR/dist"

set -o pipefail
VERSION=$(mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -v "INFO" | tail -n 1)
if [ $? != 0 ]; then
echo -e "You need Maven installed to build Spark."
echo -e "Download Maven from https://maven.apache.org/"
exit -1;
fi

if [ -z "$JAVA_HOME" ]; then
echo "Error: JAVA_HOME is not set, cannot proceed."
exit -1
Expand All @@ -59,10 +52,17 @@ fi
JAVA_CMD="$JAVA_HOME"/bin/java
JAVA_VERSION=$("$JAVA_CMD" -version 2>&1)
if ! [[ "$JAVA_VERSION" =~ "1.6" ]]; then
echo "Error: JAVA_HOME must point to a JDK 6 installation (see SPARK-1703)."
echo "***NOTE***: JAVA_HOME is not set to a JDK 6 installation. The resulting"
echo " distribution will not support Java 6. See SPARK-1703."
echo "Output from 'java -version' was:"
echo "$JAVA_VERSION"
exit -1
fi

VERSION=$(mvn help:evaluate -Dexpression=project.version 2>/dev/null | grep -v "INFO" | tail -n 1)
if [ $? != 0 ]; then
echo -e "You need Maven installed to build Spark."
echo -e "Download Maven from https://maven.apache.org/"
exit -1;
fi

# Initialize defaults
Expand Down

0 comments on commit 39b8b14

Please sign in to comment.