Repository: flink
Updated Branches:
  refs/heads/master f59de67d9 -> d6126e7ca


[FLINK-7026] [asm] Introduce flink-shaded-asm-5

This closes #4494.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/65391805
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/65391805
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/65391805

Branch: refs/heads/master
Commit: 65391805933f52e9c99de4210c2f422bdc652a15
Parents: f59de67
Author: zentol <ches...@apache.org>
Authored: Wed Jun 28 13:23:53 2017 +0200
Committer: zentol <ches...@apache.org>
Committed: Thu Aug 10 11:36:26 2017 +0200

----------------------------------------------------------------------
 .../flink-connector-kinesis/pom.xml             |  4 ----
 flink-core/pom.xml                              | 12 +++++------
 .../api/java/typeutils/TypeExtractionUtils.java |  4 ++--
 flink-java/pom.xml                              |  5 ++---
 .../apache/flink/api/java/ClosureCleaner.java   |  9 ++++----
 .../flink/api/java/sca/ModifiedASMAnalyzer.java | 12 +++++------
 .../flink/api/java/sca/ModifiedASMFrame.java    | 10 ++++-----
 .../api/java/sca/NestedMethodAnalyzer.java      | 22 ++++++++++----------
 .../apache/flink/api/java/sca/TaggedValue.java  |  4 ++--
 .../apache/flink/api/java/sca/UdfAnalyzer.java  |  5 +++--
 .../flink/api/java/sca/UdfAnalyzerUtils.java    | 12 +++++------
 flink-libraries/flink-cep-scala/pom.xml         |  8 -------
 flink-libraries/flink-gelly-scala/pom.xml       |  7 -------
 flink-runtime/pom.xml                           | 11 +++++-----
 .../flink/runtime/util/DependencyVisitor.java   | 20 +++++++++---------
 .../flink/runtime/util/JarFileCreator.java      |  5 +++--
 flink-scala/pom.xml                             | 11 +++++-----
 .../apache/flink/api/scala/ClosureCleaner.scala |  4 ++--
 .../flink-shaded-curator-recipes/pom.xml        |  1 -
 flink-streaming-scala/pom.xml                   |  6 ------
 pom.xml                                         | 12 +++++------
 tools/maven/checkstyle.xml                      |  2 +-
 tools/travis_mvn_watchdog.sh                    |  2 +-
 23 files changed, 80 insertions(+), 108 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-connectors/flink-connector-kinesis/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml 
b/flink-connectors/flink-connector-kinesis/pom.xml
index 4628937..41daaa7 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -159,10 +159,6 @@ under the License.
                                                        <relocations 
combine.children="override">
                                                                <!-- DO NOT 
RELOCATE GUAVA IN THIS PACKAGE -->
                                                                <relocation>
-                                                                       
<pattern>org.objectweb.asm</pattern>
-                                                                       
<shadedPattern>org.apache.flink.shaded.org.objectweb.asm</shadedPattern>
-                                                               </relocation>
-                                                               <relocation>
                                                                        
<pattern>com.google.protobuf</pattern>
                                                                        
<shadedPattern>org.apache.flink.kinesis.shaded.com.google.protobuf</shadedPattern>
                                                                </relocation>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index 6a7e78d..7039e48 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -47,6 +47,11 @@ under the License.
                        <version>${project.version}</version>
                </dependency>
 
+               <dependency>
+                       <groupId>org.apache.flink</groupId>
+                       <artifactId>flink-shaded-asm</artifactId>
+               </dependency>
+
                <!-- standard utilities -->
                <dependency>
                        <groupId>org.apache.commons</groupId>
@@ -87,13 +92,6 @@ under the License.
                        <artifactId>snappy-java</artifactId>
                </dependency>
 
-               <!-- ASM is needed for type extraction -->
-               <dependency>
-                       <groupId>org.ow2.asm</groupId>
-                       <artifactId>asm-all</artifactId>
-                       <version>${asm.version}</version>
-               </dependency>
-
                <!-- ================== test dependencies ================== -->
 
                <dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractionUtils.java
