File tree Expand file tree Collapse file tree 2 files changed +4
-10
lines changed
src/main/java/io/github/fvarrui/javapackager Expand file tree Collapse file tree 2 files changed +4
-10
lines changed Original file line number Diff line number Diff line change @@ -53,12 +53,9 @@ public File apply(Packager packager) throws Exception {
5353 l4jTask .setMainClassName (mainClass );
5454 l4jTask .setClasspath (new HashSet <>(windowsPackager .getClasspaths ()));
5555 l4jTask .setChdir (useResourcesAsWorkingDir ? "." : "" );
56- if (bundleJre ) {
57- l4jTask .setBundledJrePath (jreDirectoryName );
58- } else if (!StringUtils .isBlank (jreMinVersion )) {
56+ l4jTask .setBundledJrePath ( bundleJre ? jreDirectoryName : "%JAVA_HOME%" );
57+ if (!StringUtils .isBlank (jreMinVersion )) {
5958 l4jTask .setJreMinVersion (jreMinVersion );
60- } else {
61- l4jTask .setBundledJrePath ("%JAVA_HOME%" );
6259 }
6360 l4jTask .getJvmOptions ().addAll (vmArgs );
6461 l4jTask .setVersion (winConfig .getProductVersion ());
Original file line number Diff line number Diff line change @@ -56,12 +56,9 @@ public File apply(Packager packager) {
5656
5757 List <Element > jreElements = new ArrayList <>();
5858 jreElements .add (element ("opts" , optsElements .toArray (new Element [optsElements .size ()])));
59- if (bundleJre ) {
60- jreElements .add (element ("path" , jreDirectoryName ));
61- } else if (!StringUtils .isBlank (jreMinVersion )) {
59+ jreElements .add (element ("path" , bundleJre ? jreDirectoryName : "%JAVA_HOME%" ));
60+ if (!StringUtils .isBlank (jreMinVersion )) {
6261 jreElements .add (element ("minVersion" , jreMinVersion ));
63- } else {
64- jreElements .add (element ("path" , "%JAVA_HOME%" ));
6562 }
6663
6764 List <Element > pluginConfig = new ArrayList <>();
You can’t perform that action at this time.
0 commit comments