[java-idp-jetty-base] branch 12-windows updated: IDP-2429 Prepare a new Jetty MSI for windows for IDP 5.2

[Codeberg]

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

codeberg pushed a commit to branch 12-windows
in repository java-idp-jetty-base.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-jetty-base/commit/271b35d1bb378f6daeb61bb40357a25f41fce526

The following commit(s) were added to refs/heads/12-windows by this push:
     new 271b35d  IDP-2429 Prepare a new Jetty MSI for windows for IDP 5.2
271b35d is described below

commit 271b35d1bb378f6daeb61bb40357a25f41fce526
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jan 30 15:37:26 2026 +0000

    IDP-2429 Prepare a new Jetty MSI for windows for IDP 5.2
    
    https://shibboleth.atlassian.net/browse/IDP-2429
    
    1) Refresh Jetty-base
         idp.mod ee9 → ee11
         idp.xml ee9 → ee11
         static.xml - add precompressed formats as per new jetty base
    2) Refresh pom
         Move parent forward and remove explicit enforcer data version
         Jetty and version to 12.1.6
         logback to 1.5.25 (as per jetty-12.1.6)
---
 pom.xml                                          | 12 ++++++------
 src/main/resources/jetty-base/modules/idp.mod    | 14 +++++++-------
 src/main/resources/jetty-base/webapps/idp.xml    |  2 +-
 src/main/resources/jetty-base/webapps/static.xml | 14 ++++++++++++++
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00d52f6..f0b712d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>net.shibboleth</groupId>
         <artifactId>parent</artifactId>
-        <version>17.1.2</version>
+        <version>17.2.0</version>
     </parent>
 
     <name>Jetty base and Windows Installer</name>
@@ -18,21 +18,21 @@
     <groupId>net.shibboleth.idp</groupId>
     <artifactId>idp-jetty-base-windows</artifactId>
     <packaging>pom</packaging>
-    <version>12.0.20.1-SNAPSHOT</version>
+    <version>12.1.6-SNAPSHOT</version>
 
     <properties>
-	<!-- Pending a new parent project release pin enforcer data to latest -->
-	<maven-dist-enforcer-data.version>2.0.0</maven-dist-enforcer-data.version>
+	<!-- Pending a new parent project release pin enforcer data to latest 
+	<maven-dist-enforcer-data.version>2.0.0</maven-dist-enforcer-data.version> -->
 	
         <assemblyDirectory>${project.build.directory}/idp-jetty-base</assemblyDirectory>
         <!-- Dependencies for the shipped jetty-home -->
-        <logback.version>1.5.13</logback.version>
+        <logback.version>1.5.25</logback.version>
         <!-- The things we will combine into the MSI -->
         <procrun.groupId>commons-daemon</procrun.groupId>
         <procrun.artifactId>commons-daemon</procrun.artifactId>
         <procrun.version>1.4.1</procrun.version>
         <procrun.classifier>bin-windows</procrun.classifier>
-        <jetty.version>12.0.20</jetty.version>
+        <jetty.version>12.1.6</jetty.version>
 	<!-- Control for building the MSI -->
         <jetty.revision>1</jetty.revision>
         <supress.validation>false</supress.validation>
diff --git a/src/main/resources/jetty-base/modules/idp.mod b/src/main/resources/jetty-base/modules/idp.mod
index 176c52b..c96b153 100644
--- a/src/main/resources/jetty-base/modules/idp.mod
+++ b/src/main/resources/jetty-base/modules/idp.mod
@@ -2,18 +2,18 @@
 Shibboleth IdP
 
 [depend]
-ee9-annotations
-ee9-deploy
+ee11-annotations
+ee11-deploy
+ee11-jsp
+ee11-jstl
+ee11-plus
+ee11-servlets
+ee11-webapp
 ext
-ee9-webapp
 http
 https
-ee9-jsp
-ee9-jstl
-ee9-plus
 resources
 server
-ee9-servlets
 ssl
 
 [files]
diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/src/main/resources/jetty-base/webapps/idp.xml
index 6d3866d..7c59a5f 100644
--- a/src/main/resources/jetty-base/webapps/idp.xml
+++ b/src/main/resources/jetty-base/webapps/idp.xml
@@ -3,7 +3,7 @@
 <!-- =============================================================== -->
 <!-- Configure the Shibboleth IdP webapp                             -->
 <!-- =============================================================== -->
-<Configure class="org.eclipse.jetty.ee9.webapp.WebAppContext">
+<Configure class="org.eclipse.jetty.ee11.webapp.WebAppContext">
   <Set name="war"><SystemProperty name="idp.home" default="/opt/shibboleth-idp" />/war/idp.war</Set>
   <Set name="contextPath"><SystemProperty name="idp.context.path" default="/idp" /></Set>
   <Set name="extractWAR">false</Set>
diff --git a/src/main/resources/jetty-base/webapps/static.xml b/src/main/resources/jetty-base/webapps/static.xml
index 2fa6c00..7841c5f 100644
--- a/src/main/resources/jetty-base/webapps/static.xml
+++ b/src/main/resources/jetty-base/webapps/static.xml
@@ -9,6 +9,20 @@
     <New class="org.eclipse.jetty.server.handler.ResourceHandler">
       <Set name="baseResourceAsString"><SystemProperty name="idp.home"/>/static</Set>
       <Set name="dirAllowed">false</Set>
+      <Set name="precompressedFormats">
+        <Array id="ccfList" type="org.eclipse.jetty.http.CompressedContentFormat">
+          <Item>
+            <New class="org.eclipse.jetty.http.CompressedContentFormat">
+              <Arg type="String">br</Arg><Arg type="String">.br</Arg>
+            </New>
+          </Item>
+          <Item>
+            <New class="org.eclipse.jetty.http.CompressedContentFormat">
+              <Arg type="String">gzip</Arg><Arg type="String">.gz</Arg>
+            </New>
+          </Item>
+        </Array>
+      </Set>
     </New>
   </Set>
 </Configure>

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