diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2014-03-09 13:17:07 -0700 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2014-03-09 13:17:07 -0700 |
| commit | b9be160951b9e7a7e801009e9d6ee6c2b5d2d47e (patch) | |
| tree | feeab22e67085aaf0917fb130b48546107f8a2a2 /core | |
| parent | faf4cad1debb76148facc008e0a3308ac96eee7a (diff) | |
| download | spark-b9be160951b9e7a7e801009e9d6ee6c2b5d2d47e.tar.gz spark-b9be160951b9e7a7e801009e9d6ee6c2b5d2d47e.tar.bz2 spark-b9be160951b9e7a7e801009e9d6ee6c2b5d2d47e.zip | |
SPARK-782 Clean up for ASM dependency.
This makes two changes.
1) Spark uses the shaded version of asm that is (conveniently) published
with Kryo.
2) Existing exclude rules around asm are updated to reflect the new groupId
of `org.ow2.asm`. This made all of the old rules not work with newer Hadoop
versions that pull in new asm versions.
Author: Patrick Wendell <pwendell@gmail.com>
Closes #100 from pwendell/asm and squashes the following commits:
9235f3f [Patrick Wendell] SPARK-782 Clean up for ASM dependency.
Diffstat (limited to 'core')
| -rw-r--r-- | core/pom.xml | 4 | ||||
| -rw-r--r-- | core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/core/pom.xml b/core/pom.xml index 3e6e98cd2c..4d7d41a971 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -103,10 +103,6 @@ <artifactId>snappy-java</artifactId> </dependency> <dependency> - <groupId>org.ow2.asm</groupId> - <artifactId>asm</artifactId> - </dependency> - <dependency> <groupId>com.twitter</groupId> <artifactId>chill_${scala.binary.version}</artifactId> <version>0.3.1</version> diff --git a/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala b/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala index 681d0a30cb..a8d20ee332 100644 --- a/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala +++ b/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala @@ -22,8 +22,8 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream} import scala.collection.mutable.Map import scala.collection.mutable.Set -import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Type} -import org.objectweb.asm.Opcodes._ +import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Type} +import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._ import org.apache.spark.Logging |