[java-idp-integration-tests] branch main updated: Attempt to fix OP Conformance Suite tests by using Compose V2

Codeberg noreply at shibboleth.net
Mon Dec 8 20:08:20 UTC 2025


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/151bbb9c231b1a49ee985f94b679a5e29d7a1a69

The following commit(s) were added to refs/heads/main by this push:
     new 151bbb9  Attempt to fix OP Conformance Suite tests by using Compose V2
151bbb9 is described below

commit 151bbb9c231b1a49ee985f94b679a5e29d7a1a69
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Sun Dec 7 20:32:23 2025 -0600

    Attempt to fix OP Conformance Suite tests by using Compose V2
    
    instead of Compose V1
---
 .../idp/integration/tests/oidc/ConformanceSuiteContainer.java      | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/oidc/ConformanceSuiteContainer.java b/src/test/java/net/shibboleth/idp/integration/tests/oidc/ConformanceSuiteContainer.java
index aaac3d6..1c46b02 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/oidc/ConformanceSuiteContainer.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/oidc/ConformanceSuiteContainer.java
@@ -17,7 +17,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.context.Lifecycle;
 import org.springframework.util.FileSystemUtils;
-import org.testcontainers.containers.DockerComposeContainer;
+import org.testcontainers.containers.ComposeContainer;
 import org.testcontainers.containers.wait.strategy.Wait;
 import org.testng.Assert;
 
@@ -49,7 +49,7 @@ public class ConformanceSuiteContainer extends AbstractIdentifiableInitializable
 
     /** The Docker container. */
     @NonnullAfterInit
-    public DockerComposeContainer<?> container;
+    public ComposeContainer container;
 
     /** Path to 'conformance-suite' directory */
     protected Path pathToConformanceSuite;
@@ -120,7 +120,7 @@ public class ConformanceSuiteContainer extends AbstractIdentifiableInitializable
         }
 
         // TODO does wait here work properly ?
-        container = new DockerComposeContainer<>(getId(), pathToDockerComposeYML.toFile()) //
+        container = new ComposeContainer(getId(), pathToDockerComposeYML.toFile()) //
                 .withExposedService( //
                         "httpd", //
                         8443, //
@@ -197,6 +197,7 @@ public class ConformanceSuiteContainer extends AbstractIdentifiableInitializable
 
         final String[] commands = new String[] { //
                 "mvn", //
+                "-V", //
                 "clean", //
                 "package", //
                 "-DskipTests", //

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


More information about the commits mailing list