Commit upstream/1.9 - jarjar-maven-plugin

Imported Upstream version 1.9 Emmanuel Bourg 10 years ago

2 changed file(s) with 43 addition(s) and 20 deletion(s). Raw diff Collapse all Expand all

+10

-5

pom.xml less more

5	5	<parent>
6	6	<groupId>org.sonatype.plugins</groupId>
7	7	<artifactId>plugins-parent</artifactId>
8		<version>8</version>
	8	<version>9</version>
9	9	</parent>
10	10
11	11	<packaging>maven-plugin</packaging>
12	12
13	13	<groupId>org.sonatype.plugins</groupId>
14	14	<artifactId>jarjar-maven-plugin</artifactId>
15		<version>1.8</version>
	15	<version>1.9</version>
16	16
17	17	<name>JarJar Maven Plugin</name>
18	18

31	31	<connection>scm:git:git@github.com:sonatype/jarjar-maven-plugin.git</connection>
32	32	<developerConnection>scm:git:git@github.com:sonatype/jarjar-maven-plugin.git</developerConnection>
33	33	<url>http://github.com/sonatype/jarjar-maven-plugin</url>
	34	<tag>jarjar-maven-plugin-1.9</tag>
34	35	</scm>
35	36
36	37	<ciManagement>

49	50	<properties>
50	51	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
51	52	<forgeReleaseUrl>https://repository.sonatype.org/service/local/staging/deploy/maven2</forgeReleaseUrl>
52		<asm.version>4.0</asm.version>
	53	<asm.version>5.0.1</asm.version>
53	54	</properties>
54	55
55	56	<dependencies>

87	88	<dependency>
88	89	<groupId>org.codehaus.plexus</groupId>
89	90	<artifactId>plexus-archiver</artifactId>
90		<version>2.1.2</version>
	91	<version>2.4.4</version>
91	92	</dependency>
92	93	<dependency>
93	94	<groupId>org.codehaus.plexus</groupId>
94	95	<artifactId>plexus-utils</artifactId>
95		<version>3.0.5</version>
	96	<version>3.0.15</version>
96	97	</dependency>
97	98	</dependencies>
98	99
99	100	<build>
100	101	<plugins>
	102	<plugin>
	103	<artifactId>maven-release-plugin</artifactId>
	104	<version>2.5</version>
	105	</plugin>
101	106	<plugin>
102	107	<artifactId>maven-site-plugin</artifactId>
103	108	<version>3.1</version>

+33

-15

src/main/java/com/tonicsystems/jarjar/util/IoUtil.java less more

69	69	final ArrayList<ZipEntry> sortedList = new ArrayList<ZipEntry>();
70	70	while (e.hasMoreElements()) {
71	71	final ZipEntry entry = e.nextElement();
72		sortedList.add(entry);
	72	// META-INF/ doesn't need a directory entry
	73	if (!"META-INF/".equals(entry.getName())) {
	74	sortedList.add(entry);
	75	}
73	76	}
74	77
75	78	Collections.sort(sortedList, new Comparator<ZipEntry>()
76	79	{
77	80	public int compare(ZipEntry o1, ZipEntry o2)
78	81	{
79		return o1.getName().compareTo(o2.getName());
	82	String n1 = o1.getName(), n2 = o2.getName();
	83	if (metaOverride(n1, n2)) {
	84	return -1;
	85	}
	86	if (metaOverride(n2, n1)) {
	87	return 1;
	88	}
	89	return n1.compareTo(n2);
	90	}
	91
	92	// make sure that META-INF/MANIFEST.MF is always the very first entry
	93	private boolean metaOverride(String n1, String n2) {
	94	return (n1.startsWith("META-INF/") && !n2.startsWith("META-INF/"))
	95	\|\| (n1.equals("META-INF/MANIFEST.MF") && !n2.equals(n1));
80	96	}
81	97	});
82	98

104	120	isEmptyDirectory = false;
105	121	}
106	122
107
108		// write the entry
109	123	if (isEmptyDirectory)
110	124	{
111		sortedList.remove(inputEntry);
	125	sortedList.remove(i);
112	126	}
113		else
114		{
115		final ZipEntry outputEntry = new ZipEntry(inputEntry);
116		outputStream.putNextEntry(outputEntry);
117		ByteArrayOutputStream baos = new ByteArrayOutputStream();
118		final InputStream is = inputZip.getInputStream(inputEntry);
119		IoUtil.pipe(is, baos, buf);
120		is.close();
121		outputStream.write(baos.toByteArray());
122		}
	127	}
	128
	129	// finally write entries in normal order
	130	for (int i = 0; i < sortedList.size(); i++)
	131	{
	132	final ZipEntry inputEntry = sortedList.get(i);
	133	final ZipEntry outputEntry = new ZipEntry(inputEntry);
	134	outputStream.putNextEntry(outputEntry);
	135	ByteArrayOutputStream baos = new ByteArrayOutputStream();
	136	final InputStream is = inputZip.getInputStream(inputEntry);
	137	IoUtil.pipe(is, baos, buf);
	138	is.close();
	139	outputStream.write(baos.toByteArray());
123	140	}
124	141	} finally {
125	142	outputStream.close();
	143	inputZip.close();
126	144	}
127	145
128	146	}