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
The following commit(s) were added to refs/heads/master by this push: new 8d7849c Upgrading Elasticsearch client 8d7849c is described below commit 8d7849c86d3f49e422ab78765081d03f5ba6e201 Author: Francesco Chicchiriccò <ilgro...@apache.org> AuthorDate: Wed Mar 27 14:05:24 2019 +0100 Upgrading Elasticsearch client --- .../test/java/org/apache/syncope/fit/core/MembershipITCase.java | 8 ++++++++ .../test/java/org/apache/syncope/fit/core/MultitenancyITCase.java | 8 ++++++++ pom.xml | 4 ++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java index eb070d1..e740112 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MembershipITCase.java @@ -54,6 +54,7 @@ import org.apache.syncope.common.lib.types.TaskType; import org.apache.syncope.common.rest.api.beans.AnyQuery; import org.apache.syncope.common.rest.api.service.TaskService; import org.apache.syncope.fit.AbstractITCase; +import org.apache.syncope.fit.ElasticsearchDetector; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.jdbc.core.JdbcTemplate; @@ -282,6 +283,13 @@ public class MembershipITCase extends AbstractITCase { assertEquals(ExecStatus.SUCCESS, ExecStatus.valueOf(execution.getStatus())); // 5. verify that pulled user has + if (ElasticsearchDetector.isElasticSearchEnabled(syncopeService)) { + try { + Thread.sleep(2000); + } catch (InterruptedException ex) { + // ignore + } + } PagedResult<UserTO> users = userService.search(new AnyQuery.Builder(). realm("/"). fiql(SyncopeClient.getUserSearchConditionBuilder(). diff --git a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java index 812f02e..04a4cfb 100644 --- a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java +++ b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/MultitenancyITCase.java @@ -71,6 +71,7 @@ import org.apache.syncope.common.rest.api.service.TaskService; import org.apache.syncope.common.rest.api.service.UserSelfService; import org.apache.syncope.common.rest.api.service.UserService; import org.apache.syncope.fit.AbstractITCase; +import org.apache.syncope.fit.ElasticsearchDetector; import org.identityconnectors.framework.common.objects.ObjectClass; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; @@ -228,6 +229,13 @@ public class MultitenancyITCase extends AbstractITCase { assertEquals(ExecStatus.SUCCESS, ExecStatus.valueOf(status)); // verify that pulled user is found + if (ElasticsearchDetector.isElasticSearchEnabled(syncopeService)) { + try { + Thread.sleep(2000); + } catch (InterruptedException ex) { + // ignore + } + } PagedResult<UserTO> matchingUsers = adminClient.getService(UserService.class).search(new AnyQuery.Builder(). realm(SyncopeConstants.ROOT_REALM). fiql(SyncopeClient.getUserSearchConditionBuilder().is("username").equalTo("pullFromLDAP").query()). diff --git a/pom.xml b/pom.xml index e0ef05c..8bccf62 100644 --- a/pom.xml +++ b/pom.xml @@ -416,7 +416,7 @@ under the License. <slf4j.version>1.7.26</slf4j.version> <opensaml.version>3.3.0</opensaml.version> - <elasticsearch.version>6.6.2</elasticsearch.version> + <elasticsearch.version>6.7.0</elasticsearch.version> <apacheds.version>2.0.0.AM25</apacheds.version> <apachedirapi.version>2.0.0.AM2</apachedirapi.version> @@ -2457,7 +2457,7 @@ under the License. <link>https://docs.spring.io/spring-security/site/docs/current/api/</link> <link>http://www.flowable.org/docs/javadocs/</link> <link>https://build.shibboleth.net/nexus/content/sites/site/java-opensaml/3.3.0/apidocs/</link> - <link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/6.6.2/index.html</link> + <link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/6.7.0/index.html</link> <link>http://docs.swagger.io/swagger-core/v2.0.7/apidocs/</link> </links> </configuration>