svn commit: r983217 - in /maven/plugins/trunk/maven-shade-plugin/src: it/mini-jar/invoker.properties main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

[be...@apache.org]

Author: bentmann
Date: Sat Aug  7 11:53:59 2010
New Revision: 983217

URL: http://svn.apache.org/viewvc?rev=983217&view=rev
Log:
[MSHADE-84] added support for minijar'ing

o Polished code

Added:
    maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties   (with props)
Modified:
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
    maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java

Added: maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties?rev=983217&view=auto
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties (added)
+++ maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties Sat Aug  7 11:53:59 2010
@@ -0,0 +1 @@
+invoker.java.version = 1.5+

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/plugins/trunk/maven-shade-plugin/src/it/mini-jar/invoker.properties
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java?rev=983217&r1=983216&r2=983217&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/filter/MinijarFilter.java Sat Aug  7 11:53:59 2010
@@ -29,6 +29,7 @@ import java.util.Set;
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.plugin.logging.Log;
 import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.IOUtil;
 import org.vafer.jdependency.Clazz;
 import org.vafer.jdependency.Clazzpath;
 import org.vafer.jdependency.ClazzpathUnit;
@@ -73,8 +74,7 @@ public class MinijarFilter
             }
             finally
             {
-                if ( is != null )
-                    is.close();
+                IOUtil.close( is );
             }
         }
 
@@ -95,7 +95,7 @@ public class MinijarFilter
 
         if ( removable.contains( clazz ) )
         {
-            log.info( "Removing " + className );
+            log.debug( "Removing " + className );
             classes_removed += 1;
             return true;
         }
@@ -107,7 +107,7 @@ public class MinijarFilter
     public void finished()
     {
         int classes_total = classes_removed + classes_kept;
-        log.info( "Minimized " + classes_total + " -> " + classes_kept + "("
+        log.info( "Minimized " + classes_total + " -> " + classes_kept + " ("
             + (int) ( 100 * classes_kept / classes_total ) + "%)" );
     }
 }

Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java?rev=983217&r1=983216&r2=983217&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/mojo/ShadeMojo.java Sat Aug  7 11:53:59 2010
@@ -333,10 +333,11 @@ public class ShadeMojo
     private boolean createSourcesJar;
 
     /**
-     * When true, dependencies will be stripped down on the class level
-     * to only the transitive hull required for the artifact.
-     *
+     * When true, dependencies will be stripped down on the class level to only the transitive hull required for the
+     * artifact. <em>Note:</em> Usage of this feature requires Java 1.5 or higher.
+     * 
      * @parameter default-value="false"
+     * @since 1.4
      */
     private boolean minimizeJar;