[java-idp-integration-tests] branch main updated: Use jetty-home rather than jetty-distribution

[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=52540762b13f5229f46b6df32a73e61e8315899a

The following commit(s) were added to refs/heads/main by this push:
     new 5254076  Use jetty-home rather than jetty-distribution
5254076 is described below

commit 52540762b13f5229f46b6df32a73e61e8315899a
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Jan 26 13:14:33 2022 -0600

    Use jetty-home rather than jetty-distribution
    
    Only jetty-home is available for Jetty 10+
---
 pom.xml                                                        | 10 +++++-----
 src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9710b69..9b26474 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
         <idp-jetty-base.version>9.4.1-SNAPSHOT</idp-jetty-base.version>
 
         <!-- Default version of Jetty to be tested -->
-        <jetty.version> 9.4.44.v20210927</jetty.version>
+        <jetty.version>9.4.44.v20210927</jetty.version>
 
         <!-- Tomcat -->
         <idp-tomcat-base.version>8.5.0-SNAPSHOT</idp-tomcat-base.version>
@@ -401,7 +401,7 @@
                 </dependency>
                 <dependency>
                     <groupId>org.eclipse.jetty</groupId>
-                    <artifactId>jetty-distribution</artifactId>
+                    <artifactId>jetty-home</artifactId>
                     <version>${jetty.version}</version>
                     <scope>test</scope>
                     <type>zip</type>
@@ -419,9 +419,9 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-dependency-plugin</artifactId>
                         <executions>
-                            <!-- Unpack jetty-distribution to test-distributions directory. -->
+                            <!-- Unpack jetty-home to test-distributions directory. -->
                             <execution>
-                                <id>unpack-jetty-distribution</id>
+                                <id>unpack-jetty-home</id>
                                 <phase>compile</phase>
                                 <goals>
                                     <goal>unpack</goal>
@@ -430,7 +430,7 @@
                                     <artifactItems>
                                         <artifactItem>
                                             <groupId>org.eclipse.jetty</groupId>
-                                            <artifactId>jetty-distribution</artifactId>
+                                            <artifactId>jetty-home</artifactId>
                                             <version>${jetty.version}</version>
                                             <type>zip</type>
                                         </artifactItem>
diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index 57d4f95..79da553 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -550,7 +550,7 @@ public abstract class BaseIntegrationTest
         Assert.assertTrue(buildPath.toAbsolutePath().toFile().exists(), "Path to build directory not found");
 
         // Path to Jetty distribution
-        try (DirectoryStream<Path> stream = Files.newDirectoryStream(buildPath, "*jetty-distribution-*")) {
+        try (DirectoryStream<Path> stream = Files.newDirectoryStream(buildPath, "*jetty-home-*")) {
             for (Path entry : stream) {
                 pathToJettyHome = entry;
                 break;

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