#70 Fix unarchiving tar on osx

allegro · Mar 29, 2015 · a4005ea · a4005ea
1 parent 9bfc65d
commit a4005ea
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -58,6 +58,11 @@
             <version>3.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.9</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>

diff --git a/src/main/java/pl/allegro/tdr/gruntmaven/archive/TarUtil.java b/src/main/java/pl/allegro/tdr/gruntmaven/archive/TarUtil.java
@@ -15,12 +15,12 @@
  */
 package pl.allegro.tdr.gruntmaven.archive;
 
-import java.io.*;
-
+import org.apache.commons.compress.archivers.ArchiveEntry;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.io.IOUtils;
 import org.apache.maven.plugin.logging.Log;
-import org.codehaus.plexus.archiver.tar.TarEntry;
-import org.codehaus.plexus.archiver.tar.TarInputStream;
+
+import java.io.*;
 
 /**
  *
@@ -32,12 +32,12 @@ private TarUtil() {
     }
 
     public static void untar(File source, File target, Log logger) {
-        TarInputStream tarInput = null;
-        TarEntry entry;
+        TarArchiveInputStream tarInput = null;
+        ArchiveEntry entry;
         OutputStream output = null;
 
         try {
-            tarInput = new TarInputStream(new FileInputStream(source));
+            tarInput = new TarArchiveInputStream(new FileInputStream(source));
 
             entry = tarInput.getNextEntry();
             while (entry != null) {