Add support for ZIP64 format

This change update introduces usage of Apache Commons Compress to support jars in ZIP64 format.
Previous plugin version had a hard limit of 64K entries in the executable
jar. After this change, limit for entries is 2^64-1 files which should be
enough for most of the cases.

Author: wendigo

README.md

@@ -78,6 +78,8 @@ To use it, add a plugin to your pom like
 
 Changes:
 
+2.0.0 - support ZIP64 format
+
 1.4.0 - require Java 7, change code to use JDK7 APIs
       - Support Windows
       - Don't suppress errors

pom.xml

@@ -22,7 +22,7 @@
 
     <groupId>org.skife.maven</groupId>
     <artifactId>really-executable-jar-maven-plugin</artifactId>
-    <version>1.4.2-SNAPSHOT</version>
+    <version>2.0.0-SNAPSHOT</version>
     <packaging>maven-plugin</packaging>
 
     <name>Really Executable Jar Maven Plugin</name>
@@ -87,6 +87,12 @@
             <version>${dep.plexus-utils.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.22</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.maven</groupId>
             <artifactId>maven-artifact</artifactId>

src/main/java/org/skife/waffles/ReallyExecutableJarMojo.java

@@ -13,6 +13,10 @@
  */
 package org.skife.waffles;
 
+import org.apache.commons.compress.archivers.jar.JarArchiveOutputStream;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
+import org.apache.commons.compress.archivers.zip.ZipArchiveEntryPredicate;
+import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -25,10 +29,11 @@
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.URI;
 import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.file.Files;
@@ -37,6 +42,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static java.lang.String.format;
+import static java.nio.charset.StandardCharsets.US_ASCII;
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static java.nio.file.Files.readAllBytes;
+import static org.apache.commons.compress.archivers.zip.Zip64Mode.AlwaysWithCompatibility;
+
 /**
  * Make an artifact generated by the build really executable. The resulting artifact
  * can be run directly from the command line (Java must be installed and in the
@@ -162,39 +173,52 @@ private void makeExecutable(File file)
     {
         getLog().debug("Making " + file.getAbsolutePath() + " executable");
 
-        Path original = Paths.get(file.getAbsolutePath() + ".rx-orig");
+        Path original = Paths.get(file.getAbsolutePath() + ".original");
         Files.move(file.toPath(), original);
-        try (final FileOutputStream out = new FileOutputStream(file);
-             final InputStream in = Files.newInputStream(original)) {
+        try (JarArchiveOutputStream jar = new JarArchiveOutputStream(Files.newOutputStream(file.toPath()))) {
+            jar.writePreamble(getPreamble(original.toUri()));
+            jar.setUseZip64(AlwaysWithCompatibility);
+            jar.setEncoding(UTF_8.name());
+
+            try (ZipFile zip = new ZipFile(original.toFile())) {
+                zip.copyRawEntries(jar, zipArchiveEntry -> true);
+            }
+            jar.flush();
+            jar.finish();
+        }
+        finally {
+            Files.deleteIfExists(original);
+        }
+
+        if (!file.setExecutable(true, false)) {
+            throw new MojoExecutionException(format("Could not make JAR [%s] executable", file.getAbsolutePath()));
+        }
+        getLog().info(format("Successfully made JAR [%s] executable", file.getAbsolutePath()));
+    }
 
+    private byte[] getPreamble(URI uri) throws MojoExecutionException
+    {
+        try
+        {
             if (scriptFile == null) {
-                out.write(("#!/bin/sh\n\nexec java " + flags + " -jar \"$0\" \"$@\"\n\n").getBytes("ASCII"));
+                return ("#!/bin/sh\n\nexec java " + flags + " -jar \"$0\" \"$@\"\n\n").getBytes(UTF_8);
             }
             else if (Files.exists(Paths.get(scriptFile))) {
-                getLog().debug(String.format("Loading file[%s] from filesystem", scriptFile));
-
-                byte[] script = Files.readAllBytes(Paths.get(scriptFile));
-                out.write(script);
-                out.write(new byte[]{'\n', '\n'});
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                outputStream.write(readAllBytes(Paths.get(scriptFile)));
+                outputStream.write("\n\n".getBytes(US_ASCII));
+                return outputStream.toByteArray();
             }
-            else {
-                getLog().debug(String.format("Loading file[%s] from jar[%s]", scriptFile, original));
-
-                try (final URLClassLoader loader = new URLClassLoader(new URL[]{original.toUri().toURL()}, null);
-                     final InputStream scriptIn = loader.getResourceAsStream(scriptFile)) {
 
-                    out.write(IOUtil.toString(scriptIn).getBytes("ASCII"));
-                    out.write("\n\n".getBytes("ASCII"));
-                }
+            try (final URLClassLoader loader = new URLClassLoader(new URL[]{uri.toURL()}, null); final InputStream scriptIn = loader.getResourceAsStream(scriptFile)) {
+                ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+                outputStream.write(IOUtil.toString(scriptIn).getBytes(UTF_8));
+                outputStream.write("\n\n".getBytes(UTF_8));
+                return outputStream.toByteArray();
             }
-            IOUtil.copy(in, out);
         }
-        finally {
-            Files.deleteIfExists(original);
+        catch (IOException e) {
+            throw new MojoExecutionException(e.getMessage());
         }
-
-        file.setExecutable(true, false);
-
-        getLog().info(String.format("Successfully made JAR [%s] executable", file.getAbsolutePath()));
     }
 }