[java-idp-integration-tests] 06/06: Bump Jetty to 12.1

[Codeberg]

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

codeberg pushed a commit to branch main
in repository java-idp-integration-tests.

View the commit online:
https://codeberg.org/Shibboleth/java-idp-integration-tests/commit/bfefd878bae646cdca93d829bbbe3d88a66086c4

commit bfefd878bae646cdca93d829bbbe3d88a66086c4
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Sun May 10 20:19:46 2026 -0500

    Bump Jetty to 12.1
---
 pom.xml                                            |   2 +-
 .../shibboleth/idp/integration/tests/BaseTest.java |   8 --------
 .../lib/logging/logback-classic-1.5.19.jar         | Bin 307224 -> 0 bytes
 .../lib/logging/logback-classic-1.5.32.jar         | Bin 0 -> 286451 bytes
 ...ack-core-1.5.19.jar => logback-core-1.5.32.jar} | Bin 627584 -> 644407 bytes
 src/test/jetty-base/start.d/http-config.ini        |   1 +
 6 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index a854429..05f3979 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,7 +24,7 @@
         <idp-to-be-tested.version>${idp.version}</idp-to-be-tested.version>
 
         <!-- Jetty -->
-        <jetty.version>12.0.34</jetty.version>
+        <jetty.version>12.1.9</jetty.version>
         <idp-jetty-base.version>12.1.0</idp-jetty-base.version>
 
         <!-- Tomcat -->
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
index 244e38b..b8c82a4 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
@@ -652,14 +652,6 @@ public abstract class BaseTest {
         final Path idpIni = pathToJettyBase.resolve(Paths.get("start.d", "shibboleth.ini"));
         Assert.assertTrue(idpIni.toFile().exists());
         replaceFile(idpIni, "../credentials", "credentials");
-        
-        // Downgrade to ee9 for Jetty 12.0
-        final Path shibbolethMod = pathToJettyBase.resolve(Paths.get("modules", "shibboleth.mod"));
-        replaceFile(shibbolethMod, "ee11", "ee9");
-        final Path idpXML = pathToJettyBase.resolve(Paths.get("webapps", "idp.xml"));
-        replaceFile(idpXML, "ee11", "ee9");
-        final Path testbedXML = pathToJettyBase.resolve(Paths.get("webapps", "testbed.xml"));
-        replaceFile(testbedXML, "ee11", "ee9");
     }
  
     /**
diff --git a/src/test/jetty-base/lib/logging/logback-classic-1.5.19.jar b/src/test/jetty-base/lib/logging/logback-classic-1.5.19.jar
deleted file mode 100644
index 04301cd..0000000
Binary files a/src/test/jetty-base/lib/logging/logback-classic-1.5.19.jar and /dev/null differ
diff --git a/src/test/jetty-base/lib/logging/logback-classic-1.5.32.jar b/src/test/jetty-base/lib/logging/logback-classic-1.5.32.jar
new file mode 100644
index 0000000..cb0541f
Binary files /dev/null and b/src/test/jetty-base/lib/logging/logback-classic-1.5.32.jar differ
diff --git a/src/test/jetty-base/lib/logging/logback-core-1.5.19.jar b/src/test/jetty-base/lib/logging/logback-core-1.5.32.jar
similarity index 57%
rename from src/test/jetty-base/lib/logging/logback-core-1.5.19.jar
rename to src/test/jetty-base/lib/logging/logback-core-1.5.32.jar
index fa5d7f7..553324d 100644
Binary files a/src/test/jetty-base/lib/logging/logback-core-1.5.19.jar and b/src/test/jetty-base/lib/logging/logback-core-1.5.32.jar differ
diff --git a/src/test/jetty-base/start.d/http-config.ini b/src/test/jetty-base/start.d/http-config.ini
new file mode 100644
index 0000000..a9968cc
--- /dev/null
+++ b/src/test/jetty-base/start.d/http-config.ini
@@ -0,0 +1 @@
+jetty.httpConfig.redirectUriCompliance=DEFAULT,FRAGMENT

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