Skip to content

Commit 49239bb

Browse files
committed
[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 <[email protected]> Closes #3586 from zjffdu/ZEPPELIN-4517 and squashes the following commits: cb8f5db [Jeff Zhang] [ZEPPELIN-4517]. Use spark-2.4 as the default profile
1 parent e2fe764 commit 49239bb

File tree

10 files changed

+24
-13
lines changed

10 files changed

+24
-13
lines changed

dev/create_release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ function make_binary_release() {
9898

9999
git_clone
100100
make_source_package
101-
make_binary_release all "-Pspark-2.3 -Phadoop-2.6 -Pscala-${SCALA_VERSION}"
102-
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"
101+
make_binary_release all "-Phadoop-2.6 -Pscala-${SCALA_VERSION}"
102+
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"
103103

104104
# remove non release files and dirs
105105
rm -rf "${WORKING_DIR}/zeppelin"

dev/publish_release.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ if [[ $RELEASE_VERSION == *"SNAPSHOT"* ]]; then
4646
DO_SNAPSHOT="yes"
4747
fi
4848

49-
PUBLISH_PROFILES="-Ppublish-distr -Pspark-2.1 -Phadoop-2.6 -Pr"
49+
PUBLISH_PROFILES="-Ppublish-distr -Phadoop-2.6 -Pr"
5050
PROJECT_OPTIONS="-pl !zeppelin-distribution"
5151
NEXUS_STAGING="https://repository.apache.org/service/local/staging"
5252
NEXUS_PROFILE="153446d1ac37c4"

rlang/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<properties>
3838
<interpreter.name>r</interpreter.name>
3939
<jsoup.version>1.12.1</jsoup.version>
40-
<spark.version>2.4.3</spark.version>
40+
<spark.version>2.4.4</spark.version>
4141
<grpc.version>1.15.0</grpc.version>
4242

4343
<spark.archive>spark-${spark.version}</spark.archive>

rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ protected boolean isSparkSupported() {
7373
* @return
7474
*/
7575
protected int sparkVersion() {
76-
return 20403;
76+
return 20404;
7777
}
7878

7979
/**

spark/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,11 @@
198198
<!-- profile spark-x only affect the embedded spark version in zeppelin distribution -->
199199
<profile>
200200
<id>spark-2.4</id>
201+
<activation>
202+
<activeByDefault>true</activeByDefault>
203+
</activation>
201204
<properties>
202-
<spark.version>2.4.3</spark.version>
205+
<spark.version>2.4.4</spark.version>
203206
<protobuf.version>2.5.0</protobuf.version>
204207
<py4j.version>0.10.7</py4j.version>
205208
</properties>
@@ -216,9 +219,6 @@
216219

217220
<profile>
218221
<id>spark-2.2</id>
219-
<activation>
220-
<activeByDefault>true</activeByDefault>
221-
</activation>
222222
<properties>
223223
<spark.version>2.2.3</spark.version>
224224
<py4j.version>0.10.7</py4j.version>

spark/scala-2.11/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<name>Zeppelin: Spark Interpreter Scala_2.11</name>
3333

3434
<properties>
35-
<spark.version>2.4.3</spark.version>
35+
<spark.version>2.4.4</spark.version>
3636
<spark.scala.version>2.11.12</spark.scala.version>
3737
<spark.scala.binary.version>2.11</spark.scala.binary.version>
3838
<spark.scala.compile.version>${spark.scala.version}</spark.scala.compile.version>

spark/scala-2.12/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<name>Zeppelin: Spark Interpreter Scala_2.12</name>
3434

3535
<properties>
36-
<spark.version>2.4.3</spark.version>
36+
<spark.version>2.4.4</spark.version>
3737
<spark.scala.version>2.12.8</spark.scala.version>
3838
<spark.scala.binary.version>2.12</spark.scala.binary.version>
3939
<spark.scala.compile.version>${spark.scala.version}</spark.scala.compile.version>

submarine/pom.xml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,17 @@
5757
<artifactId>zeppelin-python</artifactId>
5858
<version>0.9.0-SNAPSHOT</version>
5959
</dependency>
60+
<dependency>
61+
<groupId>org.apache.zeppelin</groupId>
62+
<artifactId>zeppelin-jupyter-interpreter</artifactId>
63+
<version>${project.version}</version>
64+
<exclusions>
65+
<exclusion>
66+
<groupId>net.sf.py4j</groupId>
67+
<artifactId>py4j</artifactId>
68+
</exclusion>
69+
</exclusions>
70+
</dependency>
6071
<dependency>
6172
<groupId>org.apache.zeppelin</groupId>
6273
<artifactId>zeppelin-shell</artifactId>

zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public SparkIntegrationTest24(String sparkVersion) {
3333
@Parameterized.Parameters
3434
public static List<Object[]> data() {
3535
return Arrays.asList(new Object[][]{
36-
{"2.4.3"}
36+
{"2.4.4"}
3737
});
3838
}
3939

zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public ZeppelinSparkClusterTest24(String sparkVersion) throws Exception {
3333
@Parameterized.Parameters
3434
public static List<Object[]> data() {
3535
return Arrays.asList(new Object[][]{
36-
{"2.4.3"}
36+
{"2.4.4"}
3737
});
3838
}
3939
}

0 commit comments

Comments
 (0)