diff --git a/.travis.yml b/.travis.yml
index a86cf34acab..8619455253f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,7 +20,7 @@ sudo: false
before_cache:
- sudo chown -R travis:travis $HOME/.m2
-
+
cache:
apt: true
directories:
@@ -98,15 +98,15 @@ matrix:
dist: trusty
env: BUILD_PLUGINS="true" PYTHON="3" SCALA_VER="2.10" PROFILE="-Pspark-1.6 -Pscala-2.10" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl zeppelin-zengine,spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=SparkIntegrationTest,org.apache.zeppelin.spark.* -DfailIfNoTests=false"
- # Test spark module for 2.1.0 with scala 2.11
+ # Test spark module for 2.4.0 with scala 2.11
- jdk: "oraclejdk8"
dist: trusty
- env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.1 -Phadoop2 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
+ env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.4 -Phadoop2 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
- # Test spark module for 2.0.2 with scala 2.11
+ # Test spark module for 2.3.2 with scala 2.11
- jdk: "oraclejdk8"
dist: trusty
- env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.0 -Phadoop3 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
+ env: BUILD_PLUGINS="false" PYTHON="2" SCALA_VER="2.11" PROFILE="-Pspark-2.3 -Phadoop3 -Pscala-2.11" SPARKR="true" BUILD_FLAG="install -DskipTests -DskipRat -am" TEST_FLAG="test -DskipRat -am" MODULES="-pl spark/interpreter,spark/spark-dependencies" TEST_PROJECTS="-Dtest=org.apache.zeppelin.spark.*,org.apache.zeppelin.rinterpreter.*,org.apache.spark.api.r.* -DfailIfNoTests=false"
# Test python/pyspark with python 2, livy 0.5
- sudo: required
diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml
index daf801fcdd2..32f625d6cfb 100644
--- a/spark/interpreter/pom.xml
+++ b/spark/interpreter/pom.xml
@@ -53,7 +53,7 @@
**/PySparkInterpreterMatplotlibTest.java
**/*Test.*
-
+
@@ -69,12 +69,6 @@
${project.version}
-
- org.apache.zeppelin
- spark-scala-2.10
- ${project.version}
-
-
org.apache.zeppelin
zeppelin-interpreter-api
@@ -609,4 +603,51 @@
+
+
+
+ spark-2.2
+
+
+ org.apache.zeppelin
+ spark-scala-2.10
+ ${project.version}
+
+
+
+
+
+ spark-2.1
+
+
+ org.apache.zeppelin
+ spark-scala-2.10
+ ${project.version}
+
+
+
+
+
+ spark-2.0
+
+
+ org.apache.zeppelin
+ spark-scala-2.10
+ ${project.version}
+
+
+
+
+
+ spark-1.6
+
+
+ org.apache.zeppelin
+ spark-scala-2.10
+ ${project.version}
+
+
+
+
+
diff --git a/spark/pom.xml b/spark/pom.xml
index 92413cf063a..6cb600800e8 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -49,17 +49,16 @@
spark-${spark.version}
- http://d3kbcqa49mib13.cloudfront.net/${spark.archive}.tgz
+ https://archive.apache.org/dist/spark/${spark.archive}/${spark.archive}.tgz
- http://d3kbcqa49mib13.cloudfront.net/${spark.archive}-bin-without-hadoop.tgz
+ https://archive.apache.org/dist/spark/${spark.archive}/${spark.archive}-bin-without-hadoop.tgz
interpreter
spark-scala-parent
- scala-2.10
scala-2.11
spark-dependencies
spark-shims
@@ -197,36 +196,42 @@
2.4.0
2.5.0
- 0.10.7
+ 0.10.7
spark-2.3
- 2.3.0
+ 2.3.2
2.5.0
- 0.10.6
+ 0.10.6
spark-2.2
-
- true
-
- 2.2.0
+ 2.2.1
0.10.4
+
+ true
+
+
+ scala-2.10
+
spark-2.1
- 2.1.0
+ 2.1.2
0.10.4
+
+ scala-2.10
+
@@ -235,6 +240,9 @@
2.0.2
0.10.3
+
+ scala-2.10
+
@@ -243,7 +251,10 @@
1.6.3
0.9
+
+ scala-2.10
+
-
+
diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
index faa639f8e8a..97abd076785 100644
--- a/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
+++ b/zeppelin-server/src/test/java/org/apache/zeppelin/rest/ZeppelinSparkClusterTest.java
@@ -64,7 +64,7 @@ public class ZeppelinSparkClusterTest extends AbstractTestRestApi {
//ci timeout.
//TODO(zjffdu) remove this after we upgrade it to junit 4.13 (ZEPPELIN-3341)
private static Set verifiedSparkVersions = new HashSet<>();
-
+
private String sparkVersion;
private AuthenticationInfo anonymous = new AuthenticationInfo("anonymous");
@@ -83,10 +83,12 @@ public ZeppelinSparkClusterTest(String sparkVersion) throws Exception {
@Parameterized.Parameters
public static List data() {
return Arrays.asList(new Object[][]{
- {"2.2.1"},
- {"2.1.2"},
- {"2.0.2"},
- {"1.6.3"}
+ {"2.4.0"},
+ {"2.3.2"},
+ {"2.2.1"},
+ {"2.1.2"},
+ {"2.0.2"},
+ {"1.6.3"}
});
}
diff --git a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SparkIntegrationTest.java b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SparkIntegrationTest.java
index fed9ad21815..8d076e3276e 100644
--- a/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SparkIntegrationTest.java
+++ b/zeppelin-zengine/src/test/java/org/apache/zeppelin/interpreter/SparkIntegrationTest.java
@@ -42,10 +42,12 @@ public SparkIntegrationTest(String sparkVersion) {
@Parameterized.Parameters
public static List data() {
return Arrays.asList(new Object[][]{
- {"2.2.1"},
- {"2.1.2"},
- {"2.0.2"},
- {"1.6.3"}
+ {"2.4.0"},
+ {"2.3.2"},
+ {"2.2.1"},
+ {"2.1.2"},
+ {"2.0.2"},
+ {"1.6.3"}
});
}