From 401cd73c5f568ce0eb2fb3b7b1346f4396fd7a25 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 7 Mar 2024 15:05:55 +0100 Subject: [PATCH] Force removal of require bundle --- src/org/argeo/build/Repackage.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java index 60b15f0..0daf3c4 100644 --- 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 @@ -1027,9 +1030,11 @@ 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(); - if (!doNotModify) - manifest.getMainAttributes().remove("Require-Bundle"); String rawSourceSymbolicName = manifest.getMainAttributes().getValue(BUNDLE_SYMBOLICNAME.toString()); if (rawSourceSymbolicName != null) { -- 2.30.2