From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 12 Apr 2024 11:59:49 +0000 (+0200)
Subject: Make sure there is at least Automatic-Module-Name
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=refs%2Fheads%2Funstable;p=cc0%2Fargeo-build.git

Make sure there is at least Automatic-Module-Name
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index e379a59..02158ad 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -1082,8 +1082,7 @@ public class Repackage {
 			}
 
 			// force Java 9 module name
-			if (!keepModuleInfo)
-				entries.put(ManifestHeader.AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName());
+			entries.put(AUTOMATIC_MODULE_NAME.toString(), nameVersion.getName());
 
 			boolean isNative = false;
 			String os = null;
@@ -1106,9 +1105,13 @@ public class Repackage {
 						origin.deleted.add("cryptographic signatures");
 						continue entries;
 					}
-					if (entry.getName().endsWith("module-info.class") && !keepModuleInfo) { // skip Java 9 module info
-						origin.deleted.add("Java module information (module-info.class)");
-						continue entries;
+					if (entry.getName().endsWith("module-info.class")) { // skip Java 9 module info
+						if (keepModuleInfo) {
+							entries.remove(AUTOMATIC_MODULE_NAME.toString());
+						} else {
+							origin.deleted.add("Java module information (module-info.class)");
+							continue entries;
+						}
 					}
 					if (entry.getName().startsWith("META-INF/versions/")) { // skip multi-version
 						origin.deleted.add("additional Java versions (META-INF/versions)");