[java-idp-integration-tests] 02/02: Fix rewrite rules for Jetty 12

[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=907ab3aac6f207c6a5f220655e9dd27decfef006

commit 907ab3aac6f207c6a5f220655e9dd27decfef006
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon Jul 15 16:58:02 2024 -0500

    Fix rewrite rules for Jetty 12
    
    Jetty 11 uses etc/rewrite-rules.xml
    Jetty 12 uses etc/jetty-rewrite-rules.xml
---
 src/test/java/net/shibboleth/idp/integration/tests/oidc/OIDCTest.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/oidc/OIDCTest.java b/src/test/java/net/shibboleth/idp/integration/tests/oidc/OIDCTest.java
index cab9078..51caf4c 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/oidc/OIDCTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/oidc/OIDCTest.java
@@ -325,7 +325,9 @@ public class OIDCTest extends BaseIntegrationTest {
 
             assert pathToSourceRewriteRulesXML.toFile().exists() : "Path to rewrite-rules.xml not found";
 
-            final Path pathToTargetRewriteRulesXML = pathToJettyBase.resolve(Paths.get("etc", "rewrite-rules.xml"));
+            final String rewriteXML = jettyVersion.startsWith("11") ? "rewrite-rules.xml" : "jetty-rewrite-rules.xml";
+
+            final Path pathToTargetRewriteRulesXML = pathToJettyBase.resolve(Paths.get("etc", rewriteXML));
 
             Files.copy(pathToSourceRewriteRulesXML, pathToTargetRewriteRulesXML, StandardCopyOption.REPLACE_EXISTING);
         }

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