This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch java11_test
in repository https://gitbox.apache.org/repos/asf/flink.git
commit b5fedec8e3a39a289c2890e891f534b4f3a85c13
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Mon Jul 29 12:26:05 2019 +0200
[TMP][FLINK-13467][build] Bump ASM to 7.1
---
flink-core/pom.xml | 2 +-
.../apache/flink/api/java/typeutils/TypeExtractionUtils.java | 4 ++--
flink-java/pom.xml | 2 +-
.../main/java/org/apache/flink/api/java/ClosureCleaner.java | 12 ++++++------
flink-runtime/pom.xml | 2 +-
flink-scala/pom.xml | 2 +-
.../scala/org/apache/flink/api/scala/ClosureCleaner.scala | 4 ++--
pom.xml | 4 ++--
8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index 0564f98..3fadf37 100644
--- a/flink-core/pom.xml
+++ b/flink-core/pom.xml
@@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-asm-6</artifactId>
+ <artifactId>flink-shaded-asm-7</artifactId>
</dependency>
<!-- standard utilities -->
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 a49e10a..eef309e 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
@@ -35,8 +35,8 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import static
org.apache.flink.shaded.asm6.org.objectweb.asm.Type.getConstructorDescriptor;
-import static
org.apache.flink.shaded.asm6.org.objectweb.asm.Type.getMethodDescriptor;
+import static
org.apache.flink.shaded.asm7.org.objectweb.asm.Type.getConstructorDescriptor;
+import static
org.apache.flink.shaded.asm7.org.objectweb.asm.Type.getMethodDescriptor;
@Internal
public class TypeExtractionUtils {
diff --git a/flink-java/pom.xml b/flink-java/pom.xml
index c1abac0..8634403 100644
--- a/flink-java/pom.xml
+++ b/flink-java/pom.xml
@@ -43,7 +43,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-asm-6</artifactId>
+ <artifactId>flink-shaded-asm-7</artifactId>
</dependency>
<dependency>
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 b47479f..3e2a6e1 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
@@ -23,10 +23,10 @@ import org.apache.flink.api.common.ExecutionConfig;
import org.apache.flink.api.common.InvalidProgramException;
import org.apache.flink.util.InstantiationUtil;
-import org.apache.flink.shaded.asm6.org.objectweb.asm.ClassReader;
-import org.apache.flink.shaded.asm6.org.objectweb.asm.ClassVisitor;
-import org.apache.flink.shaded.asm6.org.objectweb.asm.MethodVisitor;
-import org.apache.flink.shaded.asm6.org.objectweb.asm.Opcodes;
+import org.apache.flink.shaded.asm7.org.objectweb.asm.ClassReader;
+import org.apache.flink.shaded.asm7.org.objectweb.asm.ClassVisitor;
+import org.apache.flink.shaded.asm7.org.objectweb.asm.MethodVisitor;
+import org.apache.flink.shaded.asm7.org.objectweb.asm.Opcodes;
import org.apache.commons.lang3.ClassUtils;
import org.slf4j.Logger;
@@ -248,7 +248,7 @@ class This0AccessFinder extends ClassVisitor {
private boolean isThis0Accessed;
public This0AccessFinder(String this0Name) {
- super(Opcodes.ASM6);
+ super(Opcodes.ASM7);
this.this0Name = this0Name;
}
@@ -258,7 +258,7 @@ class This0AccessFinder extends ClassVisitor {
@Override
public MethodVisitor visitMethod(int access, String name, String desc,
String sig, String[] exceptions) {
- return new MethodVisitor(Opcodes.ASM6) {
+ return new MethodVisitor(Opcodes.ASM7) {
@Override
public void visitFieldInsn(int op, String owner, String
name, String desc) {
diff --git a/flink-runtime/pom.xml b/flink-runtime/pom.xml
index d70e244..c546830 100644
--- a/flink-runtime/pom.xml
+++ b/flink-runtime/pom.xml
@@ -90,7 +90,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-asm-6</artifactId>
+ <artifactId>flink-shaded-asm-7</artifactId>
</dependency>
<dependency>
diff --git a/flink-scala/pom.xml b/flink-scala/pom.xml
index 8a6a077..828ac10 100644
--- a/flink-scala/pom.xml
+++ b/flink-scala/pom.xml
@@ -47,7 +47,7 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-asm-6</artifactId>
+ <artifactId>flink-shaded-asm-7</artifactId>
</dependency>
<dependency>
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 2cbe9fc..fbc2c1e 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
@@ -28,8 +28,8 @@ import org.slf4j.LoggerFactory
import scala.collection.mutable.Map
import scala.collection.mutable.Set
-import org.apache.flink.shaded.asm6.org.objectweb.asm.{ClassReader,
ClassVisitor, MethodVisitor, Type}
-import org.apache.flink.shaded.asm6.org.objectweb.asm.Opcodes._
+import org.apache.flink.shaded.asm7.org.objectweb.asm.{ClassReader,
ClassVisitor, MethodVisitor, Type}
+import org.apache.flink.shaded.asm7.org.objectweb.asm.Opcodes._
import scala.collection.mutable
diff --git a/pom.xml b/pom.xml
index ef17b18..0d3282f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -252,8 +252,8 @@ under the License.
<dependency>
<groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-asm-6</artifactId>
- <version>6.2.1-${flink.shaded.version}</version>
+ <artifactId>flink-shaded-asm-7</artifactId>
+ <version>7.1-8.0</version>
</dependency>
<dependency>
