Skip to content

JDK-8273040: Turning off JpAllowDowngrades (or Upgrades) #5509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

JDK-8273040: Turning off JpAllowDowngrades (or Upgrades) #5509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af0e035
JDK-8273040: Turning off JpAllowDowngrades (or Upgrades)
andyherrick Sep 13, 2021
ac3fdb9
JDK-8273040: Turning off JpAllowDowngrades (or Upgrades)
andyherrick Sep 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/jdk.jpackage/windows/classes/jdk/jpackage/internal/WinMsiBundler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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));
Expand Down
4 changes: 2 additions & 2 deletions src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/main.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
<?define JpInstallerVersion=200 ?>
<?define JpCompressedMsi=yes ?>

<?include $(var.JpConfigDir)/overrides.wxi ?>

<?ifdef JpAllowUpgrades ?>
<?define JpUpgradeVersionOnlyDetectUpgrade="no"?>
<?else?>
Expand All @@ -23,8 +25,6 @@
<?define JpUpgradeVersionOnlyDetectDowngrade="yes"?>
<?endif?>

<?include $(var.JpConfigDir)/overrides.wxi ?>

<Product
Id="$(var.JpProductCode)"
Name="$(var.JpAppName)"
Expand Down
9 changes: 4 additions & 5 deletions src/jdk.jpackage/windows/classes/jdk/jpackage/internal/resources/overrides.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/>