New Upstream Snapshot - jarjar-maven-plugin
Ready changes
Summary
Merged new upstream version: 1.9+git20141106.1.3fe3f8d (was: 1.9).
Resulting package
Built on 2022-10-21T12:05 (took 5m21s)
The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:
apt install -t fresh-snapshots libjarjar-maven-plugin-java
Lintian Result
Diff
diff --git a/debian/changelog b/debian/changelog
index 8410110..0886e2d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jarjar-maven-plugin (1.9+git20141106.1.3fe3f8d-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk> Fri, 21 Oct 2022 12:01:42 -0000
+
jarjar-maven-plugin (1.9-8) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/01-provided-ant-dependency.patch b/debian/patches/01-provided-ant-dependency.patch
index febad00..b9f0730 100644
--- a/debian/patches/01-provided-ant-dependency.patch
+++ b/debian/patches/01-provided-ant-dependency.patch
@@ -2,8 +2,10 @@ Description: Mark the ant dependency as provided
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
Bug-Debian: https://bugs.debian.org/769804
---- a/pom.xml
-+++ b/pom.xml
+Index: jarjar-maven-plugin.git/pom.xml
+===================================================================
+--- jarjar-maven-plugin.git.orig/pom.xml
++++ jarjar-maven-plugin.git/pom.xml
@@ -70,6 +70,7 @@
<artifactId>ant</artifactId>
<version>1.8.4</version>
diff --git a/debian/patches/02-junit-dependency.patch b/debian/patches/02-junit-dependency.patch
index be1fb7d..784783f 100644
--- a/debian/patches/02-junit-dependency.patch
+++ b/debian/patches/02-junit-dependency.patch
@@ -1,8 +1,10 @@
Descriptions: Adds the missing junit dependency
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
---- a/pom.xml
-+++ b/pom.xml
+Index: jarjar-maven-plugin.git/pom.xml
+===================================================================
+--- jarjar-maven-plugin.git.orig/pom.xml
++++ jarjar-maven-plugin.git/pom.xml
@@ -97,6 +97,12 @@
<artifactId>plexus-utils</artifactId>
<version>3.0.15</version>
diff --git a/debian/patches/03-asm-compatibility.patch b/debian/patches/03-asm-compatibility.patch
index 7cc162f..c945bf7 100644
--- a/debian/patches/03-asm-compatibility.patch
+++ b/debian/patches/03-asm-compatibility.patch
@@ -1,9 +1,11 @@
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 @@
+Index: jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/DepFindVisitor.java
+===================================================================
+--- jarjar-maven-plugin.git.orig/src/main/java/com/tonicsystems/jarjar/DepFindVisitor.java
++++ jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/DepFindVisitor.java
+@@ -25,7 +25,7 @@ import org.objectweb.asm.*;
import org.objectweb.asm.Type;
import org.objectweb.asm.commons.*;
@@ -12,9 +14,11 @@ Forwarded: no
{
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 @@
+Index: jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/KeepProcessor.java
+===================================================================
+--- jarjar-maven-plugin.git.orig/src/main/java/com/tonicsystems/jarjar/KeepProcessor.java
++++ jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/KeepProcessor.java
+@@ -26,7 +26,7 @@ import org.objectweb.asm.commons.*;
// TODO: this can probably be refactored into JarClassVisitor, etc.
class KeepProcessor extends Remapper implements JarProcessor
{
@@ -23,9 +27,11 @@ Forwarded: no
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 @@
+Index: jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/util/RemappingClassTransformer.java
+===================================================================
+--- jarjar-maven-plugin.git.orig/src/main/java/com/tonicsystems/jarjar/util/RemappingClassTransformer.java
++++ jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/util/RemappingClassTransformer.java
+@@ -18,11 +18,11 @@ package com.tonicsystems.jarjar.util;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.commons.Remapper;
@@ -39,9 +45,11 @@ Forwarded: no
{
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 @@
+Index: jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/EmptyClassVisitor.java
+===================================================================
+--- jarjar-maven-plugin.git.orig/src/main/java/com/tonicsystems/jarjar/EmptyClassVisitor.java
++++ jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/EmptyClassVisitor.java
+@@ -28,23 +28,23 @@ import org.objectweb.asm.Opcodes;
public class EmptyClassVisitor extends ClassVisitor {
public EmptyClassVisitor() {
@@ -69,9 +77,11 @@ Forwarded: no
}
}
---- a/src/main/java/com/tonicsystems/jarjar/StringReader.java
-+++ b/src/main/java/com/tonicsystems/jarjar/StringReader.java
-@@ -24,7 +24,7 @@
+Index: jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/StringReader.java
+===================================================================
+--- jarjar-maven-plugin.git.orig/src/main/java/com/tonicsystems/jarjar/StringReader.java
++++ jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/StringReader.java
+@@ -24,7 +24,7 @@ abstract class StringReader extends Clas
private String className;
public StringReader() {
@@ -80,7 +90,7 @@ Forwarded: no
}
abstract public void visitString(String className, String value, int line);
-@@ -42,7 +42,7 @@
+@@ -42,7 +42,7 @@ abstract class StringReader extends Clas
public FieldVisitor visitField(int access, String name, String desc, String signature, Object value) {
handleObject(value);
@@ -89,7 +99,7 @@ Forwarded: no
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
return StringReader.this.visitAnnotation(desc, visible);
-@@ -52,7 +52,7 @@
+@@ -52,7 +52,7 @@ abstract class StringReader extends Clas
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
@@ -98,7 +108,7 @@ Forwarded: no
@Override
public void visit(String name, Object value) {
handleObject(value);
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ abstract class StringReader extends Clas
@Override
public MethodVisitor visitMethod(int access, String name, String desc,
String signature, String[] exceptions) {
@@ -107,9 +117,11 @@ Forwarded: no
@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 @@
+Index: jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/util/GetNameClassWriter.java
+===================================================================
+--- jarjar-maven-plugin.git.orig/src/main/java/com/tonicsystems/jarjar/util/GetNameClassWriter.java
++++ jarjar-maven-plugin.git/src/main/java/com/tonicsystems/jarjar/util/GetNameClassWriter.java
+@@ -25,7 +25,7 @@ public class GetNameClassWriter extends
private String className;
public GetNameClassWriter(int flags) {
diff --git a/pom.xml b/pom.xml
index 6431191..edc00cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
<groupId>org.sonatype.plugins</groupId>
<artifactId>jarjar-maven-plugin</artifactId>
- <version>1.9</version>
+ <version>1.10-SNAPSHOT</version>
<name>JarJar Maven Plugin</name>
@@ -32,7 +32,7 @@
<connection>scm:git:git@github.com:sonatype/jarjar-maven-plugin.git</connection>
<developerConnection>scm:git:git@github.com:sonatype/jarjar-maven-plugin.git</developerConnection>
<url>http://github.com/sonatype/jarjar-maven-plugin</url>
- <tag>jarjar-maven-plugin-1.9</tag>
+ <tag>HEAD</tag>
</scm>
<ciManagement>
diff --git a/src/main/java/com/tonicsystems/jarjar/JarJarMojo.java b/src/main/java/com/tonicsystems/jarjar/JarJarMojo.java
index bfc7c85..f72cba3 100644
--- a/src/main/java/com/tonicsystems/jarjar/JarJarMojo.java
+++ b/src/main/java/com/tonicsystems/jarjar/JarJarMojo.java
@@ -126,7 +126,7 @@ public class JarJarMojo
{
// VALIDATE INPUT / OUTPUT
- if ( null == input && null != project.getArtifact() )
+ if ( null == input && null != project.getArtifact() && null != project.getArtifact().getFile() )
{
input = project.getArtifact().getFile().getAbsolutePath();
}
diff --git a/src/main/java/com/tonicsystems/jarjar/util/IoUtil.java b/src/main/java/com/tonicsystems/jarjar/util/IoUtil.java
index 667e5d0..f950d1b 100644
--- a/src/main/java/com/tonicsystems/jarjar/util/IoUtil.java
+++ b/src/main/java/com/tonicsystems/jarjar/util/IoUtil.java
@@ -70,10 +70,7 @@ class IoUtil {
final ArrayList<ZipEntry> sortedList = new ArrayList<ZipEntry>();
while (e.hasMoreElements()) {
final ZipEntry entry = e.nextElement();
- // META-INF/ doesn't need a directory entry
- if (!"META-INF/".equals(entry.getName())) {
- sortedList.add(entry);
- }
+ sortedList.add(entry);
}
Collections.sort(sortedList, new Comparator<ZipEntry>()
@@ -90,10 +87,11 @@ class IoUtil {
return n1.compareTo(n2);
}
- // make sure that META-INF/MANIFEST.MF is always the very first entry
+ // make sure that META-INF/MANIFEST.MF is always the first entry after META-INF/
private boolean metaOverride(String n1, String n2) {
return (n1.startsWith("META-INF/") && !n2.startsWith("META-INF/"))
- || (n1.equals("META-INF/MANIFEST.MF") && !n2.equals(n1));
+ || (n1.equals("META-INF/MANIFEST.MF") && !n2.equals(n1) && !n2.equals("META-INF/"))
+ || (n1.equals("META-INF/") && !n2.equals(n1));
}
});
Debdiff
[The following lists of changes regard files as different if they have different names, permissions or owners.]
Files in second set of .debs but not in first
-rw-r--r-- root/root /usr/share/maven-repo/org/sonatype/plugins/jarjar-maven-plugin/1.10-SNAPSHOT/jarjar-maven-plugin-1.10-SNAPSHOT.jar -rw-r--r-- root/root /usr/share/maven-repo/org/sonatype/plugins/jarjar-maven-plugin/1.10-SNAPSHOT/jarjar-maven-plugin-1.10-SNAPSHOT.pom
Files in first set of .debs but not in second
-rw-r--r-- root/root /usr/share/maven-repo/org/sonatype/plugins/jarjar-maven-plugin/1.9/jarjar-maven-plugin-1.9.jar -rw-r--r-- root/root /usr/share/maven-repo/org/sonatype/plugins/jarjar-maven-plugin/1.9/jarjar-maven-plugin-1.9.pom
Control files: lines which differ (wdiff format)
Depends: libasm-java (>= 9.4), 9.3), libmaven-common-artifact-filters-java (>= 3.3.2), 3.1.1), libmaven3-core-java (>= 3.8.7), 3.8.6), libplexus-archiver-java (>= 4.6.1), 4.3.0), libplexus-utils2-java (>= 2.x)