Merge pull request #5258 from pkriens/master

[export] JPMS module info calculation fails
bndtools · May 23, 2022 · ebe59ed · ebe59ed
2 parents 7947fde + 92ede60
commit ebe59ed
Showing 1 changed file with 18 additions and 13 deletions.
diff --git a/biz.aQute.launcher/src/aQute/launcher/plugin/ProjectLauncherImpl.java b/biz.aQute.launcher/src/aQute/launcher/plugin/ProjectLauncherImpl.java
@@ -357,19 +357,24 @@ public Jar executable() throws Exception {
 				}
 			}
 
-			List<String> bcpList = new ArrayList<>();
-			bcpList.add(".");
-			bcpList.addAll(classpath);
-			bcpList.addAll(actualPaths);
-
-			builder.setProperty(BUNDLE_CLASSPATH, bcpList.stream()
-				.collect(joining(",")));
-			builder.setProperty(EXPORT_CONTENTS, "aQute.launcher.pre");
-
-			// Ignore common warnings resulting from the Bundle-ClassPath which
-			// are irrelevant in this use case
-			builder.setProperty(FIXUPMESSAGES,
-				"Classes found in the wrong directory, private references, Export-Package duplicate package name, Invalid package name: * in Export-Package");
+			String moduleProperty = builder.getProperty(JPMS_MODULE_INFO);
+			if (moduleProperty != null) {
+
+				List<String> bcpList = new ArrayList<>();
+				bcpList.add(".");
+				bcpList.addAll(classpath);
+				bcpList.addAll(actualPaths);
+
+				builder.setProperty(BUNDLE_CLASSPATH, bcpList.stream()
+					.collect(joining(",")));
+				builder.setProperty(EXPORT_CONTENTS, "aQute.launcher.pre");
+
+				// Ignore common warnings resulting from the Bundle-ClassPath
+				// which
+				// are irrelevant in this use case
+				builder.setProperty(FIXUPMESSAGES,
+					"Classes found in the wrong directory, private references, Export-Package duplicate package name, Invalid package name: * in Export-Package");
+			}
 
 			LauncherConstants lc = getConstants(actualPaths, true);
 			lc.embedded = true;