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 a093ebef5d35917141eb439a944a4a0b18f7e9d4 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Tue Feb 4 08:15:28 2025 +0100 Upgrading cargo-maven3-plugin --- .../syncope/client/console/pages/{pages => }/BasePage_fr_CA.properties | 0 .../client/console/pages/{pages => }/Dashboard_fr_CA.properties | 0 .../syncope/client/console/pages/{pages => }/Login_fr_CA.properties | 0 .../syncope/client/console/pages/{pages => }/Logs_fr_CA.properties | 0 .../console/pages/{pages => }/MustChangePassword_fr_CA.properties | 0 .../client/console/pages/{pages => }/Notifications_fr_CA.properties | 0 .../client/console/pages/{pages => }/Parameters_fr_CA.properties | 0 .../syncope/client/console/pages/{pages => }/Policies_fr_CA.properties | 0 .../syncope/client/console/pages/{pages => }/Realms_fr_CA.properties | 0 .../syncope/client/console/pages/{pages => }/Reports_fr_CA.properties | 0 .../syncope/client/console/pages/{pages => }/Security_fr_CA.properties | 0 .../syncope/client/console/pages/{pages => }/Types_fr_CA.properties | 0 .../src/test/java/org/apache/syncope/fit/core/LinkedAccountITCase.java | 3 +++ pom.xml | 2 +- 14 files changed, 4 insertions(+), 1 deletion(-) diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/BasePage_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/BasePage_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/BasePage_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Dashboard_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Dashboard_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Dashboard_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Login_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Login_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Login_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Login_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Logs_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Logs_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Logs_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/MustChangePassword_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/MustChangePassword_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/MustChangePassword_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Notifications_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Notifications_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Notifications_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Parameters_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Parameters_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Parameters_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Policies_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Policies_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Policies_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Policies_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Realms_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Realms_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Realms_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Reports_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Reports_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Reports_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Reports_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Security_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Security_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Security_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Security_fr_CA.properties diff --git a/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Types_fr_CA.properties b/client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Types_fr_CA.properties similarity index 100% rename from client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/pages/Types_fr_CA.properties rename to client/idrepo/console/src/main/resources/org/apache/syncope/client/console/pages/Types_fr_CA.properties diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LinkedAccountITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LinkedAccountITCase.java index 86b6a083e3..16f6e21dec 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LinkedAccountITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/LinkedAccountITCase.java @@ -26,6 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; +import static org.junit.jupiter.api.Assumptions.assumeFalse; import com.fasterxml.jackson.databind.node.ObjectNode; import jakarta.ws.rs.core.HttpHeaders; @@ -312,6 +313,8 @@ public class LinkedAccountITCase extends AbstractITCase { @Test public void push() { + assumeFalse(IS_EXT_SEARCH_ENABLED); + // 0a. read configured cipher algorithm in order to be able to restore it at the end of test String origpwdCipherAlgo = confParamOps.get(SyncopeConstants.MASTER_DOMAIN, "password.cipher.algorithm", null, String.class); diff --git a/pom.xml b/pom.xml index d853d8ecf1..44280251e3 100644 --- a/pom.xml +++ b/pom.xml @@ -1651,7 +1651,7 @@ under the License. <plugin> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-maven3-plugin</artifactId> - <version>1.10.16</version> + <version>1.10.17</version> <configuration> <container> <log>${project.build.directory}/log/cargo.log</log>
