Skip to content

Commit 999bb6f

Browse files
committed
Made Spark use existing shaded ASM and removed Spark's ASM depedency.
1 parent 12e237e commit 999bb6f

File tree

6 files changed

+7
-17
lines changed

6 files changed

+7
-17
lines changed

core/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@
7676
<groupId>org.xerial.snappy</groupId>
7777
<artifactId>snappy-java</artifactId>
7878
</dependency>
79-
<dependency>
80-
<groupId>org.ow2.asm</groupId>
81-
<artifactId>asm</artifactId>
82-
</dependency>
8379
<dependency>
8480
<groupId>com.twitter</groupId>
8581
<artifactId>chill_${scala.binary.version}</artifactId>

core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ import java.lang.reflect.Field
2222
import scala.collection.mutable.Map
2323
import scala.collection.mutable.Set
2424

25-
import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Type}
26-
import org.objectweb.asm.Opcodes._
25+
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Type}
26+
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._
27+
2728
import java.io.{InputStream, IOException, ByteArrayOutputStream, ByteArrayInputStream, BufferedInputStream}
2829
import org.apache.spark.Logging
2930

graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ import scala.collection.mutable.HashSet
2323

2424
import org.apache.spark.util.Utils
2525

26-
import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor}
27-
import org.objectweb.asm.Opcodes._
28-
26+
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor}
27+
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._
2928

3029
/**
3130
* Includes an utility function to test whether a function accesses a specific attribute

pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,11 +195,6 @@
195195
<artifactId>snappy-java</artifactId>
196196
<version>1.0.5</version>
197197
</dependency>
198-
<dependency>
199-
<groupId>org.ow2.asm</groupId>
200-
<artifactId>asm</artifactId>
201-
<version>4.0</version>
202-
</dependency>
203198
<dependency>
204199
<groupId>com.clearspring.analytics</groupId>
205200
<artifactId>stream</artifactId>

project/SparkBuild.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,6 @@ object SparkBuild extends Build {
271271
"commons-daemon" % "commons-daemon" % "1.0.10", // workaround for bug HADOOP-9407
272272
"com.ning" % "compress-lzf" % "1.0.0",
273273
"org.xerial.snappy" % "snappy-java" % "1.0.5",
274-
"org.ow2.asm" % "asm" % "4.0",
275274
"org.spark-project.akka" %% "akka-remote" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty),
276275
"org.spark-project.akka" %% "akka-slf4j" % "2.2.3-shaded-protobuf" excludeAll(excludeNetty),
277276
"org.spark-project.akka" %% "akka-testkit" % "2.2.3-shaded-protobuf" % "test",

repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import java.util.concurrent.{Executors, ExecutorService}
2424
import org.apache.hadoop.conf.Configuration
2525
import org.apache.hadoop.fs.{FileSystem, Path}
2626

27-
import org.objectweb.asm._
28-
import org.objectweb.asm.Opcodes._
27+
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm._
28+
import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._
2929

3030

3131
/**

0 commit comments

Comments
 (0)