zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zjf...@apache.org
Subject zeppelin git commit: [ZEPPELIN-2768]. Bump up Spark version to 2.2.0
Date Fri, 14 Jul 2017 07:12:21 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/branch-0.7 d59ff44b7 -> 28310c2b9


[ZEPPELIN-2768]. Bump up Spark version to 2.2.0

Spark 2.2.0 is just released, this PR is to support spark 2.2.0.

[Improvement]

* [ ] - Task

* https://issues.apache.org/jira/browse/ZEPPELIN-2768

Travis is updated

* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No

Author: Jeff Zhang <zjffdu@apache.org>

Closes #2486 from zjffdu/ZEPPELIN-2768 and squashes the following commits:

5adc2e5 [Jeff Zhang] [ZEPPELIN-2768]. Bump up Spark version to 2.2.0

(cherry picked from commit ebb6591d84881a1c0408bbaf27073dedb387c411)
Signed-off-by: Jeff Zhang <zjffdu@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo
Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/28310c2b
Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/28310c2b
Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/28310c2b

Branch: refs/heads/branch-0.7
Commit: 28310c2b95785d8b9e63bc0adc5a26df8b3c9dec
Parents: d59ff44
Author: Jeff Zhang <zjffdu@apache.org>
Authored: Wed Jul 12 11:51:47 2017 +0800
Committer: Jeff Zhang <zjffdu@apache.org>
Committed: Fri Jul 14 15:12:07 2017 +0800

----------------------------------------------------------------------
 .travis.yml                                             |  4 ++++
 spark-dependencies/pom.xml                              | 12 +++++++++++-
 spark/pom.xml                                           | 12 +++++++++++-
 .../java/org/apache/zeppelin/spark/SparkVersion.java    |  4 ++--
 4 files changed, 28 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/28310c2b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index c7e97d8..10eba61 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -57,6 +57,10 @@ matrix:
     - jdk: "oraclejdk7"
       env: SCALA_VER="2.10" PROFILE="-Pscalding" BUILD_FLAG="package -DskipTests -DskipRat"
TEST_FLAG="test -DskipRat" MODULES="-pl $(echo .,zeppelin-interpreter,${INTERPRETERS} | sed
's/!//g')" TEST_PROJECTS=""
 
+    # Test spark module for 2.2.0 with scala 2.11, livy
+    - jdk: "oraclejdk8"
+      env: SCALA_VER="2.11" SPARK_VER="2.2.0" HADOOP_VER="2.6" PROFILE="-Pweb-ci -Pspark-2.2
-Phadoop-2.6 -Pscala-2.11" SPARKR="true" BUILD_FLAG="package -DskipTests -DskipRat" TEST_FLAG="test
-DskipRat" MODULES="-pl .,zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,livy"
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest,org.apache.zeppelin.spark.*,org.apache.zeppelin.livy.*
-DfailIfNoTests=false"
+
     # Test spark module for 2.1.0 with scala 2.11, livy
     - jdk: "oraclejdk7"
       env: SCALA_VER="2.11" SPARK_VER="2.1.0" HADOOP_VER="2.6" PROFILE="-Pspark-2.1 -Phadoop-2.6
-Ppyspark -Psparkr -Pscala-2.11" BUILD_FLAG="package -DskipTests -DskipRat" TEST_FLAG="test
-DskipRat" MODULES="-pl .,zeppelin-interpreter,zeppelin-zengine,zeppelin-server,zeppelin-display,spark-dependencies,spark,livy"
TEST_PROJECTS="-Dtest=ZeppelinSparkClusterTest,org.apache.zeppelin.spark.*,org.apache.zeppelin.livy.*
-DfailIfNoTests=false"

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/28310c2b/spark-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index 74035a4..ffdc754 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -532,11 +532,21 @@
 
     <profile>
       <id>spark-2.1</id>
+      <properties>
+        <spark.version>2.1.0</spark.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <spark.py4j.version>0.10.4</spark.py4j.version>
+        <scala.version>2.11.8</scala.version>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>spark-2.2</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <spark.version>2.1.0</spark.version>
+        <spark.version>2.2.0</spark.version>
         <protobuf.version>2.5.0</protobuf.version>
         <py4j.version>0.10.4</py4j.version>
       </properties>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/28310c2b/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 9531880..3d005eb 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -525,11 +525,21 @@
 
     <profile>
       <id>spark-2.1</id>
+      <properties>
+        <spark.version>2.1.0</spark.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <spark.py4j.version>0.10.4</spark.py4j.version>
+        <scala.version>2.11.8</scala.version>
+      </properties>
+    </profile>
+
+    <profile>
+      <id>spark-2.2</id>
       <activation>
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <spark.version>2.1.0</spark.version>
+        <spark.version>2.2.0</spark.version>
         <protobuf.version>2.5.0</protobuf.version>
         <py4j.version>0.10.4</py4j.version>
       </properties>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/28310c2b/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 8e47ce3..4b02798 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
@@ -34,10 +34,10 @@ public class SparkVersion {
   public static final SparkVersion SPARK_1_6_0 = SparkVersion.fromVersionString("1.6.0");
 
   public static final SparkVersion SPARK_2_0_0 = SparkVersion.fromVersionString("2.0.0");
-  public static final SparkVersion SPARK_2_2_0 = SparkVersion.fromVersionString("2.2.0");
+  public static final SparkVersion SPARK_2_3_0 = SparkVersion.fromVersionString("2.3.0");
 
   public static final SparkVersion MIN_SUPPORTED_VERSION =  SPARK_1_0_0;
-  public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_2_2_0;
+  public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_2_3_0;
 
   private int version;
   private String versionString;


Mime
View raw message