From af0e035ffd81ba67f70db91064d908a1b9f9ee60 Mon Sep 17 00:00:00 2001
From: Andy Herrick <andy.herrick@oracle.com>
Date: Mon, 13 Sep 2021 21:13:20 +0100
Subject: [PATCH 1/2]     JDK-8273040: Turning off JpAllowDowngrades (or
 Upgrades)

---
 .../classes/jdk/jpackage/internal/WinMsiBundler.java       | 4 +++-
 .../classes/jdk/jpackage/internal/resources/main.wxs       | 4 ++--
 .../classes/jdk/jpackage/internal/resources/overrides.wxi  | 7 ++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
index 8acbd60b11e2c..66bd05e68bb44 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
@@ -450,7 +450,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));
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs
index 07cbe0d333f13..c5e1e6d8b5840 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs
+++ b/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)"
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
index 3a092a409f7d4..ce4cf45c03c60 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
@@ -18,15 +18,12 @@ 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.
 
 - JpAllowUpgrades
 Should be defined to enable upgrades and undefined to disable upgrades.
-Default value is `yes`.
+By default it is defined.
 -->
 <Include/>

From ac3fdb929d43feef41bf986179c32c38d702fe6a Mon Sep 17 00:00:00 2001
From: Andy Herrick <andy.herrick@oracle.com>
Date: Tue, 14 Sep 2021 14:31:24 +0100
Subject: [PATCH 2/2] JDK-8273040: Turning off JpAllowDowngrades (or Upgrades)

---
 .../windows/classes/jdk/jpackage/internal/WinMsiBundler.java | 5 +++--
 .../classes/jdk/jpackage/internal/resources/overrides.wxi    | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
index 66bd05e68bb44..5aecb5b82cc13 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
+++ b/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
diff --git a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
index ce4cf45c03c60..6e632604cff20 100644
--- a/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
+++ b/src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
@@ -21,9 +21,11 @@ Value of `InstallerVersion` attribute of `Package` WiX element. Default value is
 - JpAllowDowngrades
 Should be defined to enable downgrades and undefined to disable downgrades.
 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.
-By default it is defined.
+By default it is defined, use <?undef JpAllowUpgrades?> to disable.
 -->
 <Include/>