Generate JPMS module-info

diff --git a/argeo.bnd b/argeo.bnd
index 9ab4015cd38bab02a243b3a5e1de50e227e49c39..63fc653bc27dad15324fdfe5a6f90f2601707bb5 100644 (file)
--- a/argeo.bnd
+++ b/argeo.bnd
@@ -5,4 +5,5 @@ Bundle-RequiredExecutionEnvironment=JavaSE-17
 #-consumer-policy : ${range;[==,=+)}
 -contract: !JavaServlet,*
 -removeheaders = Bnd-LastModified,Build-Jdk,Built-By,Tool,Created-By
-Automatic-Module-Name: ${bsn}
\ No newline at end of file
+Automatic-Module-Name: ${bsn}
+-jpms-module-info:

diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java
index a8341fb970458d278c4a834a4e33535366e5d345..b1d96e2ee9c710d9d86d69f4645722d8c872a5a7 100644 (file)
--- a/src/org/argeo/build/Make.java
+++ b/src/org/argeo/build/Make.java
@@ -513,11 +513,11 @@ public class Make {
 
                // Write module-info.class
                if (moduleInfoClass != null) {
-                       Path moduleInfoClassP = compiled.resolve("module-info.class");
+                       Path moduleInfoClassP = binP.resolve("module-info.class");
                        Files.createDirectories(moduleInfoClassP.getParent());
                        try (OutputStream out = Files.newOutputStream(moduleInfoClassP)) {
                                moduleInfoClass.write(out);
-                               logger.log(INFO, "Wrote " + moduleInfoClassP);
+//                             logger.log(INFO, "Wrote " + moduleInfoClassP);
                        } catch (Exception e) {
                                throw new RuntimeException("Cannot write module-info.class");
                        }