From 98ea98cc30083e85d28f6d5d2883a9d25247e61b Mon Sep 17 00:00:00 2001
From: Sandy Ryza <sandy@cloudera.com>
Date: Fri, 28 Feb 2014 16:57:47 -0800
Subject: [PATCH 1/2] SPARK-782. Shade ASM

---
 core/pom.xml   | 31 +++++++++++++++++++++++++++++++
 graphx/pom.xml | 35 +++++++++++++++++++++++++++++++++++
 repl/pom.xml   | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 101 insertions(+)

diff --git a/core/pom.xml b/core/pom.xml
index 99c841472b3e..ccb17ad37e74 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -269,6 +269,37 @@
                     </environmentVariables>
                 </configuration>
             </plugin>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-shade-plugin</artifactId>
+              <version>2.0</version>
+              <executions>
+                <execution>
+                  <phase>package</phase>
+                  <goals>
+                    <goal>shade</goal>
+                  </goals>
+                  <configuration>
+                    <relocations>
+                      <relocation>
+                        <pattern>org.objectweb.asm</pattern>
+                        <shadedPattern>shaded.org.objectweb.asm</shadedPattern>
+                      </relocation>
+                    </relocations>
+                    <filters>
+                      <filter>
+                        <artifact>*:*</artifact>
+                        <excludes>
+                          <exclude>META-INF/*.SF</exclude>
+                          <exclude>META-INF/*.DSA</exclude>
+                          <exclude>META-INF/*.RSA</exclude>
+                        </excludes>
+                      </filter>
+                    </filters>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/graphx/pom.xml b/graphx/pom.xml
index 5b54dd27efb4..2689174ec1c6 100644
--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@@ -70,6 +70,10 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
@@ -79,6 +83,37 @@
         <groupId>org.scalatest</groupId>
         <artifactId>scalatest-maven-plugin</artifactId>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>shaded.org.objectweb.asm</shadedPattern>
+                </relocation>
+              </relocations>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/repl/pom.xml b/repl/pom.xml
index aa01a1760285..e03f4034068f 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -96,6 +96,10 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ow2.asm</groupId>
+      <artifactId>asm</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
@@ -140,6 +144,37 @@
           </environmentVariables>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>2.0</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <relocations>
+                <relocation>
+                  <pattern>org.objectweb.asm</pattern>
+                  <shadedPattern>shaded.org.objectweb.asm</shadedPattern>
+                </relocation>
+              </relocations>
+              <filters>
+                <filter>
+                  <artifact>*:*</artifact>
+                  <excludes>
+                    <exclude>META-INF/*.SF</exclude>
+                    <exclude>META-INF/*.DSA</exclude>
+                    <exclude>META-INF/*.RSA</exclude>
+                  </excludes>
+                </filter>
+              </filters>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

From 99b49a6d6cddbc8ce152b7a4e77511b94676821f Mon Sep 17 00:00:00 2001
From: Sandy Ryza <sandy@cloudera.com>
Date: Wed, 5 Mar 2014 21:52:32 -0800
Subject: [PATCH 2/2] Move BytecodeUtils to core and prefix shaded package name
 with org.apache.spark

---
 core/pom.xml                                  |  2 +-
 .../apache/spark}/util/BytecodeUtils.scala    |  6 ++--
 .../spark}/util/BytecodeUtilsSuite.scala      |  2 +-
 graphx/pom.xml                                | 35 -------------------
 .../apache/spark/graphx/impl/GraphImpl.scala  |  2 +-
 repl/pom.xml                                  |  2 +-
 6 files changed, 6 insertions(+), 43 deletions(-)
 rename {graphx/src/main/scala/org/apache/spark/graphx => core/src/main/scala/org/apache/spark}/util/BytecodeUtils.scala (97%)
 rename {graphx/src/test/scala/org/apache/spark/graphx => core/src/test/scala/org/apache/spark}/util/BytecodeUtilsSuite.scala (99%)

diff --git a/core/pom.xml b/core/pom.xml
index ccb17ad37e74..4b26f59195fc 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -283,7 +283,7 @@
                     <relocations>
                       <relocation>
                         <pattern>org.objectweb.asm</pattern>
-                        <shadedPattern>shaded.org.objectweb.asm</shadedPattern>
+                        <shadedPattern>org.apache.spark.shaded.org.objectweb.asm</shadedPattern>
                       </relocation>
                     </relocations>
                     <filters>
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala b/core/src/main/scala/org/apache/spark/util/BytecodeUtils.scala
similarity index 97%
rename from graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
rename to core/src/main/scala/org/apache/spark/util/BytecodeUtils.scala
index d1528e2f07cf..c255259ad659 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
+++ b/core/src/main/scala/org/apache/spark/util/BytecodeUtils.scala
@@ -15,14 +15,12 @@
  * limitations under the License.
  */
 
