This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git
The following commit(s) were added to refs/heads/master by this push:
new dd49665 [FLINK-13467][asm] Bump ASM to 7.1
dd49665 is described below
commit dd49665d3c8f2575b6879f2d01875028e205ca4b
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Mon Jul 29 12:26:47 2019 +0200
[FLINK-13467][asm] Bump ASM to 7.1
---
{flink-shaded-asm-6 => flink-shaded-asm-7}/pom.xml | 8 ++++----
.../src/main/resources/META-INF/NOTICE | 6 +++---
.../src/main/resources/META-INF/licenses/LICENSE.asm | 0
pom.xml | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/flink-shaded-asm-6/pom.xml b/flink-shaded-asm-7/pom.xml
similarity index 93%
rename from flink-shaded-asm-6/pom.xml
rename to flink-shaded-asm-7/pom.xml
index 1d07d43..64f67a3 100644
--- a/flink-shaded-asm-6/pom.xml
+++ b/flink-shaded-asm-7/pom.xml
@@ -35,8 +35,8 @@ under the License.
<packaging>jar</packaging>
<properties>
- <asm.major.version>6</asm.major.version>
- <asm.version>${asm.major.version}.2.1</asm.version>
+ <asm.major.version>7</asm.major.version>
+ <asm.version>${asm.major.version}.1</asm.version>
</properties>
<dependencies>
@@ -64,7 +64,7 @@ under the License.
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
- <!-- asm6 uses java9 modularization which cannot be processed
with 3.0.0 -->
+ <!-- asm6+ uses java9 modularization which cannot be processed
with 3.0.0 -->
<version>3.1.1</version>
<executions>
<execution>
@@ -84,7 +84,7 @@ under the License.
<relocations>
<relocation>
<pattern>org.objectweb</pattern>
-
<shadedPattern>${shading.prefix}.asm6.org.objectweb</shadedPattern>
+
<shadedPattern>${shading.prefix}.asm7.org.objectweb</shadedPattern>
</relocation>
</relocations>
</configuration>
diff --git a/flink-shaded-asm-6/src/main/resources/META-INF/NOTICE
b/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
similarity index 76%
rename from flink-shaded-asm-6/src/main/resources/META-INF/NOTICE
rename to flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
index 41874b4..18080e4 100644
--- a/flink-shaded-asm-6/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
@@ -7,6 +7,6 @@ The Apache Software Foundation (http://www.apache.org/).
This project bundles the following dependencies under the BSD license.
See bundled license files for details.
-- org.ow2.asm:asm:6.2.1
-- org.ow2.asm:asm-analysis:6.2.1
-- org.ow2.asm:asm-tree:6.2.1
\ No newline at end of file
+- org.ow2.asm:asm:7.1
+- org.ow2.asm:asm-analysis:7.1
+- org.ow2.asm:asm-tree:7.1
\ No newline at end of file
diff --git
a/flink-shaded-asm-6/src/main/resources/META-INF/licenses/LICENSE.asm
b/flink-shaded-asm-7/src/main/resources/META-INF/licenses/LICENSE.asm
similarity index 100%
rename from flink-shaded-asm-6/src/main/resources/META-INF/licenses/LICENSE.asm
rename to flink-shaded-asm-7/src/main/resources/META-INF/licenses/LICENSE.asm
diff --git a/pom.xml b/pom.xml
index 9562308..2adf7a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,7 +57,7 @@ under the License.
<modules>
<module>flink-shaded-force-shading</module>
- <module>flink-shaded-asm-6</module>
+ <module>flink-shaded-asm-7</module>
<module>flink-shaded-guava-18</module>
<module>flink-shaded-netty-4</module>
<module>flink-shaded-netty-tcnative-dynamic</module>
