This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 4_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 5349c3f1b864b5497e1f0337c25f6286ade27cfc Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Mon Sep 7 14:17:42 2026 +0200 Reverting maven-surefire-plugin and maven-failsafe-plugin upgrades --- client/idrepo/console/pom.xml | 1 - client/idrepo/enduser/pom.xml | 1 - core/persistence-jpa/pom.xml | 1 - core/self-keymaster-starter/pom.xml | 1 - ext/oidcc4ui/persistence-jpa/pom.xml | 1 - ext/openfga/client-openfga/pom.xml | 1 - ext/saml2sp4ui/persistence-jpa/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 ++--- 15 files changed, 21 insertions(+), 31 deletions(-) diff --git a/client/idrepo/console/pom.xml b/client/idrepo/console/pom.xml index 5c4a71f93d..9045d43aa0 100644 --- a/client/idrepo/console/pom.xml +++ b/client/idrepo/console/pom.xml @@ -289,7 +289,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 63d817a794..a486250555 100644 --- a/client/idrepo/enduser/pom.xml +++ b/client/idrepo/enduser/pom.xml @@ -256,7 +256,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/persistence-jpa/pom.xml b/core/persistence-jpa/pom.xml index 5c43f81158..8430bb3501 100644 --- a/core/persistence-jpa/pom.xml +++ b/core/persistence-jpa/pom.xml @@ -213,7 +213,6 @@ under the License. <action>sql</action> <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 eee9ba126b..ac87607545 100644 --- a/core/self-keymaster-starter/pom.xml +++ b/core/self-keymaster-starter/pom.xml @@ -99,7 +99,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/oidcc4ui/persistence-jpa/pom.xml b/ext/oidcc4ui/persistence-jpa/pom.xml index 7467e6a32f..3eb0dbcf7e 100644 --- a/ext/oidcc4ui/persistence-jpa/pom.xml +++ b/ext/oidcc4ui/persistence-jpa/pom.xml @@ -91,7 +91,6 @@ under the License. <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/ext/openfga/client-openfga/pom.xml b/ext/openfga/client-openfga/pom.xml index 742b9480a2..94c042ae31 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/ext/saml2sp4ui/persistence-jpa/pom.xml b/ext/saml2sp4ui/persistence-jpa/pom.xml index 1c058741f6..8f8f97c1aa 100644 --- a/ext/saml2sp4ui/persistence-jpa/pom.xml +++ b/ext/saml2sp4ui/persistence-jpa/pom.xml @@ -91,7 +91,6 @@ under the License. <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml index e9b900ec24..fbf7f3b2ec 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 fe7c966c34..00233423b3 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1705,7 +1705,7 @@ under the License. <artifactId>maven-failsafe-plugin</artifactId> <inherited>true</inherited> <configuration> - <skipITs>${skipITs}</skipITs> + <skipTests>${skipTests}</skipTests> </configuration> </plugin> </plugins> @@ -1717,7 +1717,6 @@ under the License. <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> @@ -1748,7 +1747,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 aad4352c41..0d68b318d6 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; @@ -223,21 +222,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 f6fb87b9b8..e3e2b9641c 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); @@ -811,7 +805,6 @@ public class PullTaskITCase extends AbstractTaskITCase { } } - @Order(3) @Test public void remediation() { // First of all, clear any potential conflict with existing user / group @@ -898,7 +891,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 c364bde771..17d52b7eb9 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 @@ -539,8 +539,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 72217cafd9..32d013ffa7 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 a0ad6d8785..f41982bb49 100644 --- a/fit/wa-reference/pom.xml +++ b/fit/wa-reference/pom.xml @@ -403,12 +403,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 2dbdfd8157..68c4616260 100644 --- a/pom.xml +++ b/pom.xml @@ -1814,7 +1814,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> @@ -1824,7 +1824,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> @@ -2437,7 +2437,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>
