From c5ce5217b5433d7470628c1ccb90141a028d3378 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 12 Apr 2024 13:59:49 +0200 Subject: [PATCH] Make sure there is at least Automatic-Module-Name --- src/org/argeo/build/Repackage.java | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) 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)"); -- 2.30.2