diff options
| author | Sean Owen <sowen@cloudera.com> | 2015-06-07 20:18:13 +0100 |
|---|---|---|
| committer | Sean Owen <sowen@cloudera.com> | 2015-06-07 20:18:13 +0100 |
| commit | e84815dc333a69368a48e0152f02934980768a14 (patch) | |
| tree | 032e13a3ca316f81d3f58fd3ca7904ebc3f3ca9d /make-distribution.sh | |
| parent | db81b9d89f62f18a3c4c2d9bced8486bfdea54a2 (diff) | |
| download | spark-e84815dc333a69368a48e0152f02934980768a14.tar.gz spark-e84815dc333a69368a48e0152f02934980768a14.tar.bz2 spark-e84815dc333a69368a48e0152f02934980768a14.zip | |
[SPARK-7733] [CORE] [BUILD] Update build, code to use Java 7 for 1.5.0+
Update build to use Java 7, and remove some comments and special-case support for Java 6.
Author: Sean Owen <sowen@cloudera.com>
Closes #6265 from srowen/SPARK-7733 and squashes the following commits:
59bda4e [Sean Owen] Update build to use Java 7, and remove some comments and special-case support for Java 6
Diffstat (limited to 'make-distribution.sh')
| -rwxr-xr-x | make-distribution.sh | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/make-distribution.sh b/make-distribution.sh index a2b0c431fb..9f063da3a1 100755 --- a/make-distribution.sh +++ b/make-distribution.sh @@ -141,22 +141,6 @@ SPARK_HIVE=$("$MVN" help:evaluate -Dexpression=project.activeProfiles -pl sql/hi # because we use "set -o pipefail" echo -n) -JAVA_CMD="$JAVA_HOME"/bin/java -JAVA_VERSION=$("$JAVA_CMD" -version 2>&1) -if [[ ! "$JAVA_VERSION" =~ "1.6" && -z "$SKIP_JAVA_TEST" ]]; then - echo "***NOTE***: JAVA_HOME is not set to a JDK 6 installation. The resulting" - echo " distribution may not work well with PySpark and will not run" - echo " with Java 6 (See SPARK-1703 and SPARK-1911)." - echo " This test can be disabled by adding --skip-java-test." - echo "Output from 'java -version' was:" - echo "$JAVA_VERSION" - read -p "Would you like to continue anyways? [y,n]: " -r - if [[ ! "$REPLY" =~ ^[Yy]$ ]]; then - echo "Okay, exiting." - exit 1 - fi -fi - if [ "$NAME" == "none" ]; then NAME=$SPARK_HADOOP_VERSION fi |