commit 15d994e84fa8763a6132e271d5d8c67f80445a55
author Stuart McCulloch <mcculls@apache.org> Wed Jan 09 14:46:29 2008 +0000
committer Stuart McCulloch <mcculls@apache.org> Wed Jan 09 14:46:29 2008 +0000
tree e6991a4a85e0d5f8221dc9d5d76fc69ae8c1521e
parent c56f79f9273b706dec00bf296c73df5d3ce67504

FELIX-442: reverse manifest merge for projects with customized manifests, such as commons

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@610401 13f79535-47bb-0310-9956-ffa450edef68

bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java

diff --git a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
index b187c40..14fb93a 100644
--- a/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
+++ b/bundleplugin/src/main/java/org/apache/felix/bundleplugin/BundlePlugin.java
@@ -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)
             {