[java-identity-provider] branch master updated: IDP-1580 Update Windows installer

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository java-identity-provider.

View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=5c2f1c5961f7a3ccbcf14eeee67013aa8cc2e0c1

The following commit(s) were added to refs/heads/master by this push:
       new  5c2f1c5   IDP-1580 Update Windows installer
5c2f1c5 is described below

commit 5c2f1c5961f7a3ccbcf14eeee67013aa8cc2e0c1
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Mar 7 15:27:01 2020 +0000

    IDP-1580 Update Windows installer
    
    https://issues.shibboleth.net/jira/browse/IDP-1580
    
    First full release will be 4.0.0.0
    Remove "beta" from any description
    Gratuitously rev the merge module (which never gets shipped)
---
 idp-installer/src/main/wix/MergeModule.wxs        | 2 +-
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/idp-installer/src/main/wix/MergeModule.wxs b/idp-installer/src/main/wix/MergeModule.wxs
index c89893e..7ddb919 100644
--- a/idp-installer/src/main/wix/MergeModule.wxs
+++ b/idp-installer/src/main/wix/MergeModule.wxs
@@ -16,7 +16,7 @@
    permissions and limitations under the License.  -->
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Module Id="Jetty" Language="1033" Version="2.0.0.0">
+    <Module Id="Jetty" Language="1033" Version="3.0.0.0">
         <Package Id="684b3207-0d64-43e6-9e6a-3acb8b7672d7" Manufacturer="The Shibboleth Consortium" InstallerVersion="310" Description="Merge Module for Jetty" Comments="This module is built by the Shibboleth Consortium.  Includes Jetty (from Eclipse) and Procrun (from Apache)" Platform="$(var.msitype)" />
         <Directory Id="TARGETDIR" Name="SourceDir">
             <Directory Id="JETTYROOT" Name="Jetty" />
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index e2cc6a0..5c3dec2 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -19,8 +19,8 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="Shibboleth IdP V4 BETA" Language="1033" Version="4.0.0.254" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
-        <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V4.0 BETA" Manufacturer="The Shibboleth Consortium" />
+    <Product Id="*" Name="Shibboleth IdP V4" Language="1033" Version="4.0.0.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+        <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V4.0.0" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
         <MediaTemplate EmbedCab="yes" />

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.