You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by td...@apache.org on 2014/03/26 05:35:47 UTC
git commit: [SPARK-782] Made Spark use existing shaded ASM and
removed Spark's ASM dependency
Repository: spark
Updated Branches:
refs/heads/branch-0.9 55abe728b -> da87240b3
[SPARK-782] Made Spark use existing shaded ASM and removed Spark's ASM dependency
This ports the changes in #100 to branch 0.9. However, unlike that PR, it does not exclude ASM from all dependencies of Spark, to ensure compatibility in branch 0.9.
Author: Tathagata Das <ta...@gmail.com>
Closes #232 from tdas/asm and squashes the following commits:
999bb6f [Tathagata Das] Made Spark use existing shaded ASM and removed Spark's ASM depedency.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/da87240b
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/da87240b
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/da87240b
Branch: refs/heads/branch-0.9
Commit: da87240b30a485f432658e4f3abb9ab1d054828f
Parents: 55abe72
Author: Tathagata Das <ta...@gmail.com>
Authored: Tue Mar 25 21:35:36 2014 -0700
Committer: Tathagata Das <ta...@gmail.com>
Committed: Tue Mar 25 21:35:36 2014 -0700
----------------------------------------------------------------------
core/pom.xml | 4 ----
core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala | 5 +++--
.../main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala | 5 ++---
pom.xml | 5 -----
project/SparkBuild.scala | 1 -
.../main/scala/org/apache/spark/repl/ExecutorClassLoader.scala | 4 ++--
6 files changed, 7 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/da87240b/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index c69e2a9..aea662a 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -77,10 +77,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>
http://git-wip-us.apache.org/repos/asf/spark/blob/da87240b/core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala
----------------------------------------------------------------------
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 1df6b87..850b536 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,9 @@ import java.lang.reflect.Field
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 java.io.{InputStream, IOException, ByteArrayOutputStream, ByteArrayInputStream, BufferedInputStream}
import org.apache.spark.Logging
http://git-wip-us.apache.org/repos/asf/spark/blob/da87240b/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
----------------------------------------------------------------------
diff --git a/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala b/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
index d1528e2..a05de31 100644
--- a/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
+++ b/graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
@@ -23,9 +23,8 @@ import scala.collection.mutable.HashSet
import org.apache.spark.util.Utils
-import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor}
-import org.objectweb.asm.Opcodes._
-
+import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor}
+import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._
/**
* Includes an utility function to test whether a function accesses a specific attribute
http://git-wip-us.apache.org/repos/asf/spark/blob/da87240b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4c0dd21..ae2bfe7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -196,11 +196,6 @@
<version>1.0.5</version>
</dependency>
<dependency>
- <groupId>org.ow2.asm</groupId>
- <artifactId>asm</artifactId>
- <version>4.0</version>
- </dependency>
- <dependency>
<groupId>com.clearspring.analytics</groupId>
<artifactId>stream</artifactId>
<version>2.4.0</version>
http://git-wip-us.apache.org/repos/asf/spark/blob/da87240b/project/SparkBuild.scala
----------------------------------------------------------------------
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index c603c4b..52e894e 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -271,7 +271,6 @@ object SparkBuild extends Build {
"commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407
"com.ning" % "compress-lzf" % "1.0.0",
"org.xerial.snappy" % "snappy-java" % "1.0.5",
- "org.ow2.asm" % "asm" % "4.0",
"org.spark-project.akka" %% "akka-remote" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty),
"org.spark-project.akka" %% "akka-slf4j" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty),
"org.spark-project.akka" %% "akka-testkit" % "2.2.3-shaded-protobuf" % "test",
http://git-wip-us.apache.org/repos/asf/spark/blob/da87240b/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala
----------------------------------------------------------------------
diff --git a/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala b/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala
index 3e17184..9bf7bee 100644
--- a/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala
+++ b/repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala
@@ -24,8 +24,8 @@ import java.util.concurrent.{Executors, ExecutorService}
import org.apache.hadoop.conf.Configuration
import org.apache.hadoop.fs.{FileSystem, Path}
-import org.objectweb.asm._
-import org.objectweb.asm.Opcodes._
+import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm._
+import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._
/**