debian/changelog

+jarjar-maven-plugin (1.9-8) unstable; urgency=medium
+
+  * Team upload.
+  * Switched again to libasm-java and fixed the compatibility with ASM 6
+  * Removed Damien Raude-Morvan from the uploaders (Closes: #889419)
+  * Standards-Version updated to 4.3.0
+  * Switch to debhelper level 11
+  * Use salsa.debian.org Vcs-* URLs
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Sun, 06 Jan 2019 01:46:13 +0100
+
 jarjar-maven-plugin (1.9-7) unstable; urgency=medium
 
   * Team upload.

debian/compat

-10
+11

debian/control

@@ -2,18 +2,22 @@ Source: jarjar-maven-plugin
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib@debian.org>, Emmanuel Bourg <ebourg@apache.org>
-Build-Depends: debhelper (>= 10), default-jdk, maven-debian-helper (>= 2.0), ant
-Build-Depends-Indep: junit4,
-                     libasm4-java,
+Uploaders: Emmanuel Bourg <ebourg@apache.org>
+Build-Depends:
+ ant,
+ debhelper (>= 11),
+ default-jdk,
+ junit4,
+ libasm-java (>= 6.0),
  libmaven-common-artifact-filters-java,
  libmaven-plugin-tools-java,
  libmaven3-core-java,
  libplexus-archiver-java,
-                     libplexus-utils2-java
-Standards-Version: 4.0.0
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jarjar-maven-plugin.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jarjar-maven-plugin.git
+ libplexus-utils2-java,
+ maven-debian-helper (>= 2.0)
+Standards-Version: 4.3.0
+Vcs-Git: https://salsa.debian.org/java-team/jarjar-maven-plugin.git
+Vcs-Browser: https://salsa.debian.org/java-team/jarjar-maven-plugin
 Homepage: http://sonatype.github.com/jarjar-maven-plugin/
 
 Package: libjarjar-maven-plugin-java

debian/maven.rules

@@ -3,4 +3,3 @@ org.apache.maven.shared maven-common-artifact-filters jar s/.*/debian/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
 org.apache.maven maven-* * s/.*/3.x/ * *
 org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
-org.ow2.asm * * s/.*/4.x/ * *

debian/patches/03-asm-compatibility.patch

+Description: Fixes the compatibility with the latest version of ASM.
+Author: Emmanuel Bourg <ebourg@apache.org>
+Forwarded: no
+--- a/src/main/java/com/tonicsystems/jarjar/DepFindVisitor.java
++++ b/src/main/java/com/tonicsystems/jarjar/DepFindVisitor.java
+@@ -25,7 +25,7 @@
+ import org.objectweb.asm.Type;
+ import org.objectweb.asm.commons.*;
+ 
+-class DepFindVisitor extends RemappingClassAdapter
++class DepFindVisitor extends ClassRemapper
+ {
+     public DepFindVisitor(Map<String, String> classes, String source, DepHandler handler) throws IOException {
+         super(null, new DepFindRemapper(classes, source, handler));
+--- a/src/main/java/com/tonicsystems/jarjar/KeepProcessor.java
++++ b/src/main/java/com/tonicsystems/jarjar/KeepProcessor.java
+@@ -26,7 +26,7 @@
+ // TODO: this can probably be refactored into JarClassVisitor, etc.
+ class KeepProcessor extends Remapper implements JarProcessor
+ {
+-    private final ClassVisitor cv = new RemappingClassAdapter(new EmptyClassVisitor(), this);
++    private final ClassVisitor cv = new ClassRemapper(new EmptyClassVisitor(), this);
+     private final List<Wildcard> wildcards;
+     private final List<String> roots = new ArrayList<String>();
+     private final Map<String, Set<String>> depend = new HashMap<String, Set<String>>();
+--- a/src/main/java/com/tonicsystems/jarjar/util/RemappingClassTransformer.java
++++ b/src/main/java/com/tonicsystems/jarjar/util/RemappingClassTransformer.java
+@@ -18,11 +18,11 @@
+ 
+ import org.objectweb.asm.ClassVisitor;
+ import org.objectweb.asm.commons.Remapper;
+-import org.objectweb.asm.commons.RemappingClassAdapter;
++import org.objectweb.asm.commons.ClassRemapper;
+ 
+ import com.tonicsystems.jarjar.EmptyClassVisitor;
+ 
+-public class RemappingClassTransformer extends RemappingClassAdapter
++public class RemappingClassTransformer extends ClassRemapper
+ {
+     public RemappingClassTransformer(Remapper pr) {
+         super(new EmptyClassVisitor(), pr);
+--- a/src/main/java/com/tonicsystems/jarjar/EmptyClassVisitor.java
++++ b/src/main/java/com/tonicsystems/jarjar/EmptyClassVisitor.java
+@@ -28,23 +28,23 @@
+ public class EmptyClassVisitor extends ClassVisitor {
+ 
+     public EmptyClassVisitor() {
+-        super(Opcodes.ASM4);
++        super(Opcodes.ASM6);
+     }
+     
+     @Override
+     public MethodVisitor visitMethod(int access, String name, String desc,
+             String signature, String[] exceptions) {
+-        return new MethodVisitor(Opcodes.ASM4) {};
++        return new MethodVisitor(Opcodes.ASM6) {};
+     }
+     
+     @Override
+     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+-        return new AnnotationVisitor(Opcodes.ASM4) {};
++        return new AnnotationVisitor(Opcodes.ASM6) {};
+     }
+     
+     @Override
+     public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+-        return new FieldVisitor(Opcodes.ASM4) {};
++        return new FieldVisitor(Opcodes.ASM6) {};
+     }
+ 
+ }
+--- a/src/main/java/com/tonicsystems/jarjar/StringReader.java
++++ b/src/main/java/com/tonicsystems/jarjar/StringReader.java
+@@ -24,7 +24,7 @@
+     private String className;
+ 
+     public StringReader() {
+-        super(Opcodes.ASM4);
++        super(Opcodes.ASM6);
+     }
+     
+     abstract public void visitString(String className, String value, int line);
+@@ -42,7 +42,7 @@
+ 
+     public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
+         handleObject(value);
+-        return new FieldVisitor(Opcodes.ASM4){
++        return new FieldVisitor(Opcodes.ASM6){
+             @Override
+             public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+                 return StringReader.this.visitAnnotation(desc, visible);
+@@ -52,7 +52,7 @@
+     
+     @Override
+     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
+-        return new AnnotationVisitor(Opcodes.ASM4) {
++        return new AnnotationVisitor(Opcodes.ASM6) {
+             @Override
+             public void visit(String name, Object value) {
+                 handleObject(value);
+@@ -71,7 +71,7 @@
+     @Override
+     public MethodVisitor visitMethod(int access, String name, String desc,
+             String signature, String[] exceptions) {
+-        MethodVisitor mv = new MethodVisitor(Opcodes.ASM4){
++        MethodVisitor mv = new MethodVisitor(Opcodes.ASM6){
+             @Override
+             public void visitLdcInsn(Object cst) {
+                 handleObject(cst);
+--- a/src/main/java/com/tonicsystems/jarjar/util/GetNameClassWriter.java
++++ b/src/main/java/com/tonicsystems/jarjar/util/GetNameClassWriter.java
+@@ -25,7 +25,7 @@
+     private String className;
+     
+     public GetNameClassWriter(int flags) {
+-        super(Opcodes.ASM4,new ClassWriter(flags));
++        super(Opcodes.ASM6,new ClassWriter(flags));
+     }
+ 
+     public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) {

debian/patches/series

 01-provided-ant-dependency.patch
 02-junit-dependency.patch
+03-asm-compatibility.patch

debian/rules

@@ -2,6 +2,3 @@
 
 %:
 	dh $@
-
-get-orig-source:
-	uscan --download-current-version --force-download --rename --repack --compression xz

debian/watch

-version=3
+version=4
+opts="repack,compression=xz" \
 https://github.com/sonatype/jarjar-maven-plugin/tags .*/jarjar-maven-plugin-([\d\.]+).tar.gz