You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/08/29 16:20:57 UTC
svn commit: r690269 - in
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade:
DefaultShader.java resource/ManifestResourceTransformer.java
Author: jvanzyl
Date: Fri Aug 29 07:20:56 2008
New Revision: 690269
URL: http://svn.apache.org/viewvc?rev=690269&view=rev
Log:
o catch another place where a duplicate class attempting to be written can throw an exception, I want to see the actual JAR that caused the problem.
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java?rev=690269&r1=690268&r2=690269&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java Fri Aug 29 07:20:56 2008
@@ -180,10 +180,17 @@
throws IOException
{
if ( !remapper.hasRelocators() )
- {
- jos.putNextEntry( new JarEntry( name ) );
-
- IOUtil.copy( is, jos );
+ {
+ try
+ {
+ jos.putNextEntry( new JarEntry( name ) );
+ IOUtil.copy( is, jos );
+ }
+ catch ( ZipException e )
+ {
+ getLogger().warn( "We have a duplicate " + name + " in " + jar );
+ }
+
return;
}
Modified: maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java?rev=690269&r1=690268&r2=690269&view=diff
==============================================================================
--- maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java (original)
+++ maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/resource/ManifestResourceTransformer.java Fri Aug 29 07:20:56 2008
@@ -104,8 +104,8 @@
attributes.put( new Attributes.Name( key ), manifestEntries.get( key ) );
}
}
-
+
jos.putNextEntry( new JarEntry( MANIFEST_PATH ) );
- manifest.write( jos );
+ manifest.write( jos );
}
}