Repository: flink Updated Branches: refs/heads/release-0.10 9268514b7 -> bf9caa5fa
[FLINK-3136] Fix shaded imports in ClosureCleaner.scala Project: http://git-wip-us.apache.org/repos/asf/flink/repo Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/bf9caa5f Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/bf9caa5f Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/bf9caa5f Branch: refs/heads/release-0.10 Commit: bf9caa5faa38dfd30df764c8e017637854517d43 Parents: 9268514 Author: Aljoscha Krettek <aljoscha.kret...@gmail.com> Authored: Tue Dec 8 17:07:51 2015 +0100 Committer: Aljoscha Krettek <aljoscha.kret...@gmail.com> Committed: Wed Dec 9 11:22:04 2015 +0100 ---------------------------------------------------------------------- flink-libraries/flink-gelly-scala/pom.xml | 21 +++++++++++++------- .../apache/flink/api/scala/ClosureCleaner.scala | 4 ++-- 2 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flink/blob/bf9caa5f/flink-libraries/flink-gelly-scala/pom.xml ---------------------------------------------------------------------- diff --git a/flink-libraries/flink-gelly-scala/pom.xml b/flink-libraries/flink-gelly-scala/pom.xml index 90d2971..2049450 100644 --- a/flink-libraries/flink-gelly-scala/pom.xml +++ b/flink-libraries/flink-gelly-scala/pom.xml @@ -38,6 +38,13 @@ under the License. <artifactId>flink-scala</artifactId> <version>${project.version}</version> </dependency> + <!-- We need to add this explicitly because through shading the dependency on asm seems + to go away. --> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>${asm.version}</version> + </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-clients</artifactId> @@ -48,13 +55,13 @@ under the License. <artifactId>flink-gelly</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>org.apache.flink</groupId> - <artifactId>flink-tests</artifactId> - <version>${project.version}</version> - <scope>test</scope> - <type>test-jar</type> - </dependency> + <dependency> + <groupId>org.apache.flink</groupId> + <artifactId>flink-tests</artifactId> + <version>${project.version}</version> + <scope>test</scope> + <type>test-jar</type> + </dependency> <dependency> <groupId>org.apache.flink</groupId> <artifactId>flink-test-utils</artifactId> http://git-wip-us.apache.org/repos/asf/flink/blob/bf9caa5f/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala ---------------------------------------------------------------------- diff --git a/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala b/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala index c695988..aee57f5 100644 --- a/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala +++ b/flink-scala/src/main/scala/org/apache/flink/api/scala/ClosureCleaner.scala @@ -26,8 +26,8 @@ import org.slf4j.LoggerFactory import scala.collection.mutable.Map import scala.collection.mutable.Set -import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Type} -import com.esotericsoftware.reflectasm.shaded.org.objectweb.asm.Opcodes._ +import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Type} +import org.objectweb.asm.Opcodes._ /* This code is originally from the Apache Spark project. */ object ClosureCleaner {
