X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=src%2Forg%2Fargeo%2Fbuild%2FRepackage.java;h=d0216748777e5f30c06359512f30ad9cfb1e6ca4;hb=3473c4ec64851e97b6d0bb29fe41370c13af7b27;hp=0daf3c401add6e94ed9c3a50c59528a1008900d0;hpb=401cd73c5f568ce0eb2fb3b7b1346f4396fd7a25;p=cc0%2Fargeo-build.git

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 0daf3c4..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"), //
@@ -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());
@@ -1223,7 +1219,11 @@ public class Repackage {
 		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":