Hello community, here is the log from the commit of package jarjar for openSUSE:Leap:15.2 checked in at 2020-02-05 07:29:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/jarjar (Old) and /work/SRC/openSUSE:Leap:15.2/.jarjar.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jarjar" Wed Feb 5 07:29:03 2020 rev:12 rq:764481 version:1.4 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/jarjar/jarjar.changes 2020-01-15 15:12:55.218157671 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.jarjar.new.26092/jarjar.changes 2020-02-05 07:29:09.578740147 +0100 @@ -1,0 +2,32 @@ +Tue Dec 11 12:31:52 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Build against objectweb-asm >= 5 in order to avoid getting stuck + with a particular asmN package. + +------------------------------------------------------------------- +Tue Nov 20 08:24:56 UTC 2018 - Fridrich Strba <fst...@suse.com> + +- Additional aliases for the jarjar:jarjar artifact +- Added patch: + * jarjar-1.4-asm5.patch + + use asm5 api + +------------------------------------------------------------------- +Thu Jul 26 10:50:50 UTC 2018 - jeng...@inai.de + +- Use noun phrasing in summaries; trim bias from descriptions. +- Remove one idempotent %if..%endif pair. + +------------------------------------------------------------------- +Wed Jun 13 11:58:28 UTC 2018 - fst...@suse.com + +- Upgrade to upstream version 1.4 +- Added patch: + * do-not-embed-asm.patch + + modify upstream build so that it does not embed the asm + inside the jarjar jar files +- Require asm5 for build since we want to be able to support java 8 + bytecode +- Build with java source and target 8 + +------------------------------------------------------------------- Old: ---- jarjar-0.9.pom jarjar-src-0.9.zip New: ---- do-not-embed-asm.patch jarjar-1.4-asm5.patch jarjar-src-1.4.zip jarjar.pom ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jarjar.spec ++++++ --- /var/tmp/diff_new_pack.kLSbDw/_old 2020-02-05 07:29:10.170740396 +0100 +++ /var/tmp/diff_new_pack.kLSbDw/_new 2020-02-05 07:29:10.178740400 +0100 @@ -1,7 +1,7 @@ # # spec file for package jarjar # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,33 +12,34 @@ # 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/ # %define section free Name: jarjar -Version: 0.9 +Version: 1.4 Release: 0 -Summary: Repackage Java libraries -License: GPL-2.0+ +Summary: Tool to repackage Java libraries +License: GPL-2.0-or-later Group: Development/Libraries/Java Url: http://tonicsystems.com/products/jarjar/ -Source0: http://downloads.sourceforge.net/jarjar/jarjar-src-0.9.zip -Source1: jarjar-0.9.pom +Source0: https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/%{name}/%{name}-src-%{version}.zip +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: asm2 BuildRequires: fdupes -BuildRequires: gnu-regexp -BuildRequires: java-devel +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: junit +BuildRequires: objectweb-asm >= 5 BuildRequires: unzip -Requires: asm2 Requires: gnu-regexp +Requires: objectweb-anttask +Requires: objectweb-asm >= 5 Requires(post): javapackages-tools Requires(postun): javapackages-tools BuildArch: noarch @@ -54,7 +55,6 @@ specific version of a library, which may conflict with the dependencies of another library. -%if 0 %package maven2-plugin Summary: Maven2 plugin for %{name} # FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"; @@ -65,41 +65,37 @@ %description maven2-plugin %{summary}. -%endif %package javadoc -Summary: Repackage Java libraries +Summary: Tool to repackage Java libraries Group: Development/Libraries/Java %description javadoc -Jar Jar Links is a utility that makes it easy to repackage Java -libraries and embed them into your own distribution. This is useful for -two reasons: You can easily ship a single jar file with no external -dependencies. You can avoid problems where your library depends on a -specific version of a library, which may conflict with the dependencies -of another library. +Jar Jar Links is a utility that repackages Java libraries and embeds +them into a distribution of its own. This is useful for two reasons: +You can easily ship a single jar file with no external dependencies. +You can avoid problems where your library depends on a specific +version of a library, which may conflict with the dependencies of +another library. %prep %setup -q +%patch0 -p0 +%patch1 -p1 # remove all binary libs -find . -name "*.jar" | xargs -t rm +rm -f lib/*.jar # maven plugin -find . -name JarJarMojo.java | xargs rm -rf +find . -name JarJarMojo.java -delete %build pushd lib -ln -sf $(build-classpath gnu.regexp) gnu-regexp.jar -ln -sf $(build-classpath asm2/asm) asm.jar -ln -sf $(build-classpath asm2/asm-commons) asm-commons.jar -ln -sf $(build-classpath asm2/asm-util) asm-util.jar +ln -sf $(build-classpath objectweb-asm/asm) asm-4.0.jar +ln -sf $(build-classpath objectweb-asm/asm-commons) asm-commons-4.0.jar ln -sf $(build-classpath ant) ant.jar -%if 0 -ln -sf $(build-classpath maven2/plugin-api) maven-plugin-api.jar -%endif popd export OPT_JAR_LIST="ant/ant-junit junit" ant \ - -Dcompile.source=1.6 -Dcompile.target=1.6 \ + -Dcompile.source=8 -Dcompile.target=8 \ jar jar-util javadoc mojo test %install @@ -122,9 +118,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} ++++++ do-not-embed-asm.patch ++++++ --- build.xml.orig 2014-12-18 21:38:42.035192783 +0000 +++ build.xml 2014-12-18 21:39:34.233460061 +0000 @@ -95,15 +95,9 @@ <mkdir dir="dist"/> <jarjar jarfile="${jarfile}"> <fileset dir="build/main"/> - <zipfileset src="lib/asm-4.0.jar"/> - <zipfileset src="lib/asm-commons-4.0.jar"> - <include name="org/objectweb/asm/commons/Remap*.class"/> - <include name="org/objectweb/asm/commons/LocalVariablesSorter.class"/> - </zipfileset> <keep pattern="com.tonicsystems.jarjar.Main"/> <keep pattern="com.tonicsystems.jarjar.JarJarTask"/> <rule pattern="com.tonicsystems.jarjar.util.**" result="com.tonicsystems.jarjar.ext_util.@1"/> - <rule pattern="org.objectweb.asm.**" result="com.tonicsystems.jarjar.asm.@1"/> <manifest> <attribute name="Main-Class" value="com.tonicsystems.jarjar.Main"/> <attribute name="Implementation-Version" value="${version}"/> @@ -199,7 +199,7 @@ </target> <target name="test-rejar" depends="jar"> - <taskdef name="jarjar2" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${jarfile}"/> + <taskdef name="jarjar2" classname="com.tonicsystems.jarjar.JarJarTask" classpath="${jarfile}:lib/asm-4.0.jar:lib/asm-commons-4.0.jar"/> <delete file="${test.jar}"/> <jarjar2 jarfile="${test.jar}"> <fileset dir="build/main"/> ++++++ 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); ++++++ jarjar-util.pom ++++++ --- /var/tmp/diff_new_pack.kLSbDw/_old 2020-02-05 07:29:10.234740423 +0100 +++ /var/tmp/diff_new_pack.kLSbDw/_new 2020-02-05 07:29:10.234740423 +0100 @@ -2,12 +2,24 @@ <modelVersion>4.0.0</modelVersion> <groupId>tonic</groupId> <artifactId>jarjar-util</artifactId> - <version>0.9</version> + <version>1.4</version> <distributionManagement> <relocation> <groupId>com.tonicsystems</groupId> <artifactId>jarjar-util</artifactId> - <version>0.9</version> + <version>1.4</version> </relocation> </distributionManagement> + <dependencies> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>5.0.3</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + <version>5.0.3</version> + </dependency> + </dependencies> </project> ++++++ jarjar-0.9.pom -> jarjar.pom ++++++ --- /work/SRC/openSUSE:Leap:15.2/jarjar/jarjar-0.9.pom 2020-01-15 15:12:55.150157633 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.jarjar.new.26092/jarjar.pom 2020-02-05 07:29:09.702740199 +0100 @@ -2,12 +2,24 @@ <modelVersion>4.0.0</modelVersion> <groupId>tonic</groupId> <artifactId>jarjar</artifactId> - <version>0.9</version> + <version>1.4</version> <distributionManagement> <relocation> <groupId>com.tonicsystems</groupId> <artifactId>jarjar</artifactId> - <version>0.9</version> + <version>1.4</version> </relocation> </distributionManagement> + <dependencies> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm</artifactId> + <version>5.0.3</version> + </dependency> + <dependency> + <groupId>org.ow2.asm</groupId> + <artifactId>asm-util</artifactId> + <version>5.0.3</version> + </dependency> + </dependencies> </project>
