Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[export] JPMS module info calculation fails #5258

Merged
merged 1 commit into from May 23, 2022
Merged

[export] JPMS module info calculation fails #5258

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 18 additions & 13 deletions biz.aQute.launcher/src/aQute/launcher/plugin/ProjectLauncherImpl.java
View file
Open in desktop
Expand Up @@ -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;
Expand Down