You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2015/11/12 16:10:03 UTC
incubator-zeppelin git commit: [ZEPPELIN-409] upgrade spark to 1.5.2
Repository: incubator-zeppelin
Updated Branches:
refs/heads/master c877cd9d0 -> 913bc0955
[ZEPPELIN-409] upgrade spark to 1.5.2
Upgrade spark to latest (1.5.2) version
Author: tog <gu...@gmail.com>
Closes #417 from galleon/spark-1.5.2 and squashes the following commits:
b283a5a [tog] modified .travis.yml to take the new spark release into account
05386ff [tog] [ZEPPELIN-409] upgrade spark to 1.5.2
Project: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/commit/913bc095
Tree: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/tree/913bc095
Diff: http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/diff/913bc095
Branch: refs/heads/master
Commit: 913bc0955c4ae48ba473645d6057da0647a11024
Parents: c877cd9
Author: tog <gu...@gmail.com>
Authored: Wed Nov 11 07:24:13 2015 +0000
Committer: Lee moon soo <mo...@apache.org>
Committed: Fri Nov 13 00:10:16 2015 +0900
----------------------------------------------------------------------
.travis.yml | 6 +++---
spark-dependencies/pom.xml | 2 +-
.../src/main/java/org/apache/zeppelin/spark/SparkVersion.java | 3 ++-
3 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/913bc095/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 0c74edf..213fc56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,10 +30,10 @@ before_script:
script:
# spark 1.5
- mvn package -Pbuild-distr -Phadoop-2.3 -Ppyspark -B
- - ./testing/startSparkCluster.sh 1.5.1 2.3
- - echo "export SPARK_HOME=`pwd`/spark-1.5.1-bin-hadoop2.3" > conf/zeppelin-env.sh
+ - ./testing/startSparkCluster.sh 1.5.2 2.3
+ - echo "export SPARK_HOME=`pwd`/spark-1.5.2-bin-hadoop2.3" > conf/zeppelin-env.sh
- mvn verify -Pusing-packaged-distr -Phadoop-2.3 -Ppyspark -B
- - ./testing/stopSparkCluster.sh 1.5.1 2.3
+ - ./testing/stopSparkCluster.sh 1.5.2 2.3
# spark 1.4
- rm -rf `pwd`/interpreter/spark
- mvn package -DskipTests -Pspark-1.4 -Phadoop-2.3 -Ppyspark -B -pl 'zeppelin-interpreter,spark-dependencies,spark'
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/913bc095/spark-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 8304761..3af0678 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -480,7 +480,7 @@
<profile>
<id>spark-1.5</id>
<properties>
- <spark.version>1.5.1</spark.version>
+ <spark.version>1.5.2</spark.version>
<akka.group>com.typesafe.akka</akka.group>
<akka.version>2.3.11</akka.version>
<protobuf.version>2.5.0</protobuf.version>
http://git-wip-us.apache.org/repos/asf/incubator-zeppelin/blob/913bc095/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
index 97716fa..e5256b7 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
@@ -32,7 +32,8 @@ public enum SparkVersion {
SPARK_1_4_0,
SPARK_1_4_1,
SPARK_1_5_0,
- SPARK_1_5_1;
+ SPARK_1_5_1,
+ SPARK_1_5_2;
private int version;