This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 49239bb [ZEPPELIN-4517]. Use spark-2.4 as the default profile
49239bb is described below
commit 49239bb211745ea8f0036f6fb8df84e00ae2b7e2
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Thu Jan 2 17:39:47 2020 +0800
[ZEPPELIN-4517]. Use spark-2.4 as the default profile
### What is this PR for?
Simple PR to make default profile of spark-2.4
### What type of PR is it?
[Improvement]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://jira.apache.org/jira/browse/ZEPPELIN-4517
### 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 <zjf...@apache.org>
Closes #3586 from zjffdu/ZEPPELIN-4517 and squashes the following commits:
cb8f5db63 [Jeff Zhang] [ZEPPELIN-4517]. Use spark-2.4 as the default profile
---
dev/create_release.sh | 4 ++--
dev/publish_release.sh | 2 +-
rlang/pom.xml | 2 +-
rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java | 2 +-
spark/pom.xml | 8 ++++----
spark/scala-2.11/pom.xml | 2 +-
spark/scala-2.12/pom.xml | 2 +-
submarine/pom.xml | 11 +++++++++++
.../apache/zeppelin/integration/SparkIntegrationTest24.java | 2 +-
.../zeppelin/integration/ZeppelinSparkClusterTest24.java | 2 +-
10 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/dev/create_release.sh b/dev/create_release.sh
index fdd33fb..cec81c0 100755
--- a/dev/create_release.sh
+++ b/dev/create_release.sh
@@ -98,8 +98,8 @@ function make_binary_release() {
git_clone
make_source_package
-make_binary_release all "-Pspark-2.3 -Phadoop-2.6 -Pscala-${SCALA_VERSION}"
-make_binary_release netinst "-Pspark-2.3 -Phadoop-2.6 -Pscala-${SCALA_VERSION}
-pl
zeppelin-interpreter,zeppelin-zengine,:zeppelin-display_${SCALA_VERSION},:zeppelin-spark-dependencies_${SCALA_VERSION},:zeppelin-spark_${SCALA_VERSION},zeppelin-web,zeppelin-server,zeppelin-distribution
-am"
+make_binary_release all "-Phadoop-2.6 -Pscala-${SCALA_VERSION}"
+make_binary_release netinst "-Phadoop-2.6 -Pscala-${SCALA_VERSION} -pl
zeppelin-interpreter,zeppelin-zengine,:zeppelin-display_${SCALA_VERSION},:zeppelin-spark-dependencies_${SCALA_VERSION},:zeppelin-spark_${SCALA_VERSION},zeppelin-web,zeppelin-server,zeppelin-distribution
-am"
# remove non release files and dirs
rm -rf "${WORKING_DIR}/zeppelin"
diff --git a/dev/publish_release.sh b/dev/publish_release.sh
index 4745de9..3519fdf 100755
--- a/dev/publish_release.sh
+++ b/dev/publish_release.sh
@@ -46,7 +46,7 @@ if [[ $RELEASE_VERSION == *"SNAPSHOT"* ]]; then
DO_SNAPSHOT="yes"
fi
-PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.1 -Phadoop-2.6 -Pr"
+PUBLISH_PROFILES="-Ppublish-distr -Phadoop-2.6 -Pr"
PROJECT_OPTIONS="-pl !zeppelin-distribution"
NEXUS_STAGING="https://repository.apache.org/service/local/staging";
NEXUS_PROFILE="153446d1ac37c4"
diff --git a/rlang/pom.xml b/rlang/pom.xml
index a8021b4..ff6b16b 100644
--- a/rlang/pom.xml
+++ b/rlang/pom.xml
@@ -37,7 +37,7 @@
<properties>
<interpreter.name>r</interpreter.name>
<jsoup.version>1.12.1</jsoup.version>
- <spark.version>2.4.3</spark.version>
+ <spark.version>2.4.4</spark.version>
<grpc.version>1.15.0</grpc.version>
<spark.archive>spark-${spark.version}</spark.archive>
diff --git a/rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java
b/rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java
index d9076b4..949b1b1 100644
--- a/rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java
+++ b/rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java
@@ -73,7 +73,7 @@ public class IRInterpreter extends JupyterKernelInterpreter {
* @return
*/
protected int sparkVersion() {
- return 20403;
+ return 20404;
}
/**
diff --git a/spark/pom.xml b/spark/pom.xml
index 32b006f..876b14e 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -198,8 +198,11 @@
<!-- profile spark-x only affect the embedded spark version in
zeppelin distribution -->
<profile>
<id>spark-2.4</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
<properties>
- <spark.version>2.4.3</spark.version>
+ <spark.version>2.4.4</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<py4j.version>0.10.7</py4j.version>
</properties>
@@ -216,9 +219,6 @@
<profile>
<id>spark-2.2</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
<properties>
<spark.version>2.2.3</spark.version>
<py4j.version>0.10.7</py4j.version>
diff --git a/spark/scala-2.11/pom.xml b/spark/scala-2.11/pom.xml
index 0fdb159..3cab223 100644
--- a/spark/scala-2.11/pom.xml
+++ b/spark/scala-2.11/pom.xml
@@ -32,7 +32,7 @@
<name>Zeppelin: Spark Interpreter Scala_2.11</name>
<properties>
- <spark.version>2.4.3</spark.version>
+ <spark.version>2.4.4</spark.version>
<spark.scala.version>2.11.12</spark.scala.version>
<spark.scala.binary.version>2.11</spark.scala.binary.version>
<spark.scala.compile.version>${spark.scala.version}</spark.scala.compile.version>
diff --git a/spark/scala-2.12/pom.xml b/spark/scala-2.12/pom.xml
index 086203b..fd31af4 100644
--- a/spark/scala-2.12/pom.xml
+++ b/spark/scala-2.12/pom.xml
@@ -33,7 +33,7 @@
<name>Zeppelin: Spark Interpreter Scala_2.12</name>
<properties>
- <spark.version>2.4.3</spark.version>
+ <spark.version>2.4.4</spark.version>
<spark.scala.version>2.12.8</spark.scala.version>
<spark.scala.binary.version>2.12</spark.scala.binary.version>
<spark.scala.compile.version>${spark.scala.version}</spark.scala.compile.version>
diff --git a/submarine/pom.xml b/submarine/pom.xml
index ea0a162..3d5de0b 100644
--- a/submarine/pom.xml
+++ b/submarine/pom.xml
@@ -59,6 +59,17 @@
</dependency>
<dependency>
<groupId>org.apache.zeppelin</groupId>
+ <artifactId>zeppelin-jupyter-interpreter</artifactId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>net.sf.py4j</groupId>
+ <artifactId>py4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-shell</artifactId>
<version>0.9.0-SNAPSHOT</version>
</dependency>
diff --git
a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
index 96b484a..aae4951 100644
---
a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
+++
b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
@@ -33,7 +33,7 @@ public class SparkIntegrationTest24 extends
SparkIntegrationTest{
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"2.4.3"}
+ {"2.4.4"}
});
}
diff --git
a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
index 4431f94..a55a504 100644
---
a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
+++
b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
@@ -33,7 +33,7 @@ public class ZeppelinSparkClusterTest24 extends
ZeppelinSparkClusterTest {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"2.4.3"}
+ {"2.4.4"}
});
}
}