----------------------------------------------------------------------
diff --git 
a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractionUtils.java
 
b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractionUtils.java
index c2a01c3..41d260d 100644
--- 
a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractionUtils.java
+++ 
b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/TypeExtractionUtils.java
@@ -31,8 +31,8 @@ import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.functions.Function;
 import org.apache.flink.api.common.functions.InvalidTypesException;
 
-import static org.objectweb.asm.Type.getConstructorDescriptor;
-import static org.objectweb.asm.Type.getMethodDescriptor;
+import static 
org.apache.flink.shaded.asm5.org.objectweb.asm.Type.getConstructorDescriptor;
+import static 
org.apache.flink.shaded.asm5.org.objectweb.asm.Type.getMethodDescriptor;
 
 @Internal
 public class TypeExtractionUtils {

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/pom.xml
----------------------------------------------------------------------
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index a996cbe..11fd89f 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -48,9 +48,8 @@ under the License.
                </dependency>
 
                <dependency>
-                       <groupId>org.ow2.asm</groupId>
-                       <artifactId>asm-all</artifactId>
-                       <version>${asm.version}</version>
+                       <groupId>org.apache.flink</groupId>
+                       <artifactId>flink-shaded-asm</artifactId>
                </dependency>
 
                <dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
----------------------------------------------------------------------
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java 
b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
index dd4b5c5..6160094 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/ClosureCleaner.java
@@ -22,10 +22,11 @@ import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.InvalidProgramException;
 import org.apache.flink.util.InstantiationUtil;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.ClassReader;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.ClassVisitor;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.MethodVisitor;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Opcodes;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMAnalyzer.java
----------------------------------------------------------------------
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMAnalyzer.java
 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMAnalyzer.java
index ef7f18d..ee8242b 100644
--- 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMAnalyzer.java
+++ 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMAnalyzer.java
@@ -20,12 +20,12 @@ package org.apache.flink.api.java.sca;
 
 import org.apache.flink.annotation.Internal;
 
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.InsnList;
-import org.objectweb.asm.tree.JumpInsnNode;
-import org.objectweb.asm.tree.analysis.Analyzer;
-import org.objectweb.asm.tree.analysis.Frame;
-import org.objectweb.asm.tree.analysis.Interpreter;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.AbstractInsnNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.InsnList;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.JumpInsnNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.Analyzer;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.Frame;
+import 
org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.Interpreter;
 
 import java.lang.reflect.Field;
 

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMFrame.java
----------------------------------------------------------------------
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMFrame.java 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMFrame.java
index 685a91f..f3bce3e 100644
--- 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMFrame.java
+++ 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/ModifiedASMFrame.java
@@ -20,11 +20,11 @@ package org.apache.flink.api.java.sca;
 
 import org.apache.flink.annotation.Internal;
 
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.analysis.AnalyzerException;
-import org.objectweb.asm.tree.analysis.Frame;
-import org.objectweb.asm.tree.analysis.Interpreter;
-import org.objectweb.asm.tree.analysis.Value;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.AbstractInsnNode;
+import 
org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.AnalyzerException;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.Frame;
+import 
org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.Interpreter;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.Value;
 
 import java.lang.reflect.Field;
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java
----------------------------------------------------------------------
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java
 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java
index d56d60a..c4e3ac4 100644
--- 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java
+++ 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/NestedMethodAnalyzer.java
@@ -21,17 +21,17 @@ package org.apache.flink.api.java.sca;
 import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.java.sca.TaggedValue.Tag;
 
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AbstractInsnNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.IntInsnNode;
-import org.objectweb.asm.tree.LdcInsnNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.TypeInsnNode;
-import org.objectweb.asm.tree.analysis.AnalyzerException;
-import org.objectweb.asm.tree.analysis.BasicInterpreter;
-import org.objectweb.asm.tree.analysis.BasicValue;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Type;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.AbstractInsnNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.FieldInsnNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.IntInsnNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.LdcInsnNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.MethodInsnNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.MethodNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.TypeInsnNode;
+import 
org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.AnalyzerException;
+import 
org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.BasicInterpreter;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.BasicValue;
 
 import java.util.ArrayList;
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/src/main/java/org/apache/flink/api/java/sca/TaggedValue.java
----------------------------------------------------------------------
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/TaggedValue.java 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/TaggedValue.java
index aab2cf5..ece022a 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/sca/TaggedValue.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/sca/TaggedValue.java
@@ -20,8 +20,8 @@ package org.apache.flink.api.java.sca;
 
 import org.apache.flink.annotation.Internal;
 
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.analysis.BasicValue;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Type;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.BasicValue;
 
 import java.util.HashMap;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzer.java
----------------------------------------------------------------------
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzer.java 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzer.java
index 6022959..0a0f0f9 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzer.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzer.java
@@ -37,8 +37,9 @@ import org.apache.flink.api.common.typeinfo.TypeInformation;
 import org.apache.flink.api.java.functions.SemanticPropUtil;
 import org.apache.flink.api.java.sca.TaggedValue.Input;
 
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.MethodNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Type;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.MethodNode;
+
 import org.slf4j.Logger;
 
 import java.lang.reflect.Method;

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
----------------------------------------------------------------------
diff --git 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
index 2844aea..8a76ed2 100644
--- 
a/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
+++ 
b/flink-java/src/main/java/org/apache/flink/api/java/sca/UdfAnalyzerUtils.java
@@ -26,12 +26,12 @@ import org.apache.flink.api.java.typeutils.PojoTypeInfo;
 import org.apache.flink.api.java.typeutils.TupleTypeInfo;
 import org.apache.flink.api.java.typeutils.TupleTypeInfoBase;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.MethodNode;
-import org.objectweb.asm.tree.analysis.BasicValue;
-import org.objectweb.asm.tree.analysis.Value;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.ClassReader;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Type;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.ClassNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.MethodNode;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.BasicValue;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.tree.analysis.Value;
 
 import java.io.IOException;
 import java.io.InputStream;

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-libraries/flink-cep-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-libraries/flink-cep-scala/pom.xml 
b/flink-libraries/flink-cep-scala/pom.xml
index c9b4a46..7820c6b 100644
--- a/flink-libraries/flink-cep-scala/pom.xml
+++ b/flink-libraries/flink-cep-scala/pom.xml
@@ -51,14 +51,6 @@ under the License.
             <scope>provided</scope>
         </dependency>
 
-        <!-- We need to add this explicitly due to shading -->
-
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>${asm.version}</version>
-        </dependency>
-
         <!-- the dependencies below are already provided in Flink -->
 
         <dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/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 35b2188..59840b0 100644
--- a/flink-libraries/flink-gelly-scala/pom.xml
+++ b/flink-libraries/flink-gelly-scala/pom.xml
@@ -75,13 +75,6 @@ under the License.
             <artifactId>scala-compiler</artifactId>
             <scope>provided</scope>
         </dependency>
-
-        <dependency>
-            <groupId>org.ow2.asm</groupId>
-            <artifactId>asm</artifactId>
-            <version>${asm.version}</version>
-            <scope>provided</scope>
-        </dependency>
         
         <!-- test dependencies -->
         

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-runtime/pom.xml
----------------------------------------------------------------------
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index e37e9c5..368e526 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -62,6 +62,11 @@ under the License.
                </dependency>
 
                <dependency>
+                       <groupId>org.apache.flink</groupId>
+                       <artifactId>flink-shaded-asm</artifactId>
+               </dependency>
+
+               <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>commons-lang3</artifactId>
                </dependency>
@@ -83,12 +88,6 @@ under the License.
                        <artifactId>guava</artifactId>
                        <version>${guava.version}</version>
                </dependency>
-
-               <dependency>
-                       <groupId>org.ow2.asm</groupId>
-                       <artifactId>asm-all</artifactId>
-                       <version>${asm.version}</version>
-               </dependency>
                
                <dependency>
                        <groupId>org.scala-lang</groupId>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-runtime/src/main/java/org/apache/flink/runtime/util/DependencyVisitor.java
----------------------------------------------------------------------
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/DependencyVisitor.java
 
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/DependencyVisitor.java
index 8fef204..3a521a8 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/DependencyVisitor.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/DependencyVisitor.java
@@ -18,16 +18,16 @@
 
 package org.apache.flink.runtime.util;
 
-import org.objectweb.asm.AnnotationVisitor;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.FieldVisitor;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.TypePath;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.signature.SignatureReader;
-import org.objectweb.asm.signature.SignatureVisitor;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.AnnotationVisitor;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.ClassVisitor;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Opcodes;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.FieldVisitor;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.MethodVisitor;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Type;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.TypePath;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Label;
+import 
org.apache.flink.shaded.asm5.org.objectweb.asm.signature.SignatureReader;
+import 
org.apache.flink.shaded.asm5.org.objectweb.asm.signature.SignatureVisitor;
 
 import java.util.HashSet;
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java
----------------------------------------------------------------------
diff --git 
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java 
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java
index c877d74..ad7906a 100644
--- 
a/flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java
+++ 
b/flink-runtime/src/main/java/org/apache/flink/runtime/util/JarFileCreator.java
@@ -19,8 +19,9 @@
 
 package org.apache.flink.runtime.util;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.Opcodes;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.ClassReader;
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Opcodes;
+
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 654e15c..c3cc554 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -46,6 +46,11 @@ under the License.
                </dependency>
 
                <dependency>
+                       <groupId>org.apache.flink</groupId>
+                       <artifactId>flink-shaded-asm</artifactId>
+               </dependency>
+
+               <dependency>
                        <groupId>org.scala-lang</groupId>
                        <artifactId>scala-reflect</artifactId>
                </dependency>
@@ -60,12 +65,6 @@ under the License.
                        <artifactId>scala-compiler</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>org.ow2.asm</groupId>
-                       <artifactId>asm</artifactId>
-                       <version>${asm.version}</version>
-               </dependency>
-
                <!-- test dependencies -->
 
                <dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/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 53bffff..7965346 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
@@ -27,8 +27,8 @@ import org.slf4j.LoggerFactory
 import scala.collection.mutable.Map
 import scala.collection.mutable.Set
 
-import org.objectweb.asm.{ClassReader, ClassVisitor, MethodVisitor, Type}
-import org.objectweb.asm.Opcodes._
+import org.apache.flink.shaded.asm5.org.objectweb.asm.{ClassReader, 
ClassVisitor, MethodVisitor, Type}
+import org.apache.flink.shaded.asm5.org.objectweb.asm.Opcodes._
 
 /* This code is originally from the Apache Spark project. */
 @Internal

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
----------------------------------------------------------------------
diff --git a/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml 
b/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
index fcc2759..b539f96 100644
--- a/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
+++ b/flink-shaded-curator/flink-shaded-curator-recipes/pom.xml
@@ -66,7 +66,6 @@ under the License.
                                                        <artifactSet 
combine.self="override">
                                                                <includes>
                                                                        
<include>com.google.guava:*</include>
-                                                                       
<include>org.ow2.asm:*</include>
                                                                        
<include>org.apache.curator:*</include>
                                                                </includes>
                                                        </artifactSet>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/flink-streaming-scala/pom.xml
----------------------------------------------------------------------
diff --git a/flink-streaming-scala/pom.xml b/flink-streaming-scala/pom.xml
index 57ab1cb..df58d6d 100644
--- a/flink-streaming-scala/pom.xml
+++ b/flink-streaming-scala/pom.xml
@@ -63,12 +63,6 @@ under the License.
                        <artifactId>scala-compiler</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>org.ow2.asm</groupId>
-                       <artifactId>asm</artifactId>
-                       <version>${asm.version}</version>
-               </dependency>
-
                <!-- test dependencies -->
 
                <dependency>

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index bb157e9..6ed08fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,7 +109,6 @@ under the License.
                <scala.version>2.11.11</scala.version>
                <scala.binary.version>2.11</scala.binary.version>
                <chill.version>0.7.4</chill.version>
-               <asm.version>5.0.4</asm.version>
                <zookeeper.version>3.4.10</zookeeper.version>
                <curator.version>2.12.0</curator.version>
                <jackson.version>2.7.4</jackson.version>
@@ -256,6 +255,12 @@ under the License.
                                <version>3.3.2</version>
                        </dependency>
 
+                       <dependency>
+                               <groupId>org.apache.flink</groupId>
+                               <artifactId>flink-shaded-asm</artifactId>
+                               <version>5.0.4-1.0</version>
+                       </dependency>
+
                        <!-- Make sure we use a consistent avro version 
throughout the project -->
                        <dependency>
                                <groupId>org.apache.avro</groupId>
@@ -1255,7 +1260,6 @@ under the License.
                                                                        -->
                                                                        
<include>org.apache.flink:force-shading</include>
                                                                        
<include>com.google.guava:*</include>
-                                                                       
<include>org.ow2.asm:*</include>
                                                                </includes>
                                                        </artifactSet>
                                                        <relocations>
@@ -1267,10 +1271,6 @@ under the License.
                                                                                
<exclude>com.google.inject.**</exclude>
                                                                        
</excludes>
                                                                </relocation>
-                                                               <relocation>
-                                                                       
<pattern>org.objectweb.asm</pattern>
-                                                                       
<shadedPattern>org.apache.flink.shaded.org.objectweb.asm</shadedPattern>
-                                                               </relocation>
                                                        </relocations>
                                                        <transformers>
                                                                <!-- The 
service transformer is needed to merge META-INF/services files -->

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/tools/maven/checkstyle.xml
----------------------------------------------------------------------
diff --git a/tools/maven/checkstyle.xml b/tools/maven/checkstyle.xml
index ef383f3..3f78054 100644
--- a/tools/maven/checkstyle.xml
+++ b/tools/maven/checkstyle.xml
@@ -211,7 +211,7 @@ This file is based on the checkstyle file of Apache Beam.
     </module>
 
     <module name="IllegalImport">
-      <property name="illegalPkgs" value="autovalue.shaded, avro.shaded, 
com.google.api.client.repackaged, com.google.appengine.repackaged, io.netty"/>
+      <property name="illegalPkgs" value="autovalue.shaded, avro.shaded, 
com.google.api.client.repackaged, com.google.appengine.repackaged, io.netty, 
org.objectweb.asm"/>
     </module>
 
     <module name="RedundantModifier">

http://git-wip-us.apache.org/repos/asf/flink/blob/65391805/tools/travis_mvn_watchdog.sh
----------------------------------------------------------------------
diff --git a/tools/travis_mvn_watchdog.sh b/tools/travis_mvn_watchdog.sh
index fca3c7d..a379845 100755
--- a/tools/travis_mvn_watchdog.sh
+++ b/tools/travis_mvn_watchdog.sh
@@ -272,7 +272,7 @@ check_shaded_artifacts() {
        ASM=`cat allClasses | grep '^org/objectweb/asm/' | wc -l`
        if [ $ASM != "0" ]; then
                echo 
"=============================================================================="
-               echo "Detected $ASM asm dependencies in fat jar"
+               echo "Detected $ASM unshaded asm dependencies in fat jar"
                echo 
"=============================================================================="
                return 1
        fi

Reply via email to