o Reformatted and updated to stop leaking file descriptors.

o Updated to stop creating 'BufferedInputStream' and 'BufferedOutputStream'
  when buffering is already taking place.
o Updated to add missing '@deprecated' annotions and Javadoc tags.

Author: ChristianSchulte

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

@@ -113,6 +113,7 @@ public String getName()
      *             by files, but by instances of {@link PlexusIoResource}.
      *             Consequently, you should use {@link #getInputStream()}-
      */
+    @Deprecated
     public File getFile()
     {
         if ( resource instanceof PlexusIoFileResource )

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

@@ -78,6 +78,7 @@ void createArchive()
      * Obsolete, use {@link #addFileSet(FileSet)}.
      * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
+     * @deprecated  Will go away in next major version
      */
     @Deprecated
     void addDirectory( @Nonnull File directory )
@@ -87,6 +88,7 @@ void addDirectory( @Nonnull File directory )
      * Obsolete, use {@link #addFileSet(FileSet)}.
      * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
+     * @deprecated  Will go away in next major version
      */
     @Deprecated
     void addDirectory( @Nonnull File directory, String prefix )
@@ -95,6 +97,7 @@ void addDirectory( @Nonnull File directory, String prefix )
     /**
      * Obsolete, use {@link #addFileSet(FileSet)}.You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
+     * @deprecated  Will go away in next major version
      */
     @Deprecated
     void addDirectory( @Nonnull File directory, String[] includes, String[] excludes )
@@ -104,7 +107,9 @@ void addDirectory( @Nonnull File directory, String[] includes, String[] excludes
      * Obsolete, use {@link #addFileSet(FileSet)}.
      * You can use "inline" of this method in your
      * IDE to get the proper implementation for this release.
+     * @deprecated  Will go away in next major version
      */
+    @Deprecated
     void addDirectory( @Nonnull File directory, String prefix, String[] includes, String[] excludes )
         throws ArchiverException;
 
@@ -154,6 +159,7 @@ void addArchivedFileSet( @Nonnull File archiveFile, String prefix )
      * IDE to get the proper implementation for this release.
      * @deprecated  Will go away in next major version
      */
+    @Deprecated
     void addArchivedFileSet( File archiveFile, String[] includes, String[] excludes )
         throws ArchiverException;
 
@@ -162,6 +168,7 @@ void addArchivedFileSet( File archiveFile, String[] includes, String[] excludes
      * IDE to get the proper implementation for this release.
      * @deprecated  Will go away in next major version
      */
+    @Deprecated
     void addArchivedFileSet( @Nonnull File archiveFile, String prefix, String[] includes, String[] excludes )
         throws ArchiverException;
 

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

@@ -1,6 +1,7 @@
 package org.codehaus.plexus.archiver;
 
 import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.io.File;
@@ -10,9 +11,8 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
- * An @{link ArchiveFinalizer} that process dot files with archiver directives
+ * An {@link ArchiveFinalizer} that process dot files with archiver directives
  * contained within. This basically means you can communicate archive creation
  * instructions between processes using dot files.
  *
@@ -21,6 +21,7 @@
 public class DotDirectiveArchiveFinalizer
     extends AbstractArchiveFinalizer
 {
+
     private static final String DEFAULT_DOT_FILE_PREFIX = ".plxarc";
 
     private final File dotFileDirectory;
@@ -42,51 +43,63 @@ public DotDirectiveArchiveFinalizer( File dotFileDirectory, String dotFilePrefix
     public void finalizeArchiveCreation( Archiver archiver )
         throws ArchiverException
     {
+        BufferedReader in = null;
         try
         {
             List dotFiles = FileUtils.getFiles( dotFileDirectory, dotFilePrefix + "*", null );
 
-			for (Object dotFile1 : dotFiles) {
-				File dotFile = (File) dotFile1;
-
-				BufferedReader in = new BufferedReader(new FileReader(dotFile));
-
-				String line;
+            for ( Object dotFile1 : dotFiles )
+            {
+                File dotFile = (File) dotFile1;
 
-				while ((line = in.readLine()) != null) {
-					String[] s = StringUtils.split(line, ":");
+                in = new BufferedReader( new FileReader( dotFile ) );
 
-					if (s.length == 1) {
-						File directory = new File(dotFileDirectory, s[0]);
+                for ( String line = in.readLine(); line != null; line = in.readLine() )
+                {
+                    String[] s = StringUtils.split( line, ":" );
 
-						System.out.println("adding directory = " + directory);
+                    if ( s.length == 1 )
+                    {
+                        File directory = new File( dotFileDirectory, s[0] );
 
-						archiver.addDirectory(directory);
-					} else {
-						File directory = new File(dotFileDirectory, s[0]);
+                        System.out.println( "adding directory = " + directory );
 
-						System.out.println("adding directory = " + directory + " to: " + s[1]);
+                        archiver.addDirectory( directory );
+                    }
+                    else
+                    {
+                        File directory = new File( dotFileDirectory, s[0] );
 
-						if (s[1].endsWith("/")) {
-							archiver.addDirectory(directory, s[1]);
-						} else {
-							archiver.addDirectory(directory, s[1] + "/");
-						}
-					}
-				}
+                        System.out.println( "adding directory = " + directory + " to: " + s[1] );
 
-				in.close();
-			}
+                        if ( s[1].endsWith( "/" ) )
+                        {
+                            archiver.addDirectory( directory, s[1] );
+                        }
+                        else
+                        {
+                            archiver.addDirectory( directory, s[1] + "/" );
+                        }
+                    }
+                }
 
+                in.close();
+                in = null;
+            }
         }
         catch ( IOException e )
         {
             throw new ArchiverException( "Error processing dot files.", e );
         }
+        finally
+        {
+            IOUtil.close( in );
+        }
     }
 
     public List getVirtualFiles()
     {
         return Collections.EMPTY_LIST;
     }
+
 }

src/main/java/org/codehaus/plexus/archiver/tar/GZipTarFile.java

@@ -25,15 +25,6 @@ public GZipTarFile( File file )
     protected InputStream getInputStream( File file )
         throws IOException
     {
-        final InputStream inputStream = super.getInputStream( file );
-        return Streams.bufferedInputStream( new GZIPInputStream( inputStream )
-        {
-            public void close()
-                throws IOException
-            {
-                super.close();
-                inputStream.close();
-            }
-        } );
+        return Streams.bufferedInputStream( new GZIPInputStream( super.getInputStream( file ) ) );
     }
 }

src/main/java/org/codehaus/plexus/archiver/util/FilterSupport.java

@@ -12,6 +12,7 @@
 /**
  * @deprecated Use {@link FileSelector} and {@link Archiver#addFileSet}.
  */
+@Deprecated
 public class FilterSupport
 {
 

src/main/java/org/codehaus/plexus/archiver/util/Streams.java

@@ -35,12 +35,18 @@ public class Streams
 
     public static BufferedInputStream bufferedInputStream( InputStream is )
     {
-        return new BufferedInputStream( is, 65536 );
+        return is instanceof BufferedInputStream
+                   ? (BufferedInputStream) is
+                   : new BufferedInputStream( is, 65536 );
+
     }
 
     public static BufferedOutputStream bufferedOutputStream( OutputStream os )
     {
-        return new BufferedOutputStream( os, 65536 );
+        return os instanceof BufferedOutputStream
+                   ? (BufferedOutputStream) os
+                   : new BufferedOutputStream( os, 65536 );
+
     }
 
     public static byte[] cacheBuffer()