[java-identity-provider] 02/02: IDP-1780 Build installer for jetty 9.4.39

[Rod Widdowson]

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

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

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

commit 937a554db97b1b283dc28a17b2dc81fe87ef7d95
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Apr 2 13:41:45 2021 +0100

    IDP-1780 Build installer for jetty 9.4.39
    
     - Remove old jetty ask file and add new one.
     - rev the 4th digit of the version.
---
 idp-installer/src/main/wix/MergeModule.wxs               |  2 +-
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs        |  2 +-
 .../main/wix/jetty-distribution-9.4.38.v20210224.zip.asc | 16 ----------------
 .../main/wix/jetty-distribution-9.4.39.v20210325.zip.asc | 16 ++++++++++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/idp-installer/src/main/wix/MergeModule.wxs b/idp-installer/src/main/wix/MergeModule.wxs
index 3b1b674ca..f62cc209b 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="3.1.0.0">
+    <Module Id="Jetty" Language="1033" Version="3.1.0.1">
         <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="x64" />
         <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 c0383aa06..ed036e76c 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 V4" Language="1033" Version="4.1.0.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+    <Product Id="*" Name="Shibboleth IdP V4" Language="1033" Version="4.1.0.1" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
         <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="x64" Description="Shibboleth IdP V4.1.0" Manufacturer="The Shibboleth Consortium" />
 
         <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." AllowSameVersionUpgrades="yes" Schedule="afterInstallInitialize" />
diff --git a/idp-installer/src/main/wix/jetty-distribution-9.4.38.v20210224.zip.asc b/idp-installer/src/main/wix/jetty-distribution-9.4.38.v20210224.zip.asc
deleted file mode 100644
index 713b4b2ab..000000000
--- a/idp-installer/src/main/wix/jetty-distribution-9.4.38.v20210224.zip.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIcBAABAgAGBQJgNruiAAoJEC0OH7j+S2i0gJwP/isrUXonBnDBjFPnFV1wYDKH
-KUfIrFmPxW6vFQ61XwgSw3NUkhoGR3NqA6hXC8pwaKcyZnbTUxLqQ7Ucb/9a4OOW
-rTKR90JC2X3q6q8g7rAEyA4Qi38PKUT3LvlrOVkV4d0se3unbzP42HSk7yDXVGv3
-Jqbd52hKjYA+T4XfHWsxe0KHe8xWdTSkXCAp8OE3xYQTdCjhEBuWm++427VdvTag
-ifXZ/0SJu7MD1Dts6za7FH9yyW3q6TUCNjnFKk9uvxht3iig9BDpd+oJhRkBiJ4t
-MllzA5H1pZzkWFID1oYTiEC8UKNzCzEM0NCHxArvmbVesP/WNF6kWspskFTj01HC
-fP1NfbIBIXTn9K8EgBR3CQ4MdzhVAb94vOM+Yah+RFjN0Yfjymv53oTTbirbJ5Q6
-kKJ047Sn2j5DG6yV/YGy6lLnmeGh4ThQYDk8PSgxlwiuTsWNA+VmQKZhgdeB7lo7
-IFYvUQZtblQJg8M9S2rsShNom0N1XPpXrDxyblMO1HFm95fXp7HlDPmJIkjytOVj
-l36LeHQtFM/fX5CWvoYbPW/G5KrPmmOqwycWNYlWd6unrUGrmLg0jpozVBFDoMpT
-L8D/fxdtBGtE3m+2LFPDw5k+9rKH8+qDInecLJnYQMnt47l1O3F2JjCrpmOSL1zi
-QHiPEMD+Qc+elV+Gk1YF
-=WFzj
------END PGP SIGNATURE-----
diff --git a/idp-installer/src/main/wix/jetty-distribution-9.4.39.v20210325.zip.asc b/idp-installer/src/main/wix/jetty-distribution-9.4.39.v20210325.zip.asc
new file mode 100644
index 000000000..d712e6931
--- /dev/null
+++ b/idp-installer/src/main/wix/jetty-distribution-9.4.39.v20210325.zip.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEKmhLV0NqgfqHBrU8YcM1GkOKO30FAmBcpIYACgkQYcM1GkOK
+O311BA//fPyTk/w4MfUPVyS7emIA4VWqt6TSap3Mve9nfeZLzMAwYIhLNadbM2uN
+3BejshnrEr/F7Ba6lh8wRcVetqAUL8CQZ94m1Ct2vwTMoaapTBqtvN4J3YAA3naK
+W2sGyJnAUB4mPbWWvJSKDbWkSXi7UO78wZSv/JZ7XlBZRWu1nYQZqxLnZOXOvl2x
+DQjXBB4fWz5UsZ2wxkRhlqMVeQ0Qqi/TdF598qv5EGNpnE8J3rL9qOWEdbry3Xid
+cY0LRnerxDH+Xbya86eks2CeD8DI2c9d44pQpLLq6XBKwOG/f0bVB2XyW3ARrICB
+FDFQxsQVK3XQUJs+9LsOSjuDJPsTbQ0CtLfVLmb6ngPx7b7m1sJCoVoy7LPEyvOr
+4Oj9DRfkK/qHB4EUKZfcRFznF7Wv2nJ5FvakEbKNBAerCXU4/tp3adlnv00dOyfI
+Kzn0zl1VNaY4rbPFbvcPeDQ3wJyLX8z5/TaoKhhFp4JiFr2ywchgMlcASqAHz0Vj
+i2J+2ipH1uwHSKxRwn9yosz5eOFUO7ULsthmpu65qwXQRFVM3RyRGWaoB4R5p2yl
+fOfTi2ilZSxDMXVj0JVC8oJOjVLZP5qjuKdC5gWDROt+2WnvGQ6bWLtCZGpC0N4O
+aPP9jpxKVO+hcsWMsPdZxqUjfr6SpxtzdJkvb1ZYrWO83Uvuxec=
+=TLlv
+-----END PGP SIGNATURE-----

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