This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 4_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 1fb45450cfa4e528f339da9f5cd294b4a11fcc26 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Mon Sep 7 14:13:04 2026 +0200 Reverting maven-surefire-plugin and maven-failsafe-plugin upgrades This reverts commit 15641ce9c07a8d635e21fb61e1ab07559b214e26. --- 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 f3917bc712..8aad15f0ac 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 ffe4922a5e..88084148fd 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 9011ce2fa6..5d62029383 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 9edca44f7c..4eaa38c4ae 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 fc2a848828..7fd20c5fa4 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 73527ceb1b..dae45cfd15 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 334daef736..89145a44f7 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 6524db1610..366497dc59 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 30894d153e..12a40c5e9b 100644 --- a/fit/core-reference/pom.xml +++ b/fit/core-reference/pom.xml @@ -1707,7 +1707,7 @@ under the License. <artifactId>maven-failsafe-plugin</artifactId> <inherited>true</inherited> <configuration> - <skipITs>${skipITs}</skipITs> + <skipTests>${skipTests}</skipTests> </configuration> </plugin> </plugins> @@ -1719,7 +1719,6 @@ under the License. <properties> <skipTests>true</skipTests> - <skipITs>true</skipITs> </properties> <build> @@ -1750,7 +1749,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 79a234389b..b4cdf44164 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 7cdd7394c8..22e0d0b056 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 @@ -541,8 +541,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 9bf60df7f9..32c5c4685e 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 5ca82b8452..49cdd48b47 100644 --- a/fit/wa-reference/pom.xml +++ b/fit/wa-reference/pom.xml @@ -391,12 +391,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 b0d8447a2a..4adfd24f39 100644 --- a/pom.xml +++ b/pom.xml @@ -1871,7 +1871,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> @@ -1881,7 +1881,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> @@ -2494,7 +2494,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>
