Merge branch '2.x'

Conflicts:
	ReleaseNotes.md
	pom.xml
	src/main/java/org/codehaus/plexus/archiver/AbstractArchiver.java
	src/main/java/org/codehaus/plexus/archiver/tar/TarArchiver.java
	src/test/java/org/codehaus/plexus/archiver/jar/SecurityFilterTest.java

Author: krosenvold

ReleaseNotes.md

@@ -1,17 +1,34 @@
 Plexus Archiver and Plexus-IO combined release notes
 ========================================================================
 
-Note: Master is in JIRA at http://jira.codehaus.org/browse/PLXCOMP
-
 Since archiver depends on a given version of IO this list is cumulative,
 any version includes *all* changes below.
 
-Plexus Archiver - Version 2.10
+Plexus Archiver - Version 3.0
 ------
 ** Improvement
 
   * [PLXCOMP-282] - Add Snappy compression support
 
+Plexus Components - Version plexus-archiver-2.10
+-----
+
+* Symlink support in DirectoryArchiver
+* Multithreaded ZIP support
+* Fixed resource leak on ZIP files included in ZIP files.
+* Added encoding supporting overload: addArchivedFileSet( final ArchivedFileSet fileSet, Charset charset )
+* Fixed NPE with missing folder in TAR
+* Moved all "zip" support to archiver (from io).
+
+
+Plexus Components - Version plexus-io-2.5
+-----
+* Proper support for closeable on zip archives.
+* Removed zip supporting PlexusIoZipFileResourceCollection; which now exists in plexus-archiver. (Drop in replacement,
+just change/add jar file).
+
+>>>>>>> 2.x
+
 Plexus Components - Version plexus-archiver-2.9.1
 -----
 

pom.xml

@@ -4,25 +4,24 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
+    <artifactId>plexus</artifactId>
     <groupId>org.codehaus.plexus</groupId>
-    <artifactId>plexus-components</artifactId>
-    <version>1.3</version>
+    <version>3.2</version>
   </parent>
 
   <artifactId>plexus-archiver</artifactId>
   <version>3.0.1-SNAPSHOT</version>
-
   <name>Plexus Archiver Component</name>
 
   <scm>
-    <connection>scm:git:[email protected]:sonatype/plexus-archiver.git</connection>
-    <developerConnection>scm:git:[email protected]:sonatype/plexus-archiver.git</developerConnection>
-    <url>http://github.com/sonatype/plexus-archiver</url>
+    <connection>scm:git:[email protected]:codehaus-plexus/plexus-archiver.git</connection>
+    <developerConnection>scm:git:[email protected]:codehaus-plexus/plexus-archiver.git</developerConnection>
+    <url>http://github.com/codehaus-plexus/plexus-archiver</url>
     <tag>HEAD</tag>
   </scm>
   <issueManagement>
     <system>jira</system>
-    <url>http://jira.codehaus.org/browse/PLXCOMP/component/12540</url>
+    <url>https://github.com/codehaus-plexus/plexus-archiver/issues</url>
   </issueManagement>
 
   <properties>
@@ -46,6 +45,7 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
+      <version>1.0-alpha-9-stable-1</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -56,12 +56,12 @@
     <dependency>
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-io</artifactId>
-      <version>2.4.1</version>
+      <version>2.6</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-compress</artifactId>
-      <version>1.9</version>
+      <version>1.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.xerial.snappy</groupId>
@@ -126,6 +126,33 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>1.4</version>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+            <configuration>
+              <minimizeJar>true</minimizeJar>
+              <artifactSet>
+                <includes>
+                  <include>org.apache.commons:commons-compress</include>
+                </includes>
+              </artifactSet>
+              <relocations>
+                <relocation>
+                  <pattern>org.apache.commons.compress</pattern>
+                  <shadedPattern>org.codehaus.plexus.archiver.commonscompress</shadedPattern>
+                </relocation>
+              </relocations>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-enforcer-plugin</artifactId>

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

@@ -17,21 +17,6 @@
  *  limitations under the License.
  */
 
-import java.io.Closeable;
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.NoSuchElementException;
-import java.util.Set;
-
-import javax.annotation.Nonnull;
-
 import org.codehaus.plexus.PlexusConstants;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.archiver.manager.ArchiverManager;
@@ -41,6 +26,7 @@
 import org.codehaus.plexus.components.io.attributes.PlexusIoResourceAttributes;
 import org.codehaus.plexus.components.io.functions.ResourceAttributeSupplier;
 import org.codehaus.plexus.components.io.resources.AbstractPlexusIoResourceCollection;
+import org.codehaus.plexus.components.io.resources.EncodingSupported;
 import org.codehaus.plexus.components.io.resources.PlexusIoArchivedResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoFileResourceCollection;
 import org.codehaus.plexus.components.io.resources.PlexusIoResource;
@@ -54,6 +40,21 @@
 import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
 import org.codehaus.plexus.util.Os;
 
+import javax.annotation.Nonnull;
+import java.io.Closeable;
+import java.io.File;
+import java.io.IOException;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Set;
+
 import static org.codehaus.plexus.archiver.util.DefaultArchivedFileSet.archivedFileSet;
 import static org.codehaus.plexus.archiver.util.DefaultFileSet.fileSet;
 
