This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch issue/SLING-13008 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-auth-oauth-client.git
commit abcd85a07ce326963c864b854c6bc178cb2a2a1c Author: Robert Munteanu <[email protected]> AuthorDate: Fri Nov 21 15:31:05 2025 +0100 SLING-13008 - Update to test containers 2.0.2 - switch to latest testcontainers dependency versions - remove workaround needed by old testcontainers version - pin some transitive dependencies for compatibility - remove accidental JUnit 4 API usage - use keycloak container version as required by latest libraries --- pom.xml | 37 ++++++++++++---------- .../auth/oauth_client/AuthorizationCodeFlowIT.java | 2 +- .../impl/OAuthEntryPointServletTest.java | 2 +- .../impl/OidcAuthenticationHandlerTest.java | 2 +- .../impl/SlingLoginCookieManagerTest.java | 2 +- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/pom.xml b/pom.xml index bcd5334..9d55eea 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,13 @@ <artifactId>slf4j-api</artifactId> <scope>provided</scope> </dependency> + <dependency> + <groupId>commons-codec</groupId> + <artifactId>commons-codec</artifactId> + <version>1.17.2</version> + <!-- version from Starter 13--> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.apache.jackrabbit</groupId> <artifactId>oak-jackrabbit-api</artifactId> @@ -138,25 +145,32 @@ <dependency> <groupId>org.testcontainers</groupId> <artifactId>testcontainers</artifactId> - <version>1.17.6</version> + <version>2.0.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.testcontainers</groupId> - <artifactId>junit-jupiter</artifactId> - <version>1.17.6</version> + <artifactId>testcontainers-junit-jupiter</artifactId> + <version>2.0.2</version> + <scope>test</scope> + </dependency> + <!-- transitive test dep of test-containers, override old one brought in by the sling testing clients--> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.19.0</version> <scope>test</scope> </dependency> <dependency> <groupId>com.github.dasniko</groupId> <artifactId>testcontainers-keycloak</artifactId> - <version>2.4.0</version> + <version>4.0.0</version> <scope>test</scope> </dependency> <dependency> - <groupId>com.redis.testcontainers</groupId> + <groupId>com.redis</groupId> <artifactId>testcontainers-redis</artifactId> - <version>1.5.0</version> + <version>2.2.4</version> <scope>test</scope> </dependency> <dependency> @@ -270,22 +284,11 @@ <groupId>biz.aQute.bnd</groupId> <artifactId>bnd-maven-plugin</artifactId> </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <systemPropertyVariables> - <!-- workaround for https://github.com/testcontainers/testcontainers-java/issues/11212 --> - <api.version>1.44</api.version> - </systemPropertyVariables> - </configuration> - </plugin> <plugin> <artifactId>maven-failsafe-plugin</artifactId> <configuration> <systemPropertyVariables> <sling.http.port>${http.port}</sling.http.port> - <!-- workaround for https://github.com/testcontainers/testcontainers-java/issues/11212 --> - <api.version>1.44</api.version> </systemPropertyVariables> </configuration> <executions> diff --git a/src/test/java/org/apache/sling/auth/oauth_client/AuthorizationCodeFlowIT.java b/src/test/java/org/apache/sling/auth/oauth_client/AuthorizationCodeFlowIT.java index 732e803..b48b590 100644 --- a/src/test/java/org/apache/sling/auth/oauth_client/AuthorizationCodeFlowIT.java +++ b/src/test/java/org/apache/sling/auth/oauth_client/AuthorizationCodeFlowIT.java @@ -120,7 +120,7 @@ class AuthorizationCodeFlowIT { // this is most usually done in an IDE, with both Keycloak and Sling running String existingKeyCloakUrl = System.getenv("KEYCLOAK_URL"); if (existingKeyCloakUrl == null) { - keycloak = new KeycloakContainer("quay.io/keycloak/keycloak:20.0.3") + keycloak = new KeycloakContainer("quay.io/keycloak/keycloak:26.4") .withRealmImportFile("keycloak-import/sling.json"); keycloak.start(); keycloakPort = keycloak.getHttpPort(); diff --git a/src/test/java/org/apache/sling/auth/oauth_client/impl/OAuthEntryPointServletTest.java b/src/test/java/org/apache/sling/auth/oauth_client/impl/OAuthEntryPointServletTest.java index bc7cda0..ce15b62 100644 --- a/src/test/java/org/apache/sling/auth/oauth_client/impl/OAuthEntryPointServletTest.java +++ b/src/test/java/org/apache/sling/auth/oauth_client/impl/OAuthEntryPointServletTest.java @@ -36,7 +36,7 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertThrows; +import static org.junit.jupiter.api.Assertions.assertThrows; @ExtendWith(SlingContextExtension.class) class OAuthEntryPointServletTest { diff --git a/src/test/java/org/apache/sling/auth/oauth_client/impl/OidcAuthenticationHandlerTest.java b/src/test/java/org/apache/sling/auth/oauth_client/impl/OidcAuthenticationHandlerTest.java index 781c782..9c2b0f8 100644 --- a/src/test/java/org/apache/sling/auth/oauth_client/impl/OidcAuthenticationHandlerTest.java +++ b/src/test/java/org/apache/sling/auth/oauth_client/impl/OidcAuthenticationHandlerTest.java @@ -56,7 +56,7 @@ import org.apache.sling.auth.oauth_client.spi.OidcAuthCredentials; import org.apache.sling.auth.oauth_client.spi.UserInfoProcessor; import org.apache.sling.commons.crypto.CryptoService; import org.apache.sling.jcr.resource.api.JcrResourceConstants; -import org.apache.sling.testing.mock.osgi.junit.OsgiContext; +import org.apache.sling.testing.mock.osgi.junit5.OsgiContext; import org.apache.sling.testing.mock.osgi.junit5.OsgiContextExtension; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse; diff --git a/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingLoginCookieManagerTest.java b/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingLoginCookieManagerTest.java index 35e7eaa..7836b45 100644 --- a/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingLoginCookieManagerTest.java +++ b/src/test/java/org/apache/sling/auth/oauth_client/impl/SlingLoginCookieManagerTest.java @@ -29,7 +29,7 @@ import java.util.Base64; import org.apache.sling.auth.core.spi.AuthenticationInfo; import org.apache.sling.auth.oauth_client.spi.OidcAuthCredentials; import org.apache.sling.jcr.resource.api.JcrResourceConstants; -import org.apache.sling.testing.mock.osgi.junit.OsgiContext; +import org.apache.sling.testing.mock.osgi.junit5.OsgiContext; import org.apache.sling.testing.mock.osgi.junit5.OsgiContextExtension; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest; import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse;
