[syncope] branch 3_0_X updated: Upgrading Elasticsearch

[ilgrosso]

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


The following commit(s) were added to refs/heads/3_0_X by this push:
     new 66e5fef431 Upgrading Elasticsearch
66e5fef431 is described below

commit 66e5fef4317957f281827821a5155d52e5a2c3c5
Author: Francesco Chicchiriccò <ilgro...@apache.org>
AuthorDate: Tue May 2 17:23:27 2023 +0200

    Upgrading Elasticsearch
---
 .../apache/syncope/fit/core/PullTaskITCase.java    | 24 ++++++++++++++++++++++
 pom.xml                                            |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

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 de0a6fcd2b..b3b8df87cc 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
@@ -421,6 +421,14 @@ public class PullTaskITCase extends AbstractTaskITCase {
         PullTaskTO task = TASK_SERVICE.read(TaskType.PULL, 
"1e419ca4-ea81-4493-a14f-28b90113686d", false);
         assertEquals(SyncopeConstants.ROOT_REALM, task.getDestinationRealm());
 
+        if (IS_ELASTICSEARCH_ENABLED) {
+            try {
+                Thread.sleep(2000);
+            } catch (InterruptedException ex) {
+                // ignore
+            }
+        }
+
         // 2. verify that pulled group is found
         PagedResult<GroupTO> matchingGroups = GROUP_SERVICE.search(new 
AnyQuery.Builder().realm(
                 SyncopeConstants.ROOT_REALM).
@@ -587,6 +595,14 @@ public class PullTaskITCase extends AbstractTaskITCase {
             
assertTrue(connObjectTO.getAttr("LOCATION").get().getValues().get(0).startsWith(prefix));
 
             // 3. unlink any existing printer and delete from Syncope (printer 
is now only on external resource)
+            if (IS_ELASTICSEARCH_ENABLED) {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException ex) {
+                    // ignore
+                }
+            }
+
             PagedResult<AnyObjectTO> matchingPrinters = 
ANY_OBJECT_SERVICE.search(
                     new AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
                             
fiql(SyncopeClient.getAnyObjectSearchConditionBuilder(PRINTER).
@@ -616,6 +632,14 @@ public class PullTaskITCase extends AbstractTaskITCase {
 
             // 5. verify that printer was re-created in Syncope (implies that 
location does not start with given prefix,
             // hence PrefixItemTransformer was applied during pull)
+            if (IS_ELASTICSEARCH_ENABLED) {
+                try {
+                    Thread.sleep(2000);
+                } catch (InterruptedException ex) {
+                    // ignore
+                }
+            }
+
             matchingPrinters = ANY_OBJECT_SERVICE.search(new 
AnyQuery.Builder().realm(SyncopeConstants.ROOT_REALM).
                     
fiql(SyncopeClient.getAnyObjectSearchConditionBuilder(PRINTER).
                             is("location").equalTo("pull*").query()).build());
diff --git a/pom.xml b/pom.xml
index 0f82039570..63dabdd053 100644
--- a/pom.xml
+++ b/pom.xml
@@ -430,7 +430,7 @@ under the License.
 
     <slf4j.version>1.7.36</slf4j.version>
 
-    <elasticsearch.version>8.7.0</elasticsearch.version>
+    <elasticsearch.version>8.7.1</elasticsearch.version>
 
     <log4j2.version>2.20.0</log4j2.version>
     <disruptor.version>3.4.4</disruptor.version>