This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 3c1eff92f45d4f2d77024597aaaea4495fd48d12 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Mon Sep 7 13:57:34 2026 +0200 Reverting maven-surefire-plugin and maven-failsafe-plugin upgrades This reverts commit 8158df6b8b4c076f7c3d247242d8271535d3772f. --- client/idrepo/console/pom.xml | 1 - client/idrepo/enduser/pom.xml | 1 - core/self-keymaster-starter/pom.xml | 1 - ext/openfga/client-openfga/pom.xml | 1 - fit/console-reference/pom.xml | 5 ++++- fit/core-reference/pom.xml | 4 +--- .../src/test/java/org/apache/syncope/fit/core/JWTITCase.java | 11 ++++++----- .../test/java/org/apache/syncope/fit/core/PullTaskITCase.java | 8 -------- .../src/test/java/org/apache/syncope/fit/core/UserITCase.java | 2 -- fit/enduser-reference/pom.xml | 5 ++++- fit/wa-reference/pom.xml | 5 ++++- pom.xml | 5 ++--- 12 files changed, 21 insertions(+), 28 deletions(-) diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml index 3f947375d1..fc32d1628e 100644 --- a/client/idrepo/console/pom.xml +++ b/client/idrepo/console/pom.xml @@ -296,7 +296,6 @@ under the License. <properties> <maven.build.cache.skipCache>true</maven.build.cache.skipCache> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml index 1b35920111..e1369bd413 100644 --- a/client/idrepo/enduser/pom.xml +++ b/client/idrepo/enduser/pom.xml @@ -267,7 +267,6 @@ under the License. <properties> <maven.build.cache.skipCache>true</maven.build.cache.skipCache> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/core/self-keymaster-starter/pom.xml b/core/self-keymaster-starter/pom.xml index 457ed80b24..c93954bb40 100644 --- a/core/self-keymaster-starter/pom.xml +++ b/core/self-keymaster-starter/pom.xml @@ -100,7 +100,6 @@ under the License. <properties> <maven.build.cache.skipCache>true</maven.build.cache.skipCache> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <dependencies> diff --git a/ext/openfga/client-openfga/pom.xml b/ext/openfga/client-openfga/pom.xml index c35524868c..d73dfde815 100644 --- a/ext/openfga/client-openfga/pom.xml +++ b/ext/openfga/client-openfga/pom.xml @@ -35,7 +35,6 @@ under the License. <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> <rootpom.basedir>${basedir}/../../..</rootpom.basedir> </properties> diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml index a8f36e302e..2bba07bfe3 100644 --- a/fit/console-reference/pom.xml +++ b/fit/console-reference/pom.xml @@ -211,12 +211,15 @@ under the License. </build> <profiles> + <profile> + <id>skipTests</id> + </profile> + <profile> <id>debug</id> <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/fit/core-reference/pom.xml b/fit/core-reference/pom.xml index 9d9ee0a4dc..c9afec91c0 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1723,7 +1723,7 @@ under the License. <artifactId>maven-failsafe-plugin</artifactId> <inherited>true</inherited> <configuration> - <skipITs>${skipITs}</skipITs> + <skipTests>${skipTests}</skipTests> </configuration> </plugin> </plugins> @@ -1735,7 +1735,6 @@ under the License. <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> @@ -1766,7 +1765,6 @@ under the License. <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java index 227100bbce..b77027f636 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/JWTITCase.java @@ -18,7 +18,6 @@ */ package org.apache.syncope.fit.core; -import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotEquals; @@ -225,21 +224,23 @@ public class JWTITCase extends AbstractITCase { @Test public void expiredToken() throws ParseException, JOSEException { // Get an initial token - UserCR userCR = UserITCase.getUniqueSample("[email protected]"); - assertDoesNotThrow(() -> createUser(userCR)); - SyncopeClient localClient = CLIENT_FACTORY.create(userCR.getUsername(), userCR.getPassword()); + SyncopeClient localClient = CLIENT_FACTORY.create(ADMIN_UNAME, ADMIN_PWD); AccessTokenService accessTokenService = localClient.getService(AccessTokenService.class); Response response = accessTokenService.login(); String token = response.getHeaderString(RESTHeaders.TOKEN); assertNotNull(token); SignedJWT jwt = SignedJWT.parse(token); + String tokenId = jwt.getJWTClaimsSet().getJWTID(); // Create a new token using the Id of the first token Date currentTime = new Date(); - JWTClaimsSet.Builder claimsSet = new JWTClaimsSet.Builder(jwt.getJWTClaimsSet()). + JWTClaimsSet.Builder claimsSet = new JWTClaimsSet.Builder(). + jwtID(tokenId). + subject(ADMIN_UNAME). issueTime(currentTime). + issuer(JWT_ISSUER). expirationTime(new Date(currentTime.getTime() - 5000L)). notBeforeTime(currentTime); jwt = new SignedJWT(new JWSHeader(JWS_SIGNER.getJwsAlgorithm()), claimsSet.build()); diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java index 959d015e5d..ae62a23f22 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/PullTaskITCase.java @@ -119,14 +119,10 @@ import org.identityconnectors.framework.common.objects.AttributeUtil; import org.identityconnectors.framework.common.objects.Name; import org.identityconnectors.framework.common.objects.Uid; import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.MethodOrderer.OrderAnnotation; -import org.junit.jupiter.api.Order; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.TestMethodOrder; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.jdbc.core.JdbcTemplate; -@TestMethodOrder(OrderAnnotation.class) public class PullTaskITCase extends AbstractTaskITCase { private static final String LDAP_PULL_TASK = "1e419ca4-ea81-4493-a14f-28b90113686d"; @@ -243,7 +239,6 @@ public class PullTaskITCase extends AbstractTaskITCase { assertEquals(groupTemplate, task.getTemplates().get(AnyTypeKind.GROUP.name())); } - @Order(1) @Test public void fromCSV() throws Exception { assumeFalse(IS_EXT_SEARCH_ENABLED); @@ -413,7 +408,6 @@ public class PullTaskITCase extends AbstractTaskITCase { } } - @Order(2) @Test public void reconcileFromLDAP() { assumeFalse(IS_NEO4J_PERSISTENCE); @@ -785,7 +779,6 @@ public class PullTaskITCase extends AbstractTaskITCase { } } - @Order(3) @Test public void remediation() { // First of all, clear any potential conflict with existing user / group @@ -872,7 +865,6 @@ public class PullTaskITCase extends AbstractTaskITCase { } } - @Order(4) @Test public void remediationSinglePull() throws IOException { // First of all, clear any potential conflict with existing user / group diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java index 1dfe9a61ca..52b30c9665 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/UserITCase.java @@ -540,8 +540,6 @@ public class UserITCase extends AbstractITCase { @Test public void updateSamePassword() { - assumeFalse(IS_NEO4J_PERSISTENCE); - assertThrows(SyncopeClientException.class, () -> { UserCR userCR = getUniqueSample("[email protected]"); userCR.setRealm("/even/two"); diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index 0cd8017d9b..ffcd247aa4 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -212,12 +212,15 @@ under the License. </build> <profiles> + <profile> + <id>skipTests</id> + </profile> + <profile> <id>debug</id> <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/fit/wa-reference/pom.xml b/fit/wa-reference/pom.xml index b2721d3883..bf23965f16 100644 --- a/fit/wa-reference/pom.xml +++ b/fit/wa-reference/pom.xml @@ -393,12 +393,15 @@ under the License. </build> <profiles> + <profile> + <id>skipTests</id> + </profile> + <profile> <id>debug</id> <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/pom.xml b/pom.xml index 6100b7fa30..3b39a2c8e1 100644 --- a/pom.xml +++ b/pom.xml @@ -1799,7 +1799,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>3.6.0</version> + <version>3.5.6</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <encoding>utf-8</encoding> @@ -1809,7 +1809,7 @@ under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-failsafe-plugin</artifactId> - <version>3.6.0</version> + <version>3.5.6</version> <configuration> <redirectTestOutputToFile>true</redirectTestOutputToFile> <runOrder>alphabetical</runOrder> @@ -2423,7 +2423,6 @@ under the License. <properties> <maven.build.cache.skipCache>true</maven.build.cache.skipCache> <skipTests>true</skipTests> - <skipITs>true</skipITs> <ianal.phase>none</ianal.phase> <modernizer.skip>true</modernizer.skip> <rat.skip>true</rat.skip>
