Fix bad merge

Author: alexeysemenyukoracle

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacBaseInstallerBundler.java

@@ -60,6 +60,7 @@ public MacBaseInstallerBundler() {
     protected void validateAppImageAndBundeler(
             Map<String, ? super Object> params) throws ConfigException {
         if (PREDEFINED_APP_IMAGE.fetchFrom(params) != null) {
+            Path applicationImage = PREDEFINED_APP_IMAGE.fetchFrom(params);
             if (new MacAppImageFileExtras(PREDEFINED_APP_IMAGE_FILE.fetchFrom(params)).signed()) {
                 var appLayout = ApplicationLayoutUtils.PLATFORM_APPLICATION_LAYOUT.resolveAt(applicationImage);
                 if (!Files.exists(

src/jdk.jpackage/share/classes/jdk/jpackage/internal/StandardBundlerParam.java

@@ -261,8 +261,8 @@ final class StandardBundlerParam {
                     (s, p) -> s
             );
 
-    public static final StandardBundlerParam<String> LICENSE_FILE =
-            new StandardBundlerParam<>(
+    public static final BundlerParamInfo<String> LICENSE_FILE =
+            new BundlerParamInfo<>(
                     Arguments.CLIOptions.LICENSE_FILE.getId(),
                     String.class,
                     params -> null,

test/jdk/tools/jpackage/helpers/jdk/jpackage/test/MacHelper.java

@@ -336,10 +336,11 @@ private static String getPackageId(JPackageCommand cmd) {
                 return JavaAppDesc.parse(className).packageName();
             });
         });
+    }
+
     public static boolean isXcodeDevToolsInstalled() {
         return Inner.XCODE_DEV_TOOLS_INSTALLED;
     }
-    }
 
     private static String getServicePListFileName(String packageName,
             String launcherName) {

test/jdk/tools/jpackage/junit/share/jdk.jpackage/jdk/jpackage/internal/model/DottedVersionTest.java

@@ -132,7 +132,7 @@ void run() {
                 expectedErrorMsg = MessageFormat.format(I18N.getString("error.version-string-invalid-component"), version, invalidComponent);
             }
 
-            final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> new DottedVersion(version));
+            final var ex = assertThrowsExactly(IllegalArgumentException.class, () -> DottedVersion.greedy(version));
 
             assertEquals(expectedErrorMsg, ex.getMessage());
         }