You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2019/08/21 08:46:02 UTC

[flink-shaded] branch master updated (dd49665 -> a5079c8)

This is an automated email from the ASF dual-hosted git repository.

chesnay pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/flink-shaded.git.


    from dd49665  [FLINK-13467][asm] Bump ASM to 7.1
     new 86b4390  [FLINK-13467][asm] Bump ASM to 7.1
     new 3c22b15  [FLINK-13720][asm] Include asm-commons
     new a5079c8  [hotfix][asm] Use asm.major.version in shading pattern

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 flink-shaded-asm-7/pom.xml                            | 8 +++++++-
 flink-shaded-asm-7/src/main/resources/META-INF/NOTICE | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

[flink-shaded] 01/03: [FLINK-13467][asm] Bump ASM to 7.1

Posted by ch...@apache.org.
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

commit 86b4390de094ec046348675a0988a5bb5b23633f
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Aug 16 10:41:25 2019 +0200

    [FLINK-13467][asm] Bump ASM to 7.1
---
 flink-shaded-asm-7/src/main/resources/META-INF/NOTICE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE b/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
index 18080e4..9ae988a 100644
--- a/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
@@ -1,4 +1,4 @@
-flink-shaded-asm6
+flink-shaded-asm7
 Copyright 2014-2018 The Apache Software Foundation
 
 This product includes software developed at

[flink-shaded] 02/03: [FLINK-13720][asm] Include asm-commons

Posted by ch...@apache.org.
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

commit 3c22b1576a47ffd38e6560ce8722ad60a0028d99
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Aug 16 10:41:49 2019 +0200

    [FLINK-13720][asm] Include asm-commons
---
 flink-shaded-asm-7/pom.xml                            | 6 ++++++
 flink-shaded-asm-7/src/main/resources/META-INF/NOTICE | 1 +
 2 files changed, 7 insertions(+)

diff --git a/flink-shaded-asm-7/pom.xml b/flink-shaded-asm-7/pom.xml
index 64f67a3..af9d4e1 100644
--- a/flink-shaded-asm-7/pom.xml
+++ b/flink-shaded-asm-7/pom.xml
@@ -57,6 +57,12 @@ under the License.
             <artifactId>asm-analysis</artifactId>
             <version>${asm.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.ow2.asm</groupId>
+            <artifactId>asm-commons</artifactId>
+            <version>${asm.version}</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE b/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
index 9ae988a..62d4ff8 100644
--- a/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
+++ b/flink-shaded-asm-7/src/main/resources/META-INF/NOTICE
@@ -9,4 +9,5 @@ See bundled license files for details.
 
 - org.ow2.asm:asm:7.1
 - org.ow2.asm:asm-analysis:7.1
+- org.ow2.asm:asm-commons:7.1
 - org.ow2.asm:asm-tree:7.1
\ No newline at end of file

[flink-shaded] 03/03: [hotfix][asm] Use asm.major.version in shading pattern

Posted by ch...@apache.org.
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

commit a5079c8cee53aa1eadb764de8484ff4493988636
Author: Chesnay Schepler <ch...@apache.org>
AuthorDate: Fri Aug 16 10:42:23 2019 +0200

    [hotfix][asm] Use asm.major.version in shading pattern
---
 flink-shaded-asm-7/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/flink-shaded-asm-7/pom.xml b/flink-shaded-asm-7/pom.xml
index af9d4e1..14ad022 100644
--- a/flink-shaded-asm-7/pom.xml
+++ b/flink-shaded-asm-7/pom.xml
@@ -90,7 +90,7 @@ under the License.
                             <relocations>
                                 <relocation>
                                     <pattern>org.objectweb</pattern>
-                                    <shadedPattern>${shading.prefix}.asm7.org.objectweb</shadedPattern>
+                                    <shadedPattern>${shading.prefix}.asm${asm.major.version}.org.objectweb</shadedPattern>
                                 </relocation>
                             </relocations>
                         </configuration>