diff --git a/dev/create_release.sh b/dev/create_release.sh index fdd33fb0bf0..cec81c0ecc5 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 4745de99eb5..3519fdfa14c 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 6284fcbb418..b082a29625f 100644 --- a/rlang/pom.xml +++ b/rlang/pom.xml @@ -37,7 +37,7 @@ r 1.12.1 - 2.4.3 + 2.4.4 1.15.0 spark-${spark.version} 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 f04b09118c9..5d69e66c52b 100644 --- a/rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java +++ b/rlang/src/main/java/org/apache/zeppelin/r/IRInterpreter.java @@ -63,7 +63,7 @@ protected boolean isSparkSupported() { * @return */ protected int sparkVersion() { - return 20403; + return 20404; } /** diff --git a/spark/pom.xml b/spark/pom.xml index 32b006f0c2f..876b14e6494 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -198,8 +198,11 @@ spark-2.4 + + true + - 2.4.3 + 2.4.4 2.5.0 0.10.7 @@ -216,9 +219,6 @@ spark-2.2 - - true - 2.2.3 0.10.7 diff --git a/spark/scala-2.11/pom.xml b/spark/scala-2.11/pom.xml index 0fdb1590c2b..3cab22388e0 100644 --- a/spark/scala-2.11/pom.xml +++ b/spark/scala-2.11/pom.xml @@ -32,7 +32,7 @@ Zeppelin: Spark Interpreter Scala_2.11 - 2.4.3 + 2.4.4 2.11.12 2.11 ${spark.scala.version} diff --git a/spark/scala-2.12/pom.xml b/spark/scala-2.12/pom.xml index 086203bdde2..fd31af4e8ac 100644 --- a/spark/scala-2.12/pom.xml +++ b/spark/scala-2.12/pom.xml @@ -33,7 +33,7 @@ Zeppelin: Spark Interpreter Scala_2.12 - 2.4.3 + 2.4.4 2.12.8 2.12 ${spark.scala.version} diff --git a/submarine/pom.xml b/submarine/pom.xml index ea0a1626cf3..3d5de0b9c20 100644 --- a/submarine/pom.xml +++ b/submarine/pom.xml @@ -57,6 +57,17 @@ zeppelin-python 0.9.0-SNAPSHOT + + org.apache.zeppelin + zeppelin-jupyter-interpreter + ${project.version} + + + net.sf.py4j + py4j + + + org.apache.zeppelin zeppelin-shell 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 96b484ae24c..aae495105ea 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 SparkIntegrationTest24(String sparkVersion) { @Parameterized.Parameters public static List 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 4431f942e65..a55a5043a47 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 ZeppelinSparkClusterTest24(String sparkVersion) throws Exception { @Parameterized.Parameters public static List data() { return Arrays.asList(new Object[][]{ - {"2.4.3"} + {"2.4.4"} }); } }