[java-identity-provider] 01/01: IDP-2184 Prerpare for Jetty Version 10.0.17

Wed Oct 11 15:54:23 UTC 2023

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

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

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

commit 5cbe6aa51231b786c7cd57728bfb7a0a331b9ee3
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Oct 11 16:52:17 2023 +0100

    IDP-2184 Prerpare for Jetty Version 10.0.17
    
    https://shibboleth.atlassian.net/browse/IDP-2184
    
    Files for IdP version 4.3.1.3
---
 idp-installer/src/main/wix/MergeModule.wxs              |  2 +-
 idp-installer/src/main/wix/ShibbolethIdP-main.wxs       |  2 +-
 .../wix/down/idp-jetty-base-11.0.13-WINDOWS.zip.asc     | 17 -----------------
 .../src/main/wix/down/jetty-home-10.0.13.zip.asc        | 16 ----------------
 .../src/main/wix/down/jetty-home-10.0.16.zip.asc        | 16 ----------------
 .../src/main/wix/down/jetty-home-10.0.17.zip.asc        | 16 ++++++++++++++++
 6 files changed, 18 insertions(+), 51 deletions(-)

diff --git a/idp-installer/src/main/wix/MergeModule.wxs b/idp-installer/src/main/wix/MergeModule.wxs
index 7b9146c90..53d5bf06c 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.4.1.0">
+    <Module Id="Jetty" Language="1033" Version="3.4.1.3">
         <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">
             <Component Id="SaveTarget" Guid="{B5B909A2-E246-4069-808D-7F3AC98D062B}" Win64="no">
diff --git a/idp-installer/src/main/wix/ShibbolethIdP-main.wxs b/idp-installer/src/main/wix/ShibbolethIdP-main.wxs
index 5474b8949..26672f132 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.3.1.2" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+    <Product Id="*" Name="Shibboleth IdP V4" Language="1033" Version="4.3.1.3" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
         <Package InstallerVersion="310" Compressed="yes" InstallScope="perMachine" Platform="x64" Description="Shibboleth IdP V4.3" 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/down/idp-jetty-base-11.0.13-WINDOWS.zip.asc b/idp-installer/src/main/wix/down/idp-jetty-base-11.0.13-WINDOWS.zip.asc
