X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=d0216748777e5f30c06359512f30ad9cfb1e6ca4;hb=76ebab1b58a74c696cd696ce0be65c2204ebbc60;hp=2111b49c67ce638f72c0fe90ac772dda4338b1cd;hpb=599e11e1c9c6b8b46b461edb98d5e47ecdad74aa;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 2111b49..d021674 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -23,7 +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.REQUIRE_BUNDLE;
 import static org.argeo.build.Repackage.ManifestHeader.SPDX_LICENSE_IDENTIFIER;
 
 import java.io.BufferedWriter;
@@ -149,10 +149,10 @@ 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"), //
+//		/** OSGi required bundles. */
+//		REQUIRE_BUNDLE("Require-Bundle"), //
+//		/** OSGi path to embedded jar. */
+//		BUNDLE_CLASSPATH("Bundle-Classpath"), //
 		// Java
 		/** Java module name. */
 		AUTOMATIC_MODULE_NAME("Automatic-Module-Name"), //
@@ -1213,17 +1213,17 @@ 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
 		for (Iterator<Map.Entry<Object, Object>> manifestEntries = manifest.getMainAttributes().entrySet()
 				.iterator(); manifestEntries.hasNext();) {
 			Map.Entry<Object, Object> manifestEntry = manifestEntries.next();
-			switch (manifestEntry.getKey().toString()) {
+			String key = manifestEntry.getKey().toString();
+			// TODO make it more generic
+//			if (key.equals(REQUIRE_BUNDLE.toString()) && nameVersion.getName().equals("com.sun.jna.platform"))
+//				manifestEntries.remove();
+			switch (key) {
 			case "Archiver-Version":
 			case "Build-By":
 			case "Created-By":