You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2018/03/07 05:35:52 UTC

zeppelin git commit: ZEPPELIN-3302. Update SparkVersion.java to support Spark 2.3

Repository: zeppelin
Updated Branches:
  refs/heads/master 733a20210 -> db3774640


ZEPPELIN-3302. Update SparkVersion.java to support Spark 2.3

### What is this PR for?

Trivial PR to support 2.3 via updating SparkVersion.java. Unfortunately we cannot download spark 2.3 from http://d3kbcqa49mib13.cloudfront.net, will leave it in ZEPPELIN-3305

### What type of PR is it?
[Improvement]

### Todos
* [ ] - Task

### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-3302

### How should this be tested?
* CI pass

### Screenshots (if appropriate)

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

Author: Jeff Zhang <zj...@apache.org>

Closes #2846 from zjffdu/ZEPPELIN-3302-2 and squashes the following commits:

212eb68 [Jeff Zhang] ZEPPELIN-3302. Update SparkVersion.java to support Spark 2.3


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

Branch: refs/heads/master
Commit: db3774640f446db9c6b00ee8ca5375405dd027be
Parents: 733a202
Author: Jeff Zhang <zj...@apache.org>
Authored: Wed Mar 7 11:21:19 2018 +0800
Committer: Jeff Zhang <zj...@apache.org>
Committed: Wed Mar 7 13:35:44 2018 +0800

----------------------------------------------------------------------
 .../src/main/java/org/apache/zeppelin/spark/SparkVersion.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/db377464/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
----------------------------------------------------------------------
diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkVersion.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
index 4b02798..09ea332 100644
--- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/SparkVersion.java
+++ b/spark/interpreter/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_3_0 = SparkVersion.fromVersionString("2.3.0");
+  public static final SparkVersion SPARK_2_4_0 = SparkVersion.fromVersionString("2.4.0");
 
   public static final SparkVersion MIN_SUPPORTED_VERSION =  SPARK_1_0_0;
-  public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_2_3_0;
+  public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_2_4_0;
 
   private int version;
   private String versionString;