Hello community, here is the log from the commit of package jarjar for openSUSE:Factory checked in at 2018-12-04 20:56:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jarjar (Old) and /work/SRC/openSUSE:Factory/.jarjar.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jarjar" Tue Dec 4 20:56:00 2018 rev:18 rq:653643 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/jarjar/jarjar.changes 2018-07-27 10:58:12.789872884 +0200 +++ /work/SRC/openSUSE:Factory/.jarjar.new.19453/jarjar.changes 2018-12-04 20:56:21.980716869 +0100 @@ -1,0 +2,8 @@ +Tue Nov 20 08:24:56 UTC 2018 - Fridrich Strba <[email protected]> + +- Additional aliases for the jarjar:jarjar artifact +- Added patch: + * jarjar-1.4-asm5.patch + + use asm5 api + +------------------------------------------------------------------- New: ---- jarjar-1.4-asm5.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jarjar.spec ++++++ --- /var/tmp/diff_new_pack.lGFLJk/_old 2018-12-04 20:56:22.420716385 +0100 +++ /var/tmp/diff_new_pack.lGFLJk/_new 2018-12-04 20:56:22.424716380 +0100 @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -28,6 +28,7 @@ Source1: jarjar.pom Source2: jarjar-util.pom Patch0: do-not-embed-asm.patch +Patch1: jarjar-1.4-asm5.patch BuildRequires: ant >= 1.6 BuildRequires: ant-junit >= 1.6 BuildRequires: asm5 @@ -81,6 +82,7 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 # remove all binary libs rm -f lib/*.jar # maven plugin @@ -117,9 +119,8 @@ %{buildroot}%{_mavenpomdir}/JPP-%{name}-util.pom # depmaps -%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "jarjar:%{name},com.tonicsystems:%{name}" +%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "jarjar:%{name},com.tonicsystems:%{name},com.googlecode.jarjar:%{name},org.gradle.jarjar:%{name}" %add_maven_depmap JPP-%{name}-util.pom %{name}-util.jar -a "jarjar:%{name}-util,com.tonicsystems:%{name}-util" -#% add_maven_depmap JPP-%{name}-plugin.pom %{name}-plugin.jar -a "jarjar:%{name}-plugin,tonic:%{name}-plugin,com.tonicsystems:%{name}-plugin" -f "plugin" # javadoc mkdir -p %{buildroot}%{_javadocdir}/%{name} ++++++ jarjar-1.4-asm5.patch ++++++ --- jarjar-1.4/src/main/com/tonicsystems/jarjar/DepFindVisitor.java 2012-07-02 13:19:28.000000000 +0200 +++ jarjar-1.4/src/main/com/tonicsystems/jarjar/DepFindVisitor.java 2018-11-20 09:17:27.549974497 +0100 @@ -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)); --- jarjar-1.4/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java 2012-07-02 13:19:28.000000000 +0200 +++ jarjar-1.4/src/main/com/tonicsystems/jarjar/EmptyClassVisitor.java 2018-11-20 09:17:27.549974497 +0100 @@ -28,23 +28,23 @@ public class EmptyClassVisitor extends ClassVisitor { public EmptyClassVisitor() { - super(Opcodes.ASM4); + super(Opcodes.ASM5); } @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - return new MethodVisitor(Opcodes.ASM4) {}; + return new MethodVisitor(Opcodes.ASM5) {}; } @Override public AnnotationVisitor visitAnnotation(String desc, boolean visible) { - return new AnnotationVisitor(Opcodes.ASM4) {}; + return new AnnotationVisitor(Opcodes.ASM5) {}; } @Override public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) { - return new FieldVisitor(Opcodes.ASM4) {}; + return new FieldVisitor(Opcodes.ASM5) {}; } } --- jarjar-1.4/src/main/com/tonicsystems/jarjar/KeepProcessor.java 2012-07-02 13:22:34.000000000 +0200 +++ jarjar-1.4/src/main/com/tonicsystems/jarjar/KeepProcessor.java 2018-11-20 09:17:27.549974497 +0100 @@ -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>>(); --- jarjar-1.4/src/main/com/tonicsystems/jarjar/StringReader.java 2012-07-02 13:19:28.000000000 +0200 +++ jarjar-1.4/src/main/com/tonicsystems/jarjar/StringReader.java 2018-11-20 09:17:27.549974497 +0100 @@ -24,7 +24,7 @@ private String className; public StringReader() { - super(Opcodes.ASM4); + super(Opcodes.ASM5); } 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.ASM5){ @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.ASM5) { @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.ASM5){ @Override public void visitLdcInsn(Object cst) { handleObject(cst); --- jarjar-1.4/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java 2012-07-02 13:19:28.000000000 +0200 +++ jarjar-1.4/src/main/com/tonicsystems/jarjar/util/GetNameClassWriter.java 2018-11-20 09:17:27.549974497 +0100 @@ -25,7 +25,7 @@ private String className; public GetNameClassWriter(int flags) { - super(Opcodes.ASM4,new ClassWriter(flags)); + super(Opcodes.ASM5,new ClassWriter(flags)); } public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { --- jarjar-1.4/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java 2012-07-02 13:19:28.000000000 +0200 +++ jarjar-1.4/src/main/com/tonicsystems/jarjar/util/RemappingClassTransformer.java 2018-11-20 09:17:27.549974497 +0100 @@ -17,12 +17,12 @@ package com.tonicsystems.jarjar.util; import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.commons.ClassRemapper; import org.objectweb.asm.commons.Remapper; -import org.objectweb.asm.commons.RemappingClassAdapter; import com.tonicsystems.jarjar.EmptyClassVisitor; -public class RemappingClassTransformer extends RemappingClassAdapter +public class RemappingClassTransformer extends ClassRemapper { public RemappingClassTransformer(Remapper pr) { super(new EmptyClassVisitor(), pr);
