From 39b8b1489ff92697e4aeec997cdc436c7079d6f8 Mon Sep 17 00:00:00 2001
From: Patrick Wendell <pwendell@gmail.com>
Date: Tue, 6 May 2014 15:41:46 -0700
Subject: [PATCH] SPARK-1737: Warn rather than fail when Java 7+ is used to
create distributions
Also moves a few lines of code around in make-distribution.sh.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #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.
---
make-distribution.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/make-distribution.sh b/make-distribution.sh
index 8a63133bc4..ebcd8c74fc 100755
--- a/make-distribution.sh
+++ b/make-distribution.sh
@@ -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
@@ -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
--
GitLab