8273040: Turning off JpAllowDowngrades (or Upgrades)

Reviewed-by: asemenyuk
Backport-of: 22a7191f700c6966c59dcd12476f01452243542b

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java

@@ -106,8 +106,9 @@
  * value generated by jpackage every time {@link #execute} method is called if
  * --win-upgrade-uuid command line option is not specified. Otherwise this
  * variable is set to the value of --win-upgrade-uuid command line option
- * <li>JpAllowDowngrades. Set to "yes" if --win-upgrade-uuid command line option
- * was specified. Undefined otherwise
+ * <li>JpAllowUpgrades. Set to "yes", but all that matters is it is defined.
+ * <li>JpAllowDowngrades. Defined for application installers, and undefined for
+ * Java runtime installers.
  * <li>JpConfigDir. Absolute path to the directory with generated WiX source
  * files.
  * <li>JpIsSystemWide. Set to "yes" if --win-per-user-install command line
@@ -450,7 +451,9 @@ private Map<String, String> prepareMainProjectFile(
                 upgradeCode));
 
         data.put("JpAllowUpgrades", "yes");
-        data.put("JpAllowDowngrades", "yes");
+        if (!StandardBundlerParam.isRuntimeInstaller(params)) {
+            data.put("JpAllowDowngrades", "yes");
+        }
 
         data.put("JpAppName", APP_NAME.fetchFrom(params));
         data.put("JpAppDescription", DESCRIPTION.fetchFrom(params));

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs

@@ -12,6 +12,8 @@
   <?define JpInstallerVersion=200 ?>
   <?define JpCompressedMsi=yes ?>
 
+  <?include $(var.JpConfigDir)/overrides.wxi ?>
+
   <?ifdef JpAllowUpgrades ?>
     <?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
   <?else?>
@@ -23,8 +25,6 @@
     <?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
   <?endif?>
 
-  <?include $(var.JpConfigDir)/overrides.wxi ?>
-
   <Product
     Id="$(var.JpProductCode)"
     Name="$(var.JpAppName)"

src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi

@@ -18,15 +18,14 @@ Value of `Language` attribute of `Product` WiX element. Default value is 1033.
 - JpInstallerVersion
 Value of `InstallerVersion` attribute of `Package` WiX element. Default value is 200.
 
-- JpCompressedMsi
-Value of `Compressed` attribute of `Package` WiX element. Default value is `yes`.
-
 - JpAllowDowngrades
 Should be defined to enable downgrades and undefined to disable downgrades.
-Default value is `yes`.
+By default it is defined for applications and undefined for Runtime installer.
+Use <?define JpAllowUpgrades = "foo" ?> to enable or <?undef JpAllowUpgrades?>
+to disable (the value doesn't mater).
 
 - JpAllowUpgrades
 Should be defined to enable upgrades and undefined to disable upgrades.
-Default value is `yes`.
+By default it is defined, use <?undef JpAllowUpgrades?> to disable.
 -->
 <Include/>