[java-idp-integration-tests] branch main updated: Adjust jetty-base for idp-plugin-jetty and bump Jetty to 12.0.23

[Tom Zeller]

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

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

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=694edd88fb9ecd2cbaf2d3977c60b1fc94bdffd6

The following commit(s) were added to refs/heads/main by this push:
     new 694edd8  Adjust jetty-base for idp-plugin-jetty and bump Jetty to 12.0.23
694edd8 is described below

commit 694edd88fb9ecd2cbaf2d3977c60b1fc94bdffd6
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 6 17:21:25 2025 -0500

    Adjust jetty-base for idp-plugin-jetty and bump Jetty to 12.0.23
    
    + change credentials path
    
    + include logging libraries
---
 pom.xml                                                |   6 +++---
 .../net/shibboleth/idp/integration/tests/BaseTest.java |   5 +++++
 .../shibboleth/idp/integration/tests/oidc/RPTest.java  |   5 +++++
 .../jetty-base/lib/logging/logback-classic-1.5.18.jar  | Bin 0 -> 306760 bytes
 .../jetty-base/lib/logging/logback-core-1.5.18.jar     | Bin 0 -> 627250 bytes
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index a786cb4..c3f10d3 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.21</jetty.version>
+        <jetty.version>12.0.23</jetty.version>
         <idp-jetty-base.version>12.0.0-SNAPSHOT</idp-jetty-base.version>
 
         <!-- Tomcat -->
@@ -456,10 +456,10 @@
                                             <artifactId>idp-jetty-base</artifactId>
                                             <version>${idp-jetty-base.version}</version>
                                             <type>tar.gz</type>
-                                            <excludes>jetty-base/webapps/static.xml</excludes>
+                                            <excludes>webapps/static.xml</excludes>
                                         </artifactItem>
                                     </artifactItems>
-                                    <outputDirectory>${test-distributions.directory}</outputDirectory>
+                                    <outputDirectory>${test-distributions.directory}/jetty-base</outputDirectory>
                                 </configuration>
                             </execution>
                         </executions>
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 8a03429..ed1b7dd 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseTest.java
@@ -690,6 +690,11 @@ public abstract class BaseTest {
                 replaceFile(pathToTestbedXML, "org.eclipse.jetty.webapp.WebAppContext",
                         "org.eclipse.jetty.ee9.webapp.WebAppContext");
             }
+
+            // Adjust path to credentials
+            final Path idpIni = pathToJettyBase.resolve(Paths.get("start.d", "idp.ini"));
+            Assert.assertTrue(idpIni.toFile().exists());
+            replaceFile(idpIni, "../credentials", "credentials");
         } else {
             Assert.fail("Unable to find jetty.home");
         }
diff --git a/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPTest.java b/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPTest.java
index 1127da4..9385c5a 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/oidc/RPTest.java
@@ -469,6 +469,11 @@ public class RPTest extends BaseOPTest {
         // Remove testbed webapp
         final Path pathToTestbedXML = pathToOpJettyBase.resolve(Paths.get("webapps", "testbed.xml"));
         pathToTestbedXML.toFile().delete();
+        
+        // Adjust path to credentials
+        final Path idpIni = pathToOpJettyBase.resolve(Paths.get("start.d", "idp.ini"));
+        Assert.assertTrue(idpIni.toFile().exists());
+        replaceFile(idpIni, "../credentials", "credentials");
     }
 
     /**
diff --git a/src/test/jetty-base/lib/logging/logback-classic-1.5.18.jar b/src/test/jetty-base/lib/logging/logback-classic-1.5.18.jar
new file mode 100644
index 0000000..7e99f4e
Binary files /dev/null and b/src/test/jetty-base/lib/logging/logback-classic-1.5.18.jar differ
diff --git a/src/test/jetty-base/lib/logging/logback-core-1.5.18.jar b/src/test/jetty-base/lib/logging/logback-core-1.5.18.jar
new file mode 100644
index 0000000..fba569c
Binary files /dev/null and b/src/test/jetty-base/lib/logging/logback-core-1.5.18.jar differ

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