diff --git a/spark/interpreter/pom.xml b/spark/interpreter/pom.xml index c89cfa6ecbe..e1dcd5dbf02 100644 --- a/spark/interpreter/pom.xml +++ b/spark/interpreter/pom.xml @@ -69,12 +69,6 @@ ${project.version} - - org.apache.zeppelin - spark-scala-2.10 - ${project.version} - - org.apache.zeppelin zeppelin-interpreter @@ -578,4 +572,78 @@ + + + spark-2.3 + + + + spark-2.2 + + true + + + + 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} + + + + + + spark-1.5 + + + org.apache.zeppelin + spark-scala-2.10 + ${project.version} + + + + + + spark-1.4 + + + org.apache.zeppelin + spark-scala-2.10 + ${project.version} + + + + diff --git a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/NewSparkInterpreter.java b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/NewSparkInterpreter.java index c8efa7a7d9f..81bdfc2efde 100644 --- a/spark/interpreter/src/main/java/org/apache/zeppelin/spark/NewSparkInterpreter.java +++ b/spark/interpreter/src/main/java/org/apache/zeppelin/spark/NewSparkInterpreter.java @@ -25,7 +25,6 @@ import org.apache.spark.api.java.JavaSparkContext; import org.apache.spark.scheduler.SparkListenerJobStart; import org.apache.spark.sql.SQLContext; -import org.apache.spark.ui.jobs.JobProgressListener; import org.apache.zeppelin.interpreter.BaseZeppelinContext; import org.apache.zeppelin.interpreter.DefaultInterpreterProperty; import org.apache.zeppelin.interpreter.Interpreter; diff --git a/spark/pom.xml b/spark/pom.xml index def865e5c55..58e90d8a8de 100644 --- a/spark/pom.xml +++ b/spark/pom.xml @@ -60,7 +60,6 @@ interpreter spark-scala-parent - scala-2.10 scala-2.11 spark-dependencies spark-shims @@ -198,7 +197,13 @@ 2.3.0 2.5.0 - 0.10.6 + 0.10.6 + + http://www-us.apache.org/dist/spark/${spark.archive}/${spark.archive}.tgz + + + http://www-us.apache.org/dist/spark/${spark.archive}/${spark.archive}-bin-without-hadoop.tgz + @@ -211,6 +216,9 @@ 2.2.0 0.10.4 + + scala-2.10 + @@ -219,6 +227,9 @@ 2.1.0 0.10.4 + + scala-2.10 + @@ -227,6 +238,9 @@ 2.0.2 0.10.3 + + scala-2.10 + @@ -235,6 +249,9 @@ 1.6.3 0.9 + + scala-2.10 + @@ -243,6 +260,9 @@ 1.5.2 0.8.2.1 + + scala-2.10 + @@ -251,6 +271,9 @@ 1.4.1 0.8.2.1 + + scala-2.10 +