[maven-shade-plugin] 04/11: Removed the ASM compatibility patch (fixed upstream)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven-shade-plugin.

commit 1d5fa35bd1b7c90d81baf78e196ebdc68691a41b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Aug 31 00:54:24 2017 +0200

    Removed the ASM compatibility patch (fixed upstream)
---
 debian/changelog                          |  3 ++-
 debian/control                            |  2 +-
 debian/patches/01-asm-compatibility.patch | 23 -----------------------
 debian/patches/series                     |  1 -
 4 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f75f2e3..a6a752a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-maven-shade-plugin (3.0.0-1) UNRELEASED; urgency=medium
+maven-shade-plugin (3.1.0-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
     - New dependency on libmaven-artifact-transfer-java
+    - Removed the ASM compatibility patch (fixed upstream)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 19 Jul 2017 15:42:54 +0200
 
diff --git a/debian/control b/debian/control
index 8842c5a..c49a141 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
 Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 1.4)
 Build-Depends-Indep: junit4,
-                     libasm-java (>= 5.0),
+                     libasm-java (>= 6.0~),
                      libjdependency-java,
                      libjdom1-java (>= 1.0),
                      libmaven-artifact-transfer-java,
diff --git a/debian/patches/01-asm-compatibility.patch b/debian/patches/01-asm-compatibility.patch
deleted file mode 100644
index 91f8f3d..0000000
--- a/debian/patches/01-asm-compatibility.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fixes the compatibility with the latest version of ASM
-Author: Emmanuel Bourg <ebourg at apache.org>
-Bug: https://github.com/apache/maven-plugins/pull/122
---- a/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
-+++ b/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
-@@ -34,7 +34,7 @@
- import org.objectweb.asm.ClassVisitor;
- import org.objectweb.asm.ClassWriter;
- import org.objectweb.asm.commons.Remapper;
--import org.objectweb.asm.commons.RemappingClassAdapter;
-+import org.objectweb.asm.commons.ClassRemapper;
- 
- import java.io.BufferedOutputStream;
- import java.io.File;
-@@ -422,7 +422,7 @@
-         ClassWriter cw = new ClassWriter( 0 );
- 
-         final String pkg = name.substring( 0, name.lastIndexOf( '/' ) + 1 );
--        ClassVisitor cv = new RemappingClassAdapter( cw, remapper )
-+        ClassVisitor cv = new ClassRemapper( cw, remapper )
-         {
-             @Override
-             public void visitSource( final String source, final String debug )
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 2d47737..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-01-asm-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-shade-plugin.git