@@ -100,6 +101,7 @@ public abstract class AbstractArchiver
     // On lunix-like systems, we replace windows backslashes with forward slashes
     private final boolean replacePathSlashesToJavaPaths = File.separatorChar == '/';
 
+    private final List<Closeable> closeables = new ArrayList<Closeable>(  );
     /**
      * since 2.2 is on by default
      *
@@ -479,6 +481,12 @@ else if ( o instanceof PlexusIoResourceCollection )
                             }
                             else
                             {
+                                // this will leak handles in the IO iterator if the iterator is not fully consumed.
+                                // alternately we'd have to make this method return a Closeable iterator back
+                                // to the client and ditch the whole issue onto the client.
+                                // this does not really make any sense either, might equally well change the
+                                // api into something that is not broken by design.
+                                addCloseable( ioResourceIter );
                                 ioResourceIter = null;
                             }
                         }
@@ -550,6 +558,33 @@ private String normalizedForDuplicateCheck(ArchiveEntry entry){
 
     }
 
+    private static void closeIfCloseable( Object resource )
+        throws IOException
+    {
+        if ( resource == null )
+        {
+            return;
+        }
+        if ( resource instanceof Closeable )
+        {
+            ( (Closeable) resource ).close();
+        }
+
+    }
+
+    private static void closeQuietlyIfCloseable( Object resource )
+    {
+        try
+        {
+            closeIfCloseable( resource );
+        }
+        catch ( IOException e )
+        {
+            throw new RuntimeException( e );
+        }
+    }
+
+
     public Map<String, ArchiveEntry> getFiles()
     {
         try
@@ -603,7 +638,7 @@ protected Logger getLogger()
         return logger;
     }
 
-    protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet fileSet )
+    protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet fileSet, Charset charset )
         throws ArchiverException
     {
         final File archiveFile = fileSet.getArchive();
@@ -619,6 +654,10 @@ protected PlexusIoResourceCollection asResourceCollection( final ArchivedFileSet
                 "Error adding archived file-set. PlexusIoResourceCollection not found for: " + archiveFile, e );
         }
 
+        if (resources instanceof EncodingSupported ) {
+            ((EncodingSupported)resources).setEncoding( charset );
+        }
+
         if ( resources instanceof PlexusIoArchivedResourceCollection )
         {
             ( (PlexusIoArchivedResourceCollection) resources ).setFile( fileSet.getArchive() );
@@ -673,7 +712,14 @@ private void doAddResource(Object item){
     public void addArchivedFileSet( final ArchivedFileSet fileSet )
         throws ArchiverException
     {
-        final PlexusIoResourceCollection resourceCollection = asResourceCollection( fileSet );
+        final PlexusIoResourceCollection resourceCollection = asResourceCollection( fileSet, null );
+        addResources( resourceCollection );
+    }
+
+    public void addArchivedFileSet( final ArchivedFileSet fileSet, Charset charset )
+        throws ArchiverException
+    {
+        final PlexusIoResourceCollection resourceCollection = asResourceCollection( fileSet, charset );
         addResources( resourceCollection );
     }
 
@@ -921,26 +967,40 @@ protected void validate()
 
     protected abstract String getArchiveType();
 
+    private void addCloseable(Object maybeCloseable){
+        if (maybeCloseable instanceof  Closeable)
+            closeables.add( (Closeable) maybeCloseable );
+
+    }
+    private void closeIterators()
+    {
+        for ( Closeable closeable : closeables )
+        {
+            closeQuietlyIfCloseable( closeable );
+        }
+
+    }
     protected abstract void close()
         throws IOException;
 
     protected void cleanUp()
         throws IOException
     {
+        closeIterators();
+
         for ( Object resource : resources )
         {
             if ( resource instanceof PlexusIoProxyResourceCollection )
             {
                 resource = ( (PlexusIoProxyResourceCollection) resource ).getSrc();
             }
-            if ( resource instanceof Closeable )
-            {
-                ( (Closeable) resource ).close();
-            }
+
+            closeIfCloseable( resource );
         }
         resources.clear();
     }
 
+
     protected abstract void execute()
         throws ArchiverException, IOException;
 

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

@@ -217,16 +217,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/Archiver.java

@@ -22,6 +22,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
@@ -177,6 +178,25 @@ void addArchivedFileSet( @Nonnull File archiveFile, String prefix, String[] incl
     void addArchivedFileSet( ArchivedFileSet fileSet )
         throws ArchiverException;
 
+
+    /**
+     * Adds the given archive file set to the archive. This method is basically obsoleting
+     * {@link #addArchivedFileSet(File)}, {@link #addArchivedFileSet(File, String[], String[])}, and
+     * {@link #addArchivedFileSet(File, String, String[], String[])}. However, as these methods are in widespread use,
+     * they cannot easily be made deprecated.
+     *
+     * @param charset the encoding to use, particularly useful to specific non-standard filename encodings
+     *                 for some kinds of archives (for instance zip files)
+     *
+     * Stream transformers are supported on this method
+     *
+     * @param fileSet the fileSet to add
+     * @param charset
+     * @since 1.0-alpha-9
+     */
+    void addArchivedFileSet( ArchivedFileSet fileSet, Charset charset )
+        throws ArchiverException;
+
     /**
      * Adds the given resource collection to the archive.
      *