deleted file mode 100644
index 35ae181a4..000000000
--- a/idp-installer/src/main/wix/down/idp-jetty-base-11.0.13-WINDOWS.zip.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAABAgAGBQJjyAA3AAoJEAFIPyYqSz/wZEUQAKrKhE5zrZdivTAe+SiwPuZ8
-f887rGml75JpsbmJbFSZa5DdgPX96k3uxiCxE1Mxb0RQ092yWoIwLlHUP3yyZ8TM
-2zhkHyYwHnxLDHKAwRJZmUGlva1P0GAdr4eX3BoLcYlO2FmBhUcz3cUsQbzba0dA
-lNFTBsxSzFGlPtroRGEZPPeNJ3fmqIGDpHUoXxGl89RLaP3kJw5Cf8rwdntBdD36
-mCzQHBcuIsUcpJSXdl4luInPJED9Ycn7e0uTV9pXbW91Q2K9GYYHji0iFl6QEQfN
-MNdStLF+Geb6RJ73bQ4g6eR4914dYj7ARZROGiHa95stlS34Dg6SiZw8mXtMCJrG
-ZTlgDhNpFxz7+pR51IPawgkU5Bl9fydAGNS3825pIPse/YRl5cPjnZv4VTarNwcq
-pcY1xBbgSZipxca6Ey1828+QZvlFqc3LOoMswhg6iRC1XrNJVt5G53hZZ4MuuUcw
-UUY8j4+tYSQAKGvx8GCyIzMG/e+ec+Z4Rrn6NThzjJXwU5hqtqGXQ4z/lL3vXe52
-nP0mUE7KBgChbhQOFkqMJsdodOpwiarENWuOosyxW6VBtcb0HoltB6Q5kUn881zK
-1O/7Ka2IdPduf4REMllD86w6KzJnFl1LRSp1bvseZxrQfzaz4ilybHVIRLf0NGgT
-4UhWeACG8snnPdvM5MC6
-=lWmh
------END PGP SIGNATURE-----
diff --git a/idp-installer/src/main/wix/down/jetty-home-10.0.13.zip.asc b/idp-installer/src/main/wix/down/jetty-home-10.0.13.zip.asc
deleted file mode 100644
index c1bf7289e..000000000
--- a/idp-installer/src/main/wix/down/jetty-home-10.0.13.zip.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEWYm692IXuEPWa+VbLQ4fuP5LaLQFAmOQ9q0ACgkQLQ4fuP5L
-aLTrtA//c3liuB0VdHH8hL6iLqBvi644vbWDnC4Q6GGKPZCzEUnyNAQ0i+J7YtNZ
-rEb9KpBvXFnWH37ziYbFDUdN4k2hy25BcSJWouPhu1YmarFWA8HeBxBuuqZYeIuX
-yFpfu0Hb9QwTnD9KVIdRgdEdiQzvW/mLOxMzOi322QsOjBQz8qqxIRy1QmSTvGgR
-rTioIc3Amnp6Fema5m6Bozh0etNLgSam/cRPVrgGJA/1SnCNY50CojPhAFpX3Nz5
-gO7wxi6r1RqXsRlohdqrYB42kzV+bKMkNNTZJ1bmBP46zLkmxBGK2jyfndtoW9FH
-Mip6ozKr/mMx1X4bAOiPao4MBE1427WMDxqbgHg9zCEXF1FW/ifIpyNovQVNgJiJ
-xcZ+UUi21ObFloSOranuWV7FwqNXQwVP+6PzXZrbTRFefeGdl+79cdis8hf/di4G
-PQzFWcBaOPjdVDYdqU12qoLlBIFHl9YbVyWBh+ZG2p+XRgajYdrdhkNLkAwYlXHs
-xiqkST9NPjGIVr0IypizM9yC89hVhrxlpeGYjzCeeqmxgt6sU6u9c+4C1Xh4jaTg
-qeyODO2z+5s1ZdVb8qlho6Iulm+nUbOeAC5QWzL31pncmD2Q8pl/SyfsatsZR7kf
-+Gz+vx6Y+kZ+vFy2fc/HpCJo0m4EveQaQkXlz044NPBUbrJjR9s=
-=8mVd
------END PGP SIGNATURE-----
diff --git a/idp-installer/src/main/wix/down/jetty-home-10.0.16.zip.asc b/idp-installer/src/main/wix/down/jetty-home-10.0.16.zip.asc
deleted file mode 100644
index afd9961df..000000000
--- a/idp-installer/src/main/wix/down/jetty-home-10.0.16.zip.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCAAdFiEEWYm692IXuEPWa+VbLQ4fuP5LaLQFAmTo/4MACgkQLQ4fuP5L
-aLRBEQ/+ILl6w4Wl3dyfnzpVRnp7weYeuUFkBnhhvYI1n4xASRYUVU9j36dkvYaP
-NIZ4QeBGD9jtheVxi5CMz6udsnbFOINIKcSxDwJq8aDXZ0tPfPIFXwRn+CnBniQr
-Ymvjab+Bs6Npofrzo1yA/zQz4WOOkUJ7cxvlK+1zMArIiZ0NWVRQk1BwPDnL7hXy
-OaVptlw88UvWb1qrmMct2jPQvp1fczTaorE2NlKmb6CXAQ25wzhF3GLUdVAlbL0O
-J5HvEeC8D2lXab+Q3ClBW1i9g/5x2lMs7G6v68dAnC8R0pBe1F+YI03sjDj2L0fd
-Kpl6efAsnDjWQyaBTYy+z/pAymCfxvFR4XJgcgGGadg2NgE09VcX5L96o0uz7Gx4
-sVfWEWwFpNJ9nLlq6tPCjlKD9XXueQ2Obr4npgXzazRIBhjb5OyREvsWFvTv9Rhu
-vaL4/Twnsto8ulDEOG9NEclJFb6Lhcw27OWkU8rhrXkW2lNgMsP8P3bC/GHK5ZTP
-J13vEiixuQ4bKKIbayYOH3wTwow9rdem/CUXnd6M1q03ZuTXn4hngM7x8AyE9K+x
-lKGOC9g+rMu0RB2DCPOVzh2bnJQ3LhXqzl1Ad5+SZqCW3XfcYe5A0Gut9JvJKZq9
-Gz3Cd70tPG9Dri5ajDggGIHvvDocrjI+BkNlKlnf34WVTImJcRo=
-=Mrid
------END PGP SIGNATURE-----
diff --git a/idp-installer/src/main/wix/down/jetty-home-10.0.17.zip.asc b/idp-installer/src/main/wix/down/jetty-home-10.0.17.zip.asc
new file mode 100644
index 000000000..d75e66ae6
--- /dev/null
+++ b/idp-installer/src/main/wix/down/jetty-home-10.0.17.zip.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEWYm692IXuEPWa+VbLQ4fuP5LaLQFAmUkRlYACgkQLQ4fuP5L
+aLTM0A/+InFyO23507CkVdOtAB5p4qnMhvzMwzlGGcYxjX75sbkTjRpz5VyLMTBx
+CdSpti62TYx1hFf/zCBCj/0CunH3MSTvltsflwyei3KGytjT6t4hnaUekoAG7xne
+w/lB6kEXnGhsAsxm4EiPxcDRZ9aiWaSK6DTxg+0jeqCMhPykQF0mUMUNcTnqFIdy
+WVkt8GP8Nsy0hNaoixxkpYWoXa1IVQEOCKemjMayBOf0YQKtTGyeUYgM/hSgH6DH
+WmA7gURxHkHY94L+GBfjL9YeM2tICja5Z0sod8f9o6Yyx5HJHqCagkhgjq8TeAIX
+otlZvcwh5PtSQidva4kRg7pLVg7ZBURM5JqrP6iVY32ry5GgDwTzmk1u40/sUq38
+B6J7DK+OpEE+x+GEyLfsr+w9W7s1K/VKDHCyxo+RuOCVjDhbLfLGstCBburPjoag
+WjRWUPJs4JPxcRd766fMX4kB0QgR+TbznlgABsoHkzOVhlVsSPKl8UBjJ9X3F+qD
+sAneRIF5T+8wztzXJ/O97kArdQU24AicTe+z+GhAgQkHeYRUV05od48B5bID622U
+y3ThxrYhJOf4xASI7sOl+eJBoadP8V/PvBo+Vf1bS2TBXS06CcwCa2/gkoP2Whrn
+iTGWcTEp4wCEynGkW1ADVzOgC5GcFvr4EkhwWGLr/R2q1EmZM8c=
+=QlwQ
+-----END PGP SIGNATURE-----

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