--- a/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java Tue Jul 02 12:03:49 2019 -0400
+++ b/src/jdk.jpackage/share/classes/jdk/jpackage/internal/DeployParams.java Wed Jul 03 17:36:06 2019 -0400
@@ -112,12 +112,20 @@
baseDir, new LinkedHashSet<>(expandFileset(file))));
}
- void setClasspath() {
- String classpath = "";
+ void setClasspath(String mainJarPath) {
+ String classpath;
+ // we want main jar first on the classpath
+ if (mainJarPath != null) {
+ classpath = mainJarPath + File.pathSeparator;
+ } else {
+ classpath = "";
+ }
for (RelativeFileSet resource : resources) {
for (String file : resource.getIncludedFiles()) {
if (file.endsWith(".jar")) {
- classpath += file + File.pathSeparator;
+ if (!file.equals(mainJarPath)) {
+ classpath += file + File.pathSeparator;
+ }
}
}
}