From 320c64f05d771e9894d35e7b32788010c9c03fe0 Mon Sep 17 00:00:00 2001
From: Lee moon soo <moon@apache.org>
Date: Fri, 19 Jun 2015 16:50:34 -0700
Subject: [PATCH 1/4] ZEPPELIN-123 bringing hadoop-1 profile for spark

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

diff --git a/spark/pom.xml b/spark/pom.xml
index 4b82ac1caa8..6467762b534 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -41,7 +41,13 @@
 
     <hadoop.version>2.3.0</hadoop.version>
     <yarn.version>${hadoop.version}</yarn.version>
+    <avro.version>1.7.7</avro.version>
+    <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
     <jets3t.version>0.9.3</jets3t.version>
+    <protobuf.version>2.5.0</protobuf.version>
+
+    <akka.group>com.typesafe.akka</akka.group>
+    <akka.version>2.3.11</akka.version>
   </properties>
 
   <repositories>
@@ -53,6 +59,67 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro</artifactId>
+        <version>${avro.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-ipc</artifactId>
+        <version>${avro.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-mapred</artifactId>
+        <version>${avro.version}</version>
+        <classifier>${avro.mapred.classifier}</classifier>
+        <exclusions>
+          <exclusion>
+            <groupId>io.netty</groupId>
+            <artifactId>netty</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>jetty-util</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.mortbay.jetty</groupId>
+            <artifactId>servlet-api</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>org.apache.velocity</groupId>
+            <artifactId>velocity</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
       <!-- See SPARK-1556 for info on this dependency: -->
       <dependency>
         <groupId>net.java.dev.jets3t</groupId>
@@ -254,6 +321,44 @@
     </dependency>
 
 
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>${akka.group}</groupId>
+      <artifactId>akka-actor_${scala.binary.version}</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${akka.group}</groupId>
+      <artifactId>akka-remote_${scala.binary.version}</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${akka.group}</groupId>
+      <artifactId>akka-slf4j_${scala.binary.version}</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${akka.group}</groupId>
+      <artifactId>akka-testkit_${scala.binary.version}</artifactId>
+      <version>${akka.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${akka.group}</groupId>
+      <artifactId>akka-zeromq_${scala.binary.version}</artifactId>
+      <version>${akka.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>${akka.group}</groupId>
+          <artifactId>akka-actor_${scala.binary.version}</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
     <!-- Aether :: maven dependency resolution -->
     <dependency>
       <groupId>org.apache.maven</groupId>
@@ -517,6 +622,18 @@
       </properties>
     </profile>
 
+    <profile>
+      <id>hadoop-1</id>
+      <properties>
+        <hadoop.version>1.0.4</hadoop.version>
+        <protobuf.version>2.4.1</protobuf.version>
+        <avro.mapred.classifier>hadoop1</avro.mapred.classifier>
+        <codehaus.jackson.version>1.8.8</codehaus.jackson.version>
+        <akka.group>org.spark-project.akka</akka.group>
+        <akka.version>2.3.4-spark</akka.version>
+      </properties>
+    </profile>
+
     <profile>
       <id>hadoop-2.2</id>
       <properties>

From 983aa5440ee0a1ee72927f39d6ae16ab8adf5c3c Mon Sep 17 00:00:00 2001
From: Lee moon soo <moon@apache.org>
Date: Tue, 23 Jun 2015 12:04:44 -0700
Subject: [PATCH 2/4] force jets3t.version for hadoop-1 profile

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

diff --git a/spark/pom.xml b/spark/pom.xml
index 6467762b534..f85750460f3 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -631,6 +631,7 @@
         <codehaus.jackson.version>1.8.8</codehaus.jackson.version>
         <akka.group>org.spark-project.akka</akka.group>
         <akka.version>2.3.4-spark</akka.version>
+        <jets3t.version>0.7.1</jets3t.version>
       </properties>
     </profile>
 

From c14f6bb10e3f6f771e64f4f05ab8c9f3bdc8a7d5 Mon Sep 17 00:00:00 2001
From: Lee moon soo <moon@apache.org>
Date: Tue, 23 Jun 2015 12:57:32 -0700
Subject: [PATCH 3/4] Manage dependencies version more like spark does

---
 spark/pom.xml | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/spark/pom.xml b/spark/pom.xml
index f85750460f3..25a5849d05f 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -42,9 +42,9 @@
     <hadoop.version>2.3.0</hadoop.version>
     <yarn.version>${hadoop.version}</yarn.version>
     <avro.version>1.7.7</avro.version>
-    <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
-    <jets3t.version>0.9.3</jets3t.version>
-    <protobuf.version>2.5.0</protobuf.version>
+    <avro.mapred.classifier></avro.mapred.classifier>
+    <jets3t.version>0.7.1</jets3t.version>
+    <protobuf.version>2.4.1</protobuf.version>
 
     <akka.group>com.typesafe.akka</akka.group>
     <akka.version>2.3.11</akka.version>
@@ -618,7 +618,6 @@
       </dependencies>
       <properties>
         <hadoop.version>0.23.10</hadoop.version>
-        <jets3t.version>0.7.1</jets3t.version>
       </properties>
     </profile>
 
@@ -626,12 +625,10 @@
       <id>hadoop-1</id>
       <properties>
         <hadoop.version>1.0.4</hadoop.version>
-        <protobuf.version>2.4.1</protobuf.version>
         <avro.mapred.classifier>hadoop1</avro.mapred.classifier>
         <codehaus.jackson.version>1.8.8</codehaus.jackson.version>
         <akka.group>org.spark-project.akka</akka.group>
         <akka.version>2.3.4-spark</akka.version>
-        <jets3t.version>0.7.1</jets3t.version>
       </properties>
     </profile>
 
@@ -639,7 +636,8 @@
       <id>hadoop-2.2</id>
       <properties>
         <hadoop.version>2.2.0</hadoop.version>
-        <jets3t.version>0.7.1</jets3t.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
       </properties>
     </profile>
 
@@ -647,6 +645,9 @@
       <id>hadoop-2.3</id>
       <properties>
         <hadoop.version>2.3.0</hadoop.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <jets3t.version>0.9.3</jets3t.version>
+        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
       </properties>
     </profile>
 
@@ -654,6 +655,9 @@
       <id>hadoop-2.4</id>
       <properties>
         <hadoop.version>2.4.0</hadoop.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <jets3t.version>0.9.3</jets3t.version>
+        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
       </properties>
     </profile>
 
@@ -661,6 +665,9 @@
       <id>hadoop-2.6</id>
       <properties>
         <hadoop.version>2.6.0</hadoop.version>
+        <protobuf.version>2.5.0</protobuf.version>
+        <jets3t.version>0.9.3</jets3t.version>
+        <avro.mapred.classifier>hadoop2</avro.mapred.classifier>
       </properties>
     </profile>
 

From c573f1e61c7c8fa68b872af7f74a1feff4100e7a Mon Sep 17 00:00:00 2001
From: Lee moon soo <moon@apache.org>
Date: Tue, 23 Jun 2015 15:46:56 -0700
Subject: [PATCH 4/4] Set proper akka.group and akka.version

---
 spark/pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spark/pom.xml b/spark/pom.xml
index 25a5849d05f..38d3ca34cf5 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -46,8 +46,8 @@
     <jets3t.version>0.7.1</jets3t.version>
     <protobuf.version>2.4.1</protobuf.version>
 
-    <akka.group>com.typesafe.akka</akka.group>
-    <akka.version>2.3.11</akka.version>
+    <akka.group>org.spark-project.akka</akka.group>
+    <akka.version>2.3.4-spark</akka.version>
   </properties>
 
   <repositories>
@@ -509,6 +509,7 @@
       </dependencies>
       <properties>
         <spark.version>1.1.1</spark.version>
+        <akka.version>2.2.3-shaded-protobuf</akka.version>
       </properties>
     </profile>
 
@@ -529,6 +530,7 @@
       </dependencies>
       <properties>
         <spark.version>1.1.1</spark.version>
+        <akka.version>2.2.3-shaded-protobuf</akka.version>
       </properties>
     </profile>
 
@@ -628,7 +630,6 @@
         <avro.mapred.classifier>hadoop1</avro.mapred.classifier>
         <codehaus.jackson.version>1.8.8</codehaus.jackson.version>
         <akka.group>org.spark-project.akka</akka.group>
-        <akka.version>2.3.4-spark</akka.version>
       </properties>
     </profile>