From 76ebab1b58a74c696cd696ce0be65c2204ebbc60 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 12 Apr 2024 13:10:42 +0200 Subject: [PATCH] Generate JPMS module-info --- src/org/argeo/build/Make.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/argeo/build/Make.java b/src/org/argeo/build/Make.java index 05f95b3..a8341fb 100644 --- a/src/org/argeo/build/Make.java +++ b/src/org/argeo/build/Make.java @@ -494,7 +494,7 @@ public class Make { jar.setManifest(manifest); JPMSModuleInfoPlugin jpmsModuleInfoPlugin = new JPMSModuleInfoPlugin(); jpmsModuleInfoPlugin.verify(bndAnalyzer); - moduleInfoClass = jar.getResource("module-info.class"); + moduleInfoClass = bndAnalyzer.getJar().getResource("module-info.class"); } catch (Exception e) { throw new RuntimeException("Bnd analysis of " + compiled + " failed", e); } @@ -517,6 +517,7 @@ public class Make { Files.createDirectories(moduleInfoClassP.getParent()); try (OutputStream out = Files.newOutputStream(moduleInfoClassP)) { moduleInfoClass.write(out); + logger.log(INFO, "Wrote " + moduleInfoClassP); } catch (Exception e) { throw new RuntimeException("Cannot write module-info.class"); } -- 2.30.2