From 7a18a1b7e9c658dd53508d05db985ef6bd32c811 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Fri, 27 Feb 2015 15:11:50 -0800
Subject: [PATCH 1/3] [SPARK-6070] [yarn] Remove unneeded classes from shuffle
 service jar.

These may conflict with the classes already in the NM. We shouldn't
be repackaging them.
---
 network/yarn/pom.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml
index acec8f18f2b5..d0ccb8d2c47e 100644
--- a/network/yarn/pom.xml
+++ b/network/yarn/pom.xml
@@ -49,6 +49,21 @@
       <artifactId>hadoop-client</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-client</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-yarn-common</artifactId>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
 
   <build>

From 3cba9469992a2f8a04074d9ca5c593370446c084 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Fri, 27 Feb 2015 15:41:00 -0800
Subject: [PATCH 2/3] Use profile instead, so that dependencies don't need to
 be explicitly listed.

---
 network/yarn/pom.xml | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml
index d0ccb8d2c47e..074ac9ede488 100644
--- a/network/yarn/pom.xml
+++ b/network/yarn/pom.xml
@@ -47,22 +47,6 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-client</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-api</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.hadoop</groupId>
-      <artifactId>hadoop-yarn-common</artifactId>
-      <scope>provided</scope>
     </dependency>
   </dependencies>
 
@@ -103,4 +87,19 @@
       </plugin>
     </plugins>
   </build>
+
+  <profiles>
+    <!-- Always enable this profile so that Hadoop classes are not re-packaged. -->
+    <profile>
+      <id>hadoop-provided</id>
+      <activation>
+        <file>
+          <exists>pom.xml</exists>
+        </file>
+      </activation>
+      <properties>
+        <hadoop.deps.scope>provided</hadoop.deps.scope>
+      </properties>
+    </profile>
+  </profiles>
 </project>

From 871b56607c77ec29227ac1013a5ad92d0a06f9c8 Mon Sep 17 00:00:00 2001
From: Marcelo Vanzin <vanzin@cloudera.com>
Date: Fri, 27 Feb 2015 15:54:32 -0800
Subject: [PATCH 3/3] The "d'oh how didn't I think of it before" solution.

---
 network/yarn/pom.xml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/network/yarn/pom.xml b/network/yarn/pom.xml
index 074ac9ede488..39b99f54f6db 100644
--- a/network/yarn/pom.xml
+++ b/network/yarn/pom.xml
@@ -33,6 +33,8 @@
   <url>http://spark.apache.org/</url>
   <properties>
     <sbt.project.name>network-yarn</sbt.project.name>
+    <!-- Make sure all Hadoop dependencies are provided to avoid repackaging. -->
+    <hadoop.deps.scope>provided</hadoop.deps.scope>
   </properties>
 
   <dependencies>
@@ -87,19 +89,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <profiles>
-    <!-- Always enable this profile so that Hadoop classes are not re-packaged. -->
-    <profile>
-      <id>hadoop-provided</id>
-      <activation>
-        <file>
-          <exists>pom.xml</exists>
-        </file>
-      </activation>
-      <properties>
-        <hadoop.deps.scope>provided</hadoop.deps.scope>
-      </properties>
-    </profile>
-  </profiles>
 </project>