Author: jdcasey
Date: Fri Jun 22 14:43:14 2007
New Revision: 549963
URL: http://svn.apache.org/viewvc?view=rev&rev=549963
Log:
[MASSEMBLY-121] Applying fix from Paul Gier.
Modified:
maven/plugins/trunk/maven-assembly-plugin/pom.xml
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
Modified: maven/plugins/trunk/maven-assembly-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/pom.xml?view=diff&rev=549963&r1=549962&r2=549963
==============================================================================
--- maven/plugins/trunk/maven-assembly-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-assembly-plugin/pom.xml Fri Jun 22 14:43:14 2007
@@ -249,9 +249,6 @@
<pomExcludes>
<pomExclude>**/child*/pom.xml</pomExclude>
<pomExclude>**/module*/pom.xml</pomExclude>
-
- <!-- TODO: Fix this! It's logged in JIRA for 2.2. -->
-
<pomExclude>mojo-configuration/manifest-with-customEntry/pom.xml</pomExclude>
<pomExclude>repository-assembly/pom.xml</pomExclude>
</pomExcludes>
<postBuildHookScript>verify.bsh</postBuildHookScript>
Modified:
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java?view=diff&rev=549963&r1=549962&r2=549963
==============================================================================
---
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
(original)
+++
maven/plugins/trunk/maven-assembly-plugin/src/main/java/org/apache/maven/plugin/assembly/archive/ManifestCreationFinalizer.java
Fri Jun 22 14:43:14 2007
@@ -72,7 +72,7 @@
}
else
{
- manifest = mavenArchiver.getManifest( project,
archiveConfiguration.getManifest() );
+ manifest = mavenArchiver.getManifest( project,
archiveConfiguration );
}
if ( manifest != null && ( archiver instanceof JarArchiver ) )
