Force require bundle removal

[cc0/argeo-build.git] / src / org / argeo / build / Repackage.java

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 0daf3c401add6e94ed9c3a50c59528a1008900d0..d274cedb7168b2fdf8c2f9d6234e67de558c1519 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1030,10 +1030,6 @@ public class Repackage {
                        sourceManifest = jarIn.getManifest();
                        if (sourceManifest == null)
                                logger.log(WARNING, file + " has no manifest");
-                       else {
-                               if (!doNotModify)
-                                       sourceManifest.getMainAttributes().remove(REQUIRE_BUNDLE.toString());
-                       }
                        manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest();
 
                        String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString());
@@ -1217,6 +1213,10 @@ public class Repackage {
                                        manifest.getMainAttributes().remove(key);
                                        origin.deleted.add("MANIFEST header " + key);
                                }
+                       if (key.equals(REQUIRE_BUNDLE.toString())) {
+                               manifest.getMainAttributes().remove(key);
+                               origin.deleted.add("MANIFEST header " + key);
+                       }
                }
 
                // de-pollute MANIFEST
@@ -1230,6 +1230,7 @@ public class Repackage {
                        case "Originally-Created-By":
                        case "Tool":
                        case "Bnd-LastModified":
+                       case "Require-Bundle":
                                manifestEntries.remove();
                                origin.deleted.add("MANIFEST header " + manifestEntry.getKey());
                                break;