zeppelin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject zeppelin git commit: [ZEPPELIN-1544]upgrade spark version to 2.0.1 as profile spark-2.0
Date Wed, 19 Oct 2016 22:11:12 GMT
Repository: zeppelin
Updated Branches:
  refs/heads/master ab4463381 -> 26e67d5ae


[ZEPPELIN-1544]upgrade spark version to 2.0.1 as profile spark-2.0

### What is this PR for?
A few sentences describing the overall goals of the pull request's commits.
First time? Check out the contributing guide - https://zeppelin.apache.org/contribution/contributions.html

### What type of PR is it?
[Bug Fix | Improvement | Feature | Documentation | Hot Fix | Refactoring]

### Todos
* [ ] - Task

### What is the Jira issue?
* Open an issue on Jira https://issues.apache.org/jira/browse/ZEPPELIN/
* Put link here, and add [ZEPPELIN-*Jira number*] in PR title, eg. [ZEPPELIN-533]

### How should this be tested?
Outline the steps to test the PR here.

### Screenshots (if appropriate)

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

Author: LantaoJin <jinlantao@gmail.com>

Closes #1511 from LantaoJin/master and squashes the following commits:

671cd68 [LantaoJin] keep old py4j for backward compatibility
3bd84cc [LantaoJin] [ZEPPELIN-1544]upgrade spark version to 2.0.1 as profile spark-2.0


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

Branch: refs/heads/master
Commit: 26e67d5ae83303226308915243fb0da15dc00315
Parents: ab44633
Author: LantaoJin <jinlantao@gmail.com>
Authored: Sun Oct 16 11:31:42 2016 +0800
Committer: Lee moon soo <moon@apache.org>
Committed: Thu Oct 20 07:11:07 2016 +0900

----------------------------------------------------------------------
 spark-dependencies/pom.xml                                     | 4 ++--
 spark/pom.xml                                                  | 6 +++---
 .../main/java/org/apache/zeppelin/spark/SparkInterpreter.java  | 2 +-
 zeppelin-distribution/src/bin_license/LICENSE                  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/zeppelin/blob/26e67d5a/spark-dependencies/pom.xml
----------------------------------------------------------------------
diff --git a/spark-dependencies/pom.xml b/spark-dependencies/pom.xml
index f320680..04b6983 100644
--- a/spark-dependencies/pom.xml
+++ b/spark-dependencies/pom.xml
@@ -525,9 +525,9 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <spark.version>2.0.0</spark.version>
+        <spark.version>2.0.1</spark.version>
         <protobuf.version>2.5.0</protobuf.version>
-        <py4j.version>0.10.1</py4j.version>
+        <py4j.version>0.10.3</py4j.version>
         <scala.version>2.11.8</scala.version>
       </properties>
     </profile>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/26e67d5a/spark/pom.xml
----------------------------------------------------------------------
diff --git a/spark/pom.xml b/spark/pom.xml
index 66d93c4..efb7452 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -37,7 +37,7 @@
     <jsoup.version>1.8.2</jsoup.version>
     <mockito.version>1.10.19</mockito.version>
     <powermock.version>1.6.4</powermock.version>
-    <spark.version>2.0.0</spark.version>
+    <spark.version>2.0.1</spark.version>
   </properties>
 
   <dependencies>
@@ -519,9 +519,9 @@
         <activeByDefault>true</activeByDefault>
       </activation>
       <properties>
-        <spark.version>2.0.0</spark.version>
+        <spark.version>2.0.1</spark.version>
         <protobuf.version>2.5.0</protobuf.version>
-        <py4j.version>0.10.1</py4j.version>
+        <py4j.version>0.10.3</py4j.version>
         <scala.version>2.11.8</scala.version>
       </properties>
     </profile>

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/26e67d5a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
----------------------------------------------------------------------
diff --git a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
index d2d4907..0812c76 100644
--- a/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
+++ b/spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java
@@ -481,7 +481,7 @@ public class SparkInterpreter extends Interpreter {
 
     //Only one of py4j-0.9-src.zip and py4j-0.8.2.1-src.zip should exist
     String[] pythonLibs = new String[]{"pyspark.zip", "py4j-0.9-src.zip", "py4j-0.8.2.1-src.zip",
-      "py4j-0.10.1-src.zip"};
+      "py4j-0.10.1-src.zip", "py4j-0.10.3-src.zip"};
     ArrayList<String> pythonLibUris = new ArrayList<>();
     for (String lib : pythonLibs) {
       File libFile = new File(pysparkPath, lib);

http://git-wip-us.apache.org/repos/asf/zeppelin/blob/26e67d5a/zeppelin-distribution/src/bin_license/LICENSE
----------------------------------------------------------------------
diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
index 441a3cd..99853d7 100644
--- a/zeppelin-distribution/src/bin_license/LICENSE
+++ b/zeppelin-distribution/src/bin_license/LICENSE
@@ -259,7 +259,7 @@ The following components are provided under the BSD-style License.
     (BSD-like) ASM asm-utils (org.ow2.asm:asm-utils:5.0.3 - http://asm.ow2.org/) - Copyright
(c) 2000-2011 INRIA, France Telecom
     (New BSD License) Markdown4j (org.commonjava.googlecode.markdown4j:markdown4j:jar:2.2-cj-1.0
- https://code.google.com/p/markdown4j/)
     (New BSD License) Py4J (net.sf.py4j:py4j:0.9 - http://py4j.sourceforge.net/)
-    (New BSD License) Py4J (net.sf.py4j:py4j:0.10.1 - http://py4j.sourceforge.net/) - https://github.com/bartdag/py4j/blob/0.10.1/LICENSE.txt
+    (New BSD License) Py4J (net.sf.py4j:py4j:0.10.3 - http://py4j.sourceforge.net/) - https://github.com/bartdag/py4j/blob/0.10.3/LICENSE.txt
     (New BSD License) Markdown4j (org.commonjava.googlecode.markdown4j:markdown4j:jar:2.2-cj-1.0
- https://code.google.com/p/markdown4j/)
     (BSD 3 Clause) Paranamer (com.thoughtworks.paranamer:paranamer:jar:2.6) - https://github.com/paul-hammant/paranamer/blob/paranamer-parent-2.6/LICENSE.txt
     (BSD 3 Clause) netlib core (com.github.fommil.netlib:core:1.1.2 - https://github.com/fommil/netlib-java/core)


Mime
View raw message