Skip to content

Commit 3bd84cc

Browse files
LantaoJinLantaoJin
committed
[ZEPPELIN-1544]upgrade spark version to 2.0.1 as profile spark-2.0
1 parent 5d5d758 commit 3bd84cc

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

‎spark-dependencies/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -525,9 +525,9 @@
525525
<activeByDefault>true</activeByDefault>
526526
</activation>
527527
<properties>
528-
<spark.version>2.0.0</spark.version>
528+
<spark.version>2.0.1</spark.version>
529529
<protobuf.version>2.5.0</protobuf.version>
530-
<py4j.version>0.10.1</py4j.version>
530+
<py4j.version>0.10.3</py4j.version>
531531
<scala.version>2.11.8</scala.version>
532532
</properties>
533533
</profile>

‎spark/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<jsoup.version>1.8.2</jsoup.version>
3838
<mockito.version>1.10.19</mockito.version>
3939
<powermock.version>1.6.4</powermock.version>
40-
<spark.version>2.0.0</spark.version>
40+
<spark.version>2.0.1</spark.version>
4141
</properties>
4242

4343
<dependencies>
@@ -519,9 +519,9 @@
519519
<activeByDefault>true</activeByDefault>
520520
</activation>
521521
<properties>
522-
<spark.version>2.0.0</spark.version>
522+
<spark.version>2.0.1</spark.version>
523523
<protobuf.version>2.5.0</protobuf.version>
524-
<py4j.version>0.10.1</py4j.version>
524+
<py4j.version>0.10.3</py4j.version>
525525
<scala.version>2.11.8</scala.version>
526526
</properties>
527527
</profile>

‎spark/src/main/java/org/apache/zeppelin/spark/SparkInterpreter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -479,7 +479,7 @@ private void setupConfForPySpark(SparkConf conf) {
479479

480480
//Only one of py4j-0.9-src.zip and py4j-0.8.2.1-src.zip should exist
481481
String[] pythonLibs = new String[]{"pyspark.zip", "py4j-0.9-src.zip", "py4j-0.8.2.1-src.zip",
482-
"py4j-0.10.1-src.zip"};
482+
"py4j-0.10.3-src.zip"};
483483
ArrayList<String> pythonLibUris = new ArrayList<>();
484484
for (String lib : pythonLibs) {
485485
File libFile = new File(pysparkPath, lib);

‎zeppelin-distribution/src/bin_license/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ The following components are provided under the BSD-style License.
252252
(BSD-like) ASM asm-utils (org.ow2.asm:asm-utils:5.0.3 - http://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom
253253
(New BSD License) Markdown4j (org.commonjava.googlecode.markdown4j:markdown4j:jar:2.2-cj-1.0 - https://code.google.com/p/markdown4j/)
254254
(New BSD License) Py4J (net.sf.py4j:py4j:0.9 - http://py4j.sourceforge.net/)
255-
(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
255+
(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
256256
(New BSD License) Markdown4j (org.commonjava.googlecode.markdown4j:markdown4j:jar:2.2-cj-1.0 - https://code.google.com/p/markdown4j/)
257257
(BSD 3 Clause) Paranamer (com.thoughtworks.paranamer:paranamer:jar:2.6) - https://github.com/paul-hammant/paranamer/blob/paranamer-parent-2.6/LICENSE.txt
258258
(BSD 3 Clause) netlib core (com.github.fommil.netlib:core:1.1.2 - https://github.com/fommil/netlib-java/core)

0 commit comments

Comments
 (0)