From 461ee5aad13bbd35e710bed8b6943409ce90d457 Mon Sep 17 00:00:00 2001
From: Mark Grover <mark@apache.org>
Date: Mon, 15 May 2017 18:17:05 -0700
Subject: [PATCH 1/2] [YARN] [SPARK-20756] yarn-shuffle jar has references to
 unshaded guava and contains scala classes

---
 common/network-yarn/pom.xml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index a8488d8d1b70..cc80888578f0 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -87,6 +87,9 @@
             <includes>
               <include>*:*</include>
             </includes>
+            <excludes>
+              <exclude>org.scala-lang:scala-library</exclude>
+            </excludes>
           </artifactSet>
           <filters>
             <filter>
@@ -113,6 +116,13 @@
                 <include>io.netty.**</include>
               </includes>
             </relocation>
+            <relocation>
+              <pattern>com.google.common</pattern>
+              <shadedPattern>${spark.shade.packageName}.guava</shadedPattern>
+              <includes>
+                <include>com.google.**</include>
+              </includes>
+            </relocation>
           </relocations>
         </configuration>
         <executions>

From 14d1d4d764bf4b31cda4f44006946c188655a1ad Mon Sep 17 00:00:00 2001
From: Mark Grover <mark@apache.org>
Date: Tue, 16 May 2017 13:09:51 -0700
Subject: [PATCH 2/2] Using inheritance instead

---
 common/network-yarn/pom.xml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/common/network-yarn/pom.xml b/common/network-yarn/pom.xml
index cc80888578f0..7e24315c5f39 100644
--- a/common/network-yarn/pom.xml
+++ b/common/network-yarn/pom.xml
@@ -101,7 +101,7 @@
               </excludes>
             </filter>
           </filters>
-          <relocations>
+          <relocations combine.children="append">
             <relocation>
               <pattern>com.fasterxml.jackson</pattern>
               <shadedPattern>${spark.shade.packageName}.com.fasterxml.jackson</shadedPattern>
@@ -116,13 +116,6 @@
                 <include>io.netty.**</include>
               </includes>
             </relocation>
-            <relocation>
-              <pattern>com.google.common</pattern>
-              <shadedPattern>${spark.shade.packageName}.guava</shadedPattern>
-              <includes>
-                <include>com.google.**</include>
-              </includes>
-            </relocation>
           </relocations>
         </configuration>
         <executions>