From 65f9e1d84d5b6e2f6eb597a0fae1a2a8cef27ee0 Mon Sep 17 00:00:00 2001
From: Jaehoon Jeong <jaehoon.jeong@woowahan.com>
Date: Mon, 19 Mar 2018 17:32:52 +0900
Subject: [PATCH 1/4] fix for spark 2.3 and remove unused import

---
 .../main/java/org/apache/zeppelin/spark/NewSparkInterpreter.java | 1 -
 1 file changed, 1 deletion(-)

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;

From f6c487e624f2c2031c5d0009254e277b96bc6be9 Mon Sep 17 00:00:00 2001
From: Jaehoon Jeong <jaehoon.jeong@woowahan.com>
Date: Mon, 19 Mar 2018 17:39:53 +0900
Subject: [PATCH 2/4] fix wrong properties for spark2.3

---
 spark/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spark/pom.xml b/spark/pom.xml
index def865e5c55..fa41cfa26a6 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -198,7 +198,7 @@
             <properties>
                 <spark.version>2.3.0</spark.version>
                 <protobuf.version>2.5.0</protobuf.version>
-                <spark.py4j.version>0.10.6</spark.py4j.version>
+                <py4j.version>0.10.6</py4j.version>
             </properties>
         </profile>
 

From 4369495a21a76ceec46fa76c70dd1ad3ea9ee687 Mon Sep 17 00:00:00 2001
From: Jaehoon Jeong <jaehoon.jeong@woowahan.com>
Date: Mon, 19 Mar 2018 17:42:44 +0900
Subject: [PATCH 3/4] Replace spark-2.3 download url

---
 spark/pom.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/spark/pom.xml b/spark/pom.xml
index fa41cfa26a6..8581173c5ad 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -199,6 +199,12 @@
                 <spark.version>2.3.0</spark.version>
                 <protobuf.version>2.5.0</protobuf.version>
                 <py4j.version>0.10.6</py4j.version>
+                <spark.src.download.url>
+                    http://www-us.apache.org/dist/spark/${spark.archive}/${spark.archive}.tgz
+                </spark.src.download.url>
+                <spark.bin.download.url>
+                    http://www-us.apache.org/dist/spark/${spark.archive}/${spark.archive}-bin-without-hadoop.tgz
+                </spark.bin.download.url>
             </properties>
         </profile>
 

From a70c871fb162f706ca4c4ccde926670aec084c9b Mon Sep 17 00:00:00 2001
From: Jaehoon Jeong <jaehoon.jeong@woowahan.com>
Date: Mon, 19 Mar 2018 18:02:51 +0900
Subject: [PATCH 4/4] Remove Scala-2.10 module for spark 2.3

---
 spark/interpreter/pom.xml | 80 ++++++++++++++++++++++++++++++++++++---
 spark/pom.xml             | 19 +++++++++-
 2 files changed, 92 insertions(+), 7 deletions(-)

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 @@
       <version>${project.version}</version>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.zeppelin</groupId>
-      <artifactId>spark-scala-2.10</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.zeppelin</groupId>
       <artifactId>zeppelin-interpreter</artifactId>
@@ -578,4 +572,78 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>spark-2.3</id>
+    </profile>
+
+    <profile>
+      <id>spark-2.2</id>
+      <activation>
+        <activeByDefault>true</activeByDefault>
+      </activation>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.zeppelin</groupId>
+          <artifactId>spark-scala-2.10</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>spark-2.1</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.zeppelin</groupId>
+          <artifactId>spark-scala-2.10</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>spark-2.0</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.zeppelin</groupId>
+          <artifactId>spark-scala-2.10</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>spark-1.6</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.zeppelin</groupId>
+          <artifactId>spark-scala-2.10</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>spark-1.5</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.zeppelin</groupId>
+          <artifactId>spark-scala-2.10</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>spark-1.4</id>
+      <dependencies>
+        <dependency>
+          <groupId>org.apache.zeppelin</groupId>
+          <artifactId>spark-scala-2.10</artifactId>
+          <version>${project.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+  </profiles>
 </project>
diff --git a/spark/pom.xml b/spark/pom.xml
index 8581173c5ad..58e90d8a8de 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -60,7 +60,6 @@
     <modules>
         <module>interpreter</module>
         <module>spark-scala-parent</module>
-        <module>scala-2.10</module>
         <module>scala-2.11</module>
         <module>spark-dependencies</module>
         <module>spark-shims</module>
@@ -217,6 +216,9 @@
                 <spark.version>2.2.0</spark.version>
                 <py4j.version>0.10.4</py4j.version>
             </properties>
+            <modules>
+                <module>scala-2.10</module>
+            </modules>
         </profile>
 
         <profile>
@@ -225,6 +227,9 @@
                 <spark.version>2.1.0</spark.version>
                 <py4j.version>0.10.4</py4j.version>
             </properties>
+            <modules>
+                <module>scala-2.10</module>
+            </modules>
         </profile>
 
         <profile>
@@ -233,6 +238,9 @@
                 <spark.version>2.0.2</spark.version>
                 <py4j.version>0.10.3</py4j.version>
             </properties>
+            <modules>
+                <module>scala-2.10</module>
+            </modules>
         </profile>
 
         <profile>
@@ -241,6 +249,9 @@
                 <spark.version>1.6.3</spark.version>
                 <py4j.version>0.9</py4j.version>
             </properties>
+            <modules>
+                <module>scala-2.10</module>
+            </modules>
         </profile>
 
         <profile>
@@ -249,6 +260,9 @@
                 <spark.version>1.5.2</spark.version>
                 <py4j.version>0.8.2.1</py4j.version>
             </properties>
+            <modules>
+                <module>scala-2.10</module>
+            </modules>
         </profile>
 
         <profile>
@@ -257,6 +271,9 @@
                 <spark.version>1.4.1</spark.version>
                 <py4j.version>0.8.2.1</py4j.version>
             </properties>
+            <modules>
+                <module>scala-2.10</module>
+            </modules>
         </profile>
 
     </profiles>