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 /bin | |
| 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 'bin')
| -rwxr-xr-x | bin/spark-class | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/bin/spark-class b/bin/spark-class index 7bb1afe4b4..2b59e5df57 100755 --- a/bin/spark-class +++ b/bin/spark-class @@ -58,24 +58,6 @@ fi SPARK_ASSEMBLY_JAR="${ASSEMBLY_DIR}/${ASSEMBLY_JARS}" -# Verify that versions of java used to build the jars and run Spark are compatible -if [ -n "$JAVA_HOME" ]; then - JAR_CMD="$JAVA_HOME/bin/jar" -else - JAR_CMD="jar" -fi - -if [ $(command -v "$JAR_CMD") ] ; then - jar_error_check=$("$JAR_CMD" -tf "$SPARK_ASSEMBLY_JAR" nonexistent/class/path 2>&1) - if [[ "$jar_error_check" =~ "invalid CEN header" ]]; then - echo "Loading Spark jar with '$JAR_CMD' failed. " 1>&2 - echo "This is likely because Spark was compiled with Java 7 and run " 1>&2 - echo "with Java 6. (see SPARK-1703). Please use Java 7 to run Spark " 1>&2 - echo "or build Spark with Java 6." 1>&2 - exit 1 - fi -fi - LAUNCH_CLASSPATH="$SPARK_ASSEMBLY_JAR" # Add the launcher build dir to the classpath if requested. |