[java-identity-provider] 01/01: IDP-2090 Update Jetty base for windows installer to Jetty 10/11.0.15 https://shibboleth.atlassian.net/browse/IDP-2090
Rod Widdowson
rdw at steadingsoftware.com
Wed Apr 19 18:32:58 UTC 2023
This is an automated email from the git hooks/post-receive script.
rdw pushed a commit to annotated tag 4.3.1.1
in repository java-identity-provider.
View the commit online:
http://git.shibboleth.net/view/?p=java-identity-provider.git;a=commit;h=3d5d0c25fa31d31b9255ed9ac513a10175f65104
commit 3d5d0c25fa31d31b9255ed9ac513a10175f65104
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Wed Apr 19 19:32:14 2023 +0100
IDP-2090 Update Jetty base for windows installer to Jetty 10/11.0.15
https://shibboleth.atlassian.net/browse/IDP-2090
Add files used to build patch version 4.3.1.1
---
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 -----------------
.../wix/down/idp-jetty-base-11.0.15-WINDOWS.zip.asc | 17 +++++++++++++++++
.../src/main/wix/down/jetty-home-10.0.13.zip.asc | 16 ----------------
.../src/main/wix/down/jetty-home-10.0.15.zip.asc | 16 ++++++++++++++++
6 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/idp-installer/src/main/wix/MergeModule.wxs b/idp-installer/src/main/wix/MergeModule.wxs
index 7b9146c90..5e989bcbc 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.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">
<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 c52e630ec..c5079c520 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.0" Manufacturer="The Shibboleth Consortium" UpgradeCode="$(var.UpgradeUUID)">
+ <Product Id="*" Name="Shibboleth IdP V4" Language="1033" Version="4.3.1.1" 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/idp-jetty-base-11.0.15-WINDOWS.zip.asc b/idp-installer/src/main/wix/down/idp-jetty-base-11.0.15-WINDOWS.zip.asc
new file mode 100644
index 000000000..c0cda9e3f
--- /dev/null
+++ b/idp-installer/src/main/wix/down/idp-jetty-base-11.0.15-WINDOWS.zip.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iQIcBAABAgAGBQJkQC+2AAoJEAFIPyYqSz/waHMP/0LDjU58BsmdafJZcPiYYwK0
+cRKV4dodrOzXwokGB7fEbeBpl7XBAbJtyxOVFwVOqh8ANcyUiup1yZ2+19Ze73jO
+qXy7ZrQZvivmfNvTEMCBZcAZGufP/UNEFk8e2XuDIVBfJ7xTG6Gg5mF2A/+PuNOk
+Ey7bP/80kINKRS6ZAwHtH3oaVOyce1SWiMeD+DUolNPBg1WIbbULn2TnrdLmQGxm
+JPfyec01mBcVwHx1HReF6fNJHPnn6v0H6gZWTgPG1kwvt1hmhRA1xAfFfdi07Aq9
+9wkXimhtrFvujJm4iX/FYZhUtmavMbtZmu6jLmZtTB8NJTTPsaY+9S7nwOXssyTw
+Kg7zwEb4gW2MQwhDg0yPnr2JeOCgLSZS+/yizpEJmT83QDTFdo//BGn/3oJ5mzoW
+xOf589IyXCO1dIVzUpRR1qpqT9U+l9tsQwbuathxDTOV6+43ebsCk6iWpMZqgX2t
+3bsY9w7GyaOBHsCkO8IYFB+UYexa7Y87bm77yZzzK7H+Nntn5KT9pfYROWUwG7yg
+MOZ4Duaa47HJamR8D0vSsuHepDmBnGHPcxUikbOr7IrcW8OLZC/uNxkwuBLARJMQ
+gweaboBAU8jcN2LX8+2UmxTFg9IcyxXV8L5DRD6yyDGDRxiFIltu8d80I9VlZX4q
+zaSQ49p5UnWUmrEAej2b
+=0xha
+-----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.15.zip.asc b/idp-installer/src/main/wix/down/jetty-home-10.0.15.zip.asc
new file mode 100644
index 000000000..dcafd78ea
--- /dev/null
+++ b/idp-installer/src/main/wix/down/jetty-home-10.0.15.zip.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCAAdFiEEWYm692IXuEPWa+VbLQ4fuP5LaLQFAmQ1moAACgkQLQ4fuP5L
+aLQm5g//WQ3TVIODWmSWZXUz/nFnIyeou15w2+pLKY7mma3ziRKUOr5wns3uNn2X
+SRZeWCzLOVrA5NHGiUF4VDHhkmDK6BukDE1BuPu6zSLX+vJj9udD39thoWW+hYSH
+oZM4r+Wi2l7BJObBNMvUnUSnfieaPwAsFnG40WVRLskEnVporxwAQnuEmXTbdzr6
+uw7aXHbkm+KDLDKvDvvSaIuDRM7O3+NtRRuVS7KKJ2sKw4i+1iMd/YVxsfSoP5wP
+RAyG97jPUfAqlyJ8vFa3akdN8JR58QIuzFtfRleggLklp0JNlCNhXHsDAmWFiRbP
+Y0OZBV07XwZrIfsTwGuheP0irBT/ju5DhbRzzm8+fVFYuL1+4+O3AmCMWcU4YHMR
+wWFUYAgc0w2XqyCGzt3EkqmxjtjFy6KZbCACOX2juKyFRvVzGkwV/44Qh4OIQPLM
+Q9zyY7z+2w0cPP2lnfCQ16sUcHRCQOLSSnuilYB+FoESCwX7J3qFE7DPHrJVhKVB
+OfCrcSwyHHheTaj+xJ//7z9VXugA/NeGRB/hPuHdP91r2oS7nKBqqQetc+dqULZN
+vF3HNQ4ZBmN5rFSYqai7rdQqoUDrzW87UwopdAqTXtoXvyGoZN3GvGhuaUcZPn4O
+yKL9eO8TNVnXQw4Y+aiY/LvCJhRe607l/3U+073oeLkIV4l5Pik=
+=efyd
+-----END PGP SIGNATURE-----
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the commits
mailing list