You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2008/02/23 20:22:30 UTC
svn commit: r630511 -
/maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.java
Author: hboutemy
Date: Sat Feb 23 11:22:29 2008
New Revision: 630511
URL: http://svn.apache.org/viewvc?rev=630511&view=rev
Log:
[MSHADE-16] include in the shaded jar the manifest from the original jar, not from the first dependency having a manifest
Modified:
maven/plugins/trunk/maven-shade-plugin/src/main/java/org/apache/maven/plugins/shade/DefaultShader.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=630511&r1=630510&r2=630511&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 Sat Feb 23 11:22:29 2008
@@ -82,7 +82,17 @@
//later
continue;
}
-
+
+ if ( "META-INF/MANIFEST.MF".equals( name ) )
+ {
+ // Ignore MANIFEST for jars except the last one, which is
+ // the project artifact. Ideally, we could create a new one later
+ if ( i.hasNext() )
+ {
+ continue;
+ }
+ }
+
String mappedName = remapper.map( name );
InputStream is = jarFile.getInputStream( entry );