ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[SPARK-24420][BUILD] Upgrade ASM to 6.1 to support JDK9+

Browse source 
## What changes were proposed in this pull request?

Upgrade ASM to 6.1 to support JDK9+

## How was this patch tested?

Existing tests.

Author: DB Tsai <d_tsai@apple.com>

Closes #21459 from dbtsai/asm.
This commit is contained in:
DB Tsai 2018-07-03 10:13:48 -07:00
parent a7c8f0c8cb
commit 5585c5765f
No known key found for this signature in database
GPG key ID: E6FD79DA81FE14FD
11 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/pom.xml
View file

@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm6-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>

4
core/src/main/scala/org/apache/spark/util/ClosureCleaner.scala
View file

@ -22,8 +22,8 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
import scala.collection.mutable.{Map, Set, Stack}
import scala.language.existentials
import org.apache.xbean.asm5.{ClassReader, ClassVisitor, MethodVisitor, Type}
import org.apache.xbean.asm5.Opcodes._
import org.apache.xbean.asm6.{ClassReader, ClassVisitor, MethodVisitor, Type}
import org.apache.xbean.asm6.Opcodes._
import org.apache.spark.{SparkEnv, SparkException}
import org.apache.spark.internal.Logging

2
dev/deps/spark-deps-hadoop-2.6
View file

@ -192,7 +192,7 @@ stringtemplate-3.2.1.jar
super-csv-2.2.0.jar
univocity-parsers-2.6.3.jar
validation-api-1.1.0.Final.jar
xbean-asm5-shaded-4.4.jar
xbean-asm6-shaded-4.8.jar
xercesImpl-2.9.1.jar
xmlenc-0.52.jar
xz-1.0.jar

2
dev/deps/spark-deps-hadoop-2.7
View file

@ -193,7 +193,7 @@ stringtemplate-3.2.1.jar
super-csv-2.2.0.jar
univocity-parsers-2.6.3.jar
validation-api-1.1.0.Final.jar
xbean-asm5-shaded-4.4.jar
xbean-asm6-shaded-4.8.jar
xercesImpl-2.9.1.jar
xmlenc-0.52.jar
xz-1.0.jar

2
dev/deps/spark-deps-hadoop-3.1
View file

@ -214,7 +214,7 @@ token-provider-1.0.1.jar
univocity-parsers-2.6.3.jar
validation-api-1.1.0.Final.jar
woodstox-core-5.0.3.jar
xbean-asm5-shaded-4.4.jar
xbean-asm6-shaded-4.8.jar
xz-1.0.jar
zjsonpatch-0.3.0.jar
zookeeper-3.4.9.jar

2
graphx/pom.xml
View file

@ -53,7 +53,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm6-shaded</artifactId>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>

4
graphx/src/main/scala/org/apache/spark/graphx/util/BytecodeUtils.scala
View file

@ -22,8 +22,8 @@ import java.io.{ByteArrayInputStream, ByteArrayOutputStream}
import scala.collection.mutable.HashSet
import scala.language.existentials
import org.apache.xbean.asm5.{ClassReader, ClassVisitor, MethodVisitor}
import org.apache.xbean.asm5.Opcodes._
import org.apache.xbean.asm6.{ClassReader, ClassVisitor, MethodVisitor}
import org.apache.xbean.asm6.Opcodes._
import org.apache.spark.util.Utils

8
pom.xml
View file

@ -313,13 +313,13 @@
<artifactId>chill-java</artifactId>
<version>${chill.version}</version>
</dependency>
<!-- This artifact is a shaded version of ASM 5.0.4. The POM that was used to produce this
is at https://github.com/apache/geronimo-xbean/tree/xbean-4.4/xbean-asm5-shaded
<!-- This artifact is a shaded version of ASM 6.x. The POM that was used to produce this
is at https://github.com/apache/geronimo-xbean/tree/trunk/xbean-asm6-shaded
For context on why we shade ASM, see SPARK-782 and SPARK-6152. -->
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<version>4.4</version>
<artifactId>xbean-asm6-shaded</artifactId>
<version>4.8</version>
</dependency>
<!-- Shaded deps marked as provided. These are promoted to compile scope

4
repl/pom.xml
View file

@ -102,7 +102,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm6-shaded</artifactId>
</dependency>
<!-- Explicit listing of transitive deps that are shaded. Otherwise, odd compiler crashes. -->
@ -166,7 +166,7 @@
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>scala-2.12</id>

4
repl/src/main/scala/org/apache/spark/repl/ExecutorClassLoader.scala
View file

@ -22,8 +22,8 @@ import java.net.{URI, URL, URLEncoder}
import java.nio.channels.Channels
import org.apache.hadoop.fs.{FileSystem, Path}
import org.apache.xbean.asm5._
import org.apache.xbean.asm5.Opcodes._
import org.apache.xbean.asm6._
import org.apache.xbean.asm6.Opcodes._
import org.apache.spark.{SparkConf, SparkEnv}
import org.apache.spark.deploy.SparkHadoopUtil

2
sql/core/pom.xml
View file

@ -118,7 +118,7 @@
</dependency>
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm5-shaded</artifactId>
<artifactId>xbean-asm6-shaded</artifactId>
</dependency>
<dependency>
<groupId>org.scalacheck</groupId>