Adapted to c-compress 1.10 rc

Conflicts:
	src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java
	src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java

Author: krosenvold

pom.xml

@@ -61,7 +61,7 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.10-SNAPSHOT</version>
+      <version>1.10</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

src/main/java/org/codehaus/plexus/archiver/AbstractUnArchiver.java

@@ -236,16 +236,22 @@ protected boolean isSelected( final String fileName, final PlexusIoResource file
     {
         if ( fileSelectors != null )
         {
-			for (FileSelector fileSelector : fileSelectors) {
-				try {
-					if (!fileSelector.isSelected(fileInfo)) {
-						return false;
-					}
-				} catch (final IOException e) {
-					throw new ArchiverException("Failed to check, whether " + fileInfo.getName() + " is selected: "
-							+ e.getMessage(), e);
-				}
-			}
+            for ( FileSelector fileSelector : fileSelectors )
+            {
+                try
+                {
+
+                    if ( !fileSelector.isSelected( fileInfo ) )
+                    {
+                        return false;
+                    }
+                }
+                catch ( final IOException e )
+                {
+                    throw new ArchiverException(
+                        "Failed to check, whether " + fileInfo.getName() + " is selected: " + e.getMessage(), e );
+                }
+            }
         }
         return true;
     }

src/main/java/org/codehaus/plexus/archiver/zip/AbstractZipArchiver.java

@@ -17,12 +17,15 @@
  *  limitations under the License.
  */
 
-import org.apache.commons.compress.archivers.zip.InputStreamSupplier;
 import org.apache.commons.compress.archivers.zip.ParallelScatterZipCreator;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
 import org.apache.commons.compress.archivers.zip.ZipEncoding;
 import org.apache.commons.compress.archivers.zip.ZipEncodingHelper;
+import java.util.concurrent.ExecutionException;
+import java.util.zip.CRC32;
+
+import org.apache.commons.compress.parallel.InputStreamSupplier;
 import org.codehaus.plexus.archiver.AbstractArchiver;
 import org.codehaus.plexus.archiver.ArchiveEntry;
 import org.codehaus.plexus.archiver.Archiver;
@@ -45,8 +48,6 @@
 import java.io.SequenceInputStream;
 import java.util.Hashtable;
 import java.util.Stack;
-import java.util.concurrent.ExecutionException;
-import java.util.zip.CRC32;
 
 import static org.codehaus.plexus.archiver.util.Streams.bufferedOutputStream;
 import static org.codehaus.plexus.archiver.util.Streams.fileOutputStream;

src/main/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreator.java

@@ -18,12 +18,14 @@
 package org.codehaus.plexus.archiver.zip;
 
 import org.apache.commons.compress.archivers.zip.*;
+import org.apache.commons.compress.parallel.InputStreamSupplier;
+import org.apache.commons.compress.parallel.ScatterGatherBackingStore;
+import org.apache.commons.compress.parallel.ScatterGatherBackingStoreSupplier;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.zip.Deflater;
 import java.util.zip.ZipEntry;
@@ -38,7 +40,8 @@ public class ConcurrentJarCreator {
     private final ParallelScatterZipCreator parallelScatterZipCreator;
     private long zipCloseElapsed;
 
-    static class DeferredSupplier implements ScatterGatherBackingStoreSupplier {
+    static class DeferredSupplier implements ScatterGatherBackingStoreSupplier
+    {
         public ScatterGatherBackingStore get() throws IOException {
             return new DeferredScatterOutputStream();
         }

src/main/java/org/codehaus/plexus/archiver/zip/DeferredScatterOutputStream.java

@@ -17,11 +17,14 @@
  */
 package org.codehaus.plexus.archiver.zip;
 
+import org.apache.commons.compress.parallel.ScatterGatherBackingStore;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-public class DeferredScatterOutputStream implements org.apache.commons.compress.archivers.zip.ScatterGatherBackingStore {
+public class DeferredScatterOutputStream implements ScatterGatherBackingStore
+{
     OffloadingOutputStream dfos = new OffloadingOutputStream(100000000, "scatterzipfragment", "zip", null);
 
 

src/test/java/org/codehaus/plexus/archiver/zip/ConcurrentJarCreatorTest.java

@@ -1,9 +1,9 @@
 package org.codehaus.plexus.archiver.zip;
 
-import org.apache.commons.compress.archivers.zip.InputStreamSupplier;
 import org.apache.commons.compress.archivers.zip.UnixStat;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipArchiveOutputStream;
+import org.apache.commons.compress.parallel.InputStreamSupplier;
 import org.apache.commons.compress.utils.IOUtils;
 import org.codehaus.plexus.util.DirectoryScanner;
 import org.junit.Ignore;