This is an automated email from the ASF dual-hosted git repository. ilgrosso pushed a commit to branch 3_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 2c8c73d50dcc18abfd5abbd73aaab69338bafbe4 Author: Francesco Chicchiriccò <[email protected]> AuthorDate: Tue Feb 4 08:15:28 2025 +0100 Upgrading cargo-maven3-plugin --- .../client/console/pages/{pages => }/BasePage_fr_CA.properties | 0 .../console/pages/{pages => }/Dashboard_fr_CA.properties | 0 .../client/console/pages/{pages => }/Login_fr_CA.properties | 0 .../client/console/pages/{pages => }/Logs_fr_CA.properties | 0 .../pages/{pages => }/MustChangePassword_fr_CA.properties | 0 .../console/pages/{pages => }/Notifications_fr_CA.properties | 0 .../console/pages/{pages => }/Parameters_fr_CA.properties | 0 .../client/console/pages/{pages => }/Policies_fr_CA.properties | 0 .../client/console/pages/{pages => }/Realms_fr_CA.properties | 0 .../client/console/pages/{pages => }/Reports_fr_CA.properties | 0 .../client/console/pages/{pages => }/Security_fr_CA.properties | 0 .../client/console/pages/{pages => }/Types_fr_CA.properties | 0 .../java/org/apache/syncope/fit/core/LinkedAccountITCase.java | 10 ++-------- pom.xml | 2 +- 14 files changed, 3 insertions(+), 9 deletions(-) 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 c9214e526c..3614279ef0 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 @@ -312,6 +312,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); @@ -378,14 +380,6 @@ public class LinkedAccountITCase extends AbstractITCase { assertEquals(1, task.getExecutions().size()); assertEquals(ExecStatus.SUCCESS.name(), task.getExecutions().get(0).getStatus()); - if (IS_EXT_SEARCH_ENABLED) { - try { - Thread.sleep(2000); - } catch (InterruptedException ex) { - // ignore - } - } - await().until(() -> TASK_SERVICE.search( new TaskQuery.Builder(TaskType.PROPAGATION).resource(RESOURCE_NAME_REST) .anyTypeKind(AnyTypeKind.USER).entityKey(user.getKey()).build()).getTotalCount() == 3); diff --git a/pom.xml b/pom.xml index dad21ba799..df60879bda 100644 --- a/pom.xml +++ b/pom.xml @@ -1711,7 +1711,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>
