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 26d37348bbcb5d5d844a2332da1a61f3e707506c..d274cedb7168b2fdf8c2f9d6234e67de558c1519 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -23,6 +23,7 @@ import static org.argeo.build.Repackage.ManifestHeader.BUNDLE_VERSION;
 import static org.argeo.build.Repackage.ManifestHeader.ECLIPSE_SOURCE_BUNDLE;
 import static org.argeo.build.Repackage.ManifestHeader.EXPORT_PACKAGE;
 import static org.argeo.build.Repackage.ManifestHeader.IMPORT_PACKAGE;
+import static org.argeo.build.Repackage.ManifestHeader.REQUIRE_BUNDLE;
 import static org.argeo.build.Repackage.ManifestHeader.SPDX_LICENSE_IDENTIFIER;
 
 import java.io.BufferedWriter;
@@ -148,6 +149,8 @@ public class Repackage {
                EXPORT_PACKAGE("Export-Package"), //
                /** OSGi imported packages list. */
                IMPORT_PACKAGE("Import-Package"), //
+               /** OSGi required bundles. */
+               REQUIRE_BUNDLE("Require-Bundle"), //
                /** OSGi path to embedded jar. */
                BUNDLE_CLASSPATH("Bundle-Classpath"), //
                // Java
@@ -725,7 +728,6 @@ public class Repackage {
                                                case "Tool":
                                                case "Bnd-LastModified":
                                                case "Created-By":
-                                               case "Require-Bundle":
                                                        continue keys;
                                                }
                                                if ("Require-Capability".equals(key.toString())
@@ -1211,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
@@ -1224,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;