Author: mcculls
Date: Wed Jan 9 06:46:29 2008
New Revision: 610401
URL: http://svn.apache.org/viewvc?rev=610401&view=rev
Log:
FELIX-442: reverse manifest merge for projects with customized manifests, such
as commons
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Modified:
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
URL:
http://svn.apache.org/viewvc/felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java?rev=610401&r1=610400&r2=610401&view=diff
==============================================================================
---
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
(original)
+++
felix/trunk/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
Wed Jan 9 06:46:29 2008
@@ -330,16 +330,15 @@
Manifest mavenManifest = new Manifest();
mavenManifest.read( new StringInputStream( mavenManifestText )
);
- Manifest bundleManifest = jar.getManifest();
/*
* Overlay customized Maven manifest with the generated bundle
manifest
*/
- mavenManifest.getMainAttributes().putAll(
bundleManifest.getMainAttributes() );
- mavenManifest.getMainAttributes().putValue( "Created-By",
"Apache Maven Bundle Plugin" );
- mavenManifest.getEntries().putAll( bundleManifest.getEntries()
);
-
- jar.setManifest( mavenManifest );
+ Manifest bundleManifest = jar.getManifest();
+ bundleManifest.getMainAttributes().putAll(
mavenManifest.getMainAttributes() );
+ bundleManifest.getMainAttributes().putValue( "Created-By",
"Apache Maven Bundle Plugin" );
+ bundleManifest.getEntries().putAll( mavenManifest.getEntries()
);
+ jar.setManifest( bundleManifest );
}
catch (Exception e)
{
