[java-identity-provider] 01/01: IDP-1224 Build Windows Installer

[Rod Widdowson]

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

rdw pushed a commit to annotated tag 3.3.2.0
in repository java-identity-provider.

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

commit 5b36ebe9c41a9b4df1ab4c688afe6ef37171d7e9
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 4 09:36:54 2017 +0100

    IDP-1224  Build Windows Installer
    
    https://issues.shibboleth.net/jira/browse/IDP-1224
    
    Rev the MSM and msi versions to 3.3.2.0 (msi) 1.3.2.0(msm)
---
 .../commons-daemon-1.0.15-bin-windows-signed.zip.asc   | 18 ++++++++++++++++++
 .../jetty-distribution-9.3.9.v20160517.zip.asc         |  7 +++++++
 idp-installer/src/main/wix/MergeModule.wxs             |  2 +-
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs      |  2 +-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/idp-installer/src/main/wix/Download/commons-daemon-1.0.15-bin-windows-signed.zip.asc b/idp-installer/src/main/wix/Download/commons-daemon-1.0.15-bin-windows-signed.zip.asc
new file mode 100644
index 0000000..14c626c
--- /dev/null
+++ b/idp-installer/src/main/wix/Download/commons-daemon-1.0.15-bin-windows-signed.zip.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG/MacGPG2 v2.0.22 (Darwin)
+Comment: GPGTools - http://gpgtools.org
+
+iQIcBAABAgAGBQJUF1KdAAoJEBDAHFovYFnnU6sQAM6LZWpO3+Wh5z9Rkn5vY4Vk
+VwYaLd1rLA+jgXcysbKq6YO10TIlhqXsap/t6mjWty9b4J38320bfjA0rX1pLY8x
+kJSZvI/GPZv7u7QRYOdYUd2p1JZ6+hMZDcXHsZgvrZQnhRrtGx90x2HmhfU1lr6L
+HsGJzMAs09/F0oDYD5YdG3KoW2wcjcGbs7N9FnNSJwQHYY1YMgmq11OcwE2UfDMs
+2OiDPMacSW2J301913W1sucM2hmK7pRcqrEVaK2OHNI9zOYrfgwn+rmxO7Vu3H8N
+hprya93cZfFCTy2JkahRAK/CrmGnZHBqOYvOk5g34mzGjxij9sAcYMxgWVP5kQjq
+LOCJluV1UQqA0HyeYOkqw673Bo6ubWh6Cvi+j911irlsOj/wLxdBccdZUY8zxAML
+Nd6LIgvt/557ua4sUUgZ8IIPPn0QhjTZnYVZffrFVCabuE+SQrVKj8NiKPbZxzkv
+L4dm4NLd/FThif6rEKNFeLI7bmUymYKMkdm47cQPmoW18UEstif3Svg2gMuGjBNy
+Rn6zPVHKIBx3is204zA23MW3j9mOLalmgqY1/6WEFHaw9Hc2ur2K73YAplzmSTl4
+LZtkkZGTee1ByD0thJf43+iAoZ+WtMpxspbs3z9CHf7vEmW5tzvLJ7dUQX8qWMta
+dxVaRFXsOTsf7DaIxux2
+=rkqc
+-----END PGP SIGNATURE-----
diff --git a/idp-installer/src/main/wix/Download/jetty-distribution-9.3.9.v20160517.zip.asc b/idp-installer/src/main/wix/Download/jetty-distribution-9.3.9.v20160517.zip.asc
new file mode 100644
index 0000000..99ccfc4
--- /dev/null
+++ b/idp-installer/src/main/wix/Download/jetty-distribution-9.3.9.v20160517.zip.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iEYEABECAAYFAlc7pe8ACgkQ566DnNfFiIZ+ygCfYT7LGPpJ9UXcWHB/byhzwisw
+zXsAnjReucwzpgTAZN9BoIYJ9eSjfd4s
+=5UdK
+-----END PGP SIGNATURE-----
diff --git a/idp-installer/src/main/wix/MergeModule.wxs b/idp-installer/src/main/wix/MergeModule.wxs
index 436717f..e3f2326 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="1.3.0.0">
+    <Module Id="Jetty" Language="1033" Version="1.3.2.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 59891ac..41ba836 100644
--- a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
+++ b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
@@ -19,7 +19,7 @@
 
 
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.3.2" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+    <Product Id="*" Name="Shibboleth IdP V3" Language="1033" Version="3.3.2.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
         <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="$(var.msitype)" Description="Shibboleth IdP V3.3" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />

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