Skip to content

[ZEPPELIN-4517]. Use spark-2.4 as the default profile #3586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zjffdu wants to merge 1 commit into from
Closed

[ZEPPELIN-4517]. Use spark-2.4 as the default profile #3586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dev/create_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion dev/publish_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion rlang/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ protected boolean isSparkSupported() {
* @return
*/
protected int sparkVersion() {
return 20403;
return 20404;
}

/**
Expand Down
8 changes: 4 additions & 4 deletions spark/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spark/scala-2.11/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion spark/scala-2.12/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
11 changes: 11 additions & 0 deletions submarine/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@
<artifactId>zeppelin-python</artifactId>
<version>0.9.0-SNAPSHOT</version>
</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>
Expand Down
2 changes: 1 addition & 1 deletion ...ter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public SparkIntegrationTest24(String sparkVersion) {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
{"2.4.3"}
{"2.4.4"}
});
}

Expand Down
2 changes: 1 addition & 1 deletion ...integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public ZeppelinSparkClusterTest24(String sparkVersion) throws Exception {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
{"2.4.3"}
{"2.4.4"}
});
}
}