Hiya, you gonna put some site bits in here? I'm still really curious
what this puppy does...
--jason
On Jul 19, 2007, at 6:24 PM, [EMAIL PROTECTED] wrote:
Revision
4601
Author
jvanzyl
Date
2007-07-19 20:24:08 -0500 (Thu, 19 Jul 2007)
Log Message
o update the POM, not sure how it went back to 8-SNAPSHOT as 8 is
already released o warn on duplicates, don't die, any dupes are
being pulled down further and can, in most cases, be ignored
Modified Paths
trunk/mojo/mojo-sandbox/shade-maven-plugin/pom.xml
trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/org/
codehaus/mojo/shade/DefaultShader.java
trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/org/
codehaus/mojo/shade/mojo/ShadeMojo.java
Diff
Modified: trunk/mojo/mojo-sandbox/shade-maven-plugin/pom.xml (4600
=> 4601)
--- trunk/mojo/mojo-sandbox/shade-maven-plugin/pom.xml 2007-07-20
00:44:28 UTC (rev 4600)
+++ trunk/mojo/mojo-sandbox/shade-maven-plugin/pom.xml 2007-07-20
01:24:08 UTC (rev 4601)
@@ -7,7 +7,7 @@
</parent>
<artifactId>shade-maven-plugin</artifactId>
<packaging>maven-plugin</packaging>
- <version>1.0-alpha-8-SNAPSHOT</version>
+ <version>1.0-alpha-9-SNAPSHOT</version>
<name>shade-maven-plugin</name>
<dependencies>
<dependency>
Modified: trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/
org/codehaus/mojo/shade/DefaultShader.java (4600 => 4601)
--- trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/org/
codehaus/mojo/shade/DefaultShader.java 2007-07-20 00:44:28 UTC (rev
4600)
+++ trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/org/
codehaus/mojo/shade/DefaultShader.java 2007-07-20 01:24:08 UTC (rev
4601)
@@ -2,6 +2,7 @@
import org.codehaus.mojo.shade.relocation.Relocator;
import org.codehaus.mojo.shade.resource.ResourceTransformer;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.util.IOUtil;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
@@ -14,19 +15,23 @@
import java.io.IOException;
import java.io.InputStream;
import java.util.Enumeration;
+import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
+import java.util.zip.ZipException;
/**
* @author Jason van Zyl
* @plexus.component
*/
public class DefaultShader
+ extends AbstractLogEnabled
implements Shader
{
public void shade( Set jars,
@@ -76,10 +81,17 @@
// Need to take the .class off for
remapping evaluation
String newName = remapper.map
( name.substring( 0, name.indexOf( '.' ) ) );
- // Now we put it back on so the class file
is written out with the right extension.
- jos.putNextEntry( new JarEntry( newName +
".class" ) );
+ try
+ {
+ // Now we put it back on so the class
file is written out with the right extension.
+ jos.putNextEntry( new JarEntry
( newName + ".class" ) );
- IOUtil.copy( renamedClass, jos );
+ IOUtil.copy( renamedClass, jos );
+ }
+ catch ( ZipException e )
+ {
+ getLogger().warn( "We have a duplicate
" + newName + " in " + jar );
+ }
}
else
{
Modified: trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/
org/codehaus/mojo/shade/mojo/ShadeMojo.java (4600 => 4601)
--- trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/org/
codehaus/mojo/shade/mojo/ShadeMojo.java 2007-07-20 00:44:28 UTC
(rev 4600)
+++ trunk/mojo/mojo-sandbox/shade-maven-plugin/src/main/java/org/
codehaus/mojo/shade/mojo/ShadeMojo.java 2007-07-20 01:24:08 UTC
(rev 4601)
@@ -124,7 +124,7 @@
continue;
}
- getLog().debug( "Including " + artifact.getId() + " in
the shaded jar." );
+ getLog().info( "Including " + artifact.getId() + " in
the shaded jar." );
artifacts.add( artifact.getFile() );
To unsubscribe from this list please visit:
http://xircles.codehaus.org/manage_email
