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 60b15f007dbbf2777b73e7d15d859453a08e06f3..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
@@ -1028,8 +1031,6 @@ public class Repackage {
                        if (sourceManifest == null)
                                logger.log(WARNING, file + " has no manifest");
                        manifest = sourceManifest != null ? new Manifest(sourceManifest) : new Manifest();
-                       if (!doNotModify)
-                               manifest.getMainAttributes().remove("Require-Bundle");
 
                        String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString());
                        if (rawSourceSymbolicName != null) {
@@ -1212,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
@@ -1225,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;