-package org.apache.spark.graphx.util
+package org.apache.spark.util
 
 import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
 
 import scala.collection.mutable.HashSet
 
-import org.apache.spark.util.Utils
-
 import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor}
 import org.objectweb.asm.Opcodes._
 
@@ -31,7 +29,7 @@ import org.objectweb.asm.Opcodes._
  * Includes an utility function to test whether a function accesses a specific attribute
  * of an object.
  */
-private[graphx] object BytecodeUtils {
+private[spark] object BytecodeUtils {
 
   /**
    * Test whether the given closure invokes the specified method in the specified class.
diff --git a/graphx/src/test/scala/org/apache/spark/graphx/util/BytecodeUtilsSuite.scala b/core/src/test/scala/org/apache/spark/util/BytecodeUtilsSuite.scala
similarity index 99%
rename from graphx/src/test/scala/org/apache/spark/graphx/util/BytecodeUtilsSuite.scala
rename to core/src/test/scala/org/apache/spark/util/BytecodeUtilsSuite.scala
index f3b3738db0da..576f9d75bfbc 100644
--- a/graphx/src/test/scala/org/apache/spark/graphx/util/BytecodeUtilsSuite.scala
+++ b/core/src/test/scala/org/apache/spark/util/BytecodeUtilsSuite.scala
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.graphx.util
+package org.apache.spark.util
 
 import org.scalatest.FunSuite
 
diff --git a/graphx/pom.xml b/graphx/pom.xml
index 2689174ec1c6..5b54dd27efb4 100644
--- a/graphx/pom.xml
+++ b/graphx/pom.xml
@@ -70,10 +70,6 @@
       <artifactId>scalacheck_${scala.binary.version}</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.ow2.asm</groupId>
-      <artifactId>asm</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
@@ -83,37 +79,6 @@
         <groupId>org.scalatest</groupId>
         <artifactId>scalatest-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-shade-plugin</artifactId>
-        <version>2.0</version>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <relocations>
-                <relocation>
-                  <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>shaded.org.objectweb.asm</shadedPattern>
-                </relocation>
-              </relocations>
-              <filters>
-                <filter>
-                  <artifact>*:*</artifact>
-                  <excludes>
-                    <exclude>META-INF/*.SF</exclude>
-                    <exclude>META-INF/*.DSA</exclude>
-                    <exclude>META-INF/*.RSA</exclude>
-                  </excludes>
-                </filter>
-              </filters>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/impl/GraphImpl.scala b/graphx/src/main/scala/org/apache/spark/graphx/impl/GraphImpl.scala
index 1d029bf009e8..05ec1e2834ca 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/impl/GraphImpl.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/impl/GraphImpl.scala
@@ -25,7 +25,7 @@ import org.apache.spark.SparkContext._
 import org.apache.spark.graphx._
 import org.apache.spark.graphx.impl.GraphImpl._
 import org.apache.spark.graphx.impl.MsgRDDFunctions._
-import org.apache.spark.graphx.util.BytecodeUtils
+import org.apache.spark.util.BytecodeUtils
 import org.apache.spark.rdd.{ShuffledRDD, RDD}
 import org.apache.spark.storage.StorageLevel
 import org.apache.spark.util.ClosureCleaner
diff --git a/repl/pom.xml b/repl/pom.xml
index e03f4034068f..d02047aae592 100644
--- a/repl/pom.xml
+++ b/repl/pom.xml
@@ -158,7 +158,7 @@
               <relocations>
                 <relocation>
                   <pattern>org.objectweb.asm</pattern>
-                  <shadedPattern>shaded.org.objectweb.asm</shadedPattern>
+                  <shadedPattern>org.apache.spark.shaded.org.objectweb.asm</shadedPattern>
                 </relocation>
               </relocations>
               <filters>