Non-compliant fixes to keep old jpackage behavior

Author: alexeysemenyukoracle

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

@@ -165,14 +165,16 @@ private Optional<AppImageSigningConfig> createSigningConfig() throws ConfigExcep
     private String validatedBundleName() throws ConfigException {
         final var value = Optional.ofNullable(bundleName).orElseGet(() -> {
             final var appName = app.name();
-            if (appName.length() > MAX_BUNDLE_NAME_LENGTH) {
-                return appName.substring(0, MAX_BUNDLE_NAME_LENGTH);
-            } else {
-                return appName;
-            }
+// Commented out for backward compatibility
+//            if (appName.length() > MAX_BUNDLE_NAME_LENGTH) {
+//                return appName.substring(0, MAX_BUNDLE_NAME_LENGTH);
+//            } else {
+//                return appName;
+//            }
+            return appName;
         });
 
-        if (value.length() > MAX_BUNDLE_NAME_LENGTH) {
+        if (value.length() > MAX_BUNDLE_NAME_LENGTH && (bundleName != null)) {
             Log.error(I18N.format("message.bundle-name-too-long-warning", "--mac-package-name", value));
         }
 
@@ -204,7 +206,7 @@ private String validatedBundleIdentifier() throws ConfigException {
     }
 
     private String validatedCategory() throws ConfigException {
-        return Optional.ofNullable(category).orElseGet(DEFAULTS::category);
+        return "public.app-category." + Optional.ofNullable(category).orElseGet(DEFAULTS::category);
     }
 
     private Optional<Path> validatedIcon() throws ConfigException {

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacApplication.java

@@ -37,8 +37,13 @@
 public interface MacApplication extends Application, MacApplicationMixin {
 
     default DottedVersion shortVersion() {
-        var verComponents = DottedVersion.lazy(version()).getComponents();
-        return DottedVersion.greedy(IntStream.range(0, 3).mapToObj(idx -> {
+        final var verComponents = DottedVersion.lazy(version()).getComponents();
+        // Short version should have exactly three components according to
+        // https://developer.apple.com/documentation/bundleresources/information-property-list/cfbundleshortversionstring
+        int maxComponentCount = 3;
+        // However, if the number of components is less than three, historically, jpackage will not add missing components.
+        maxComponentCount = Integer.min(maxComponentCount, verComponents.length);
+        return DottedVersion.greedy(IntStream.range(0, maxComponentCount).mapToObj(idx -> {
             if (idx < verComponents.length) {
                 return verComponents[idx].toString();
             } else {