You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2018/11/16 07:25:14 UTC
[syncope] branch master updated: Upgrading Elasticsearch and
CodeMirror
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 7cf7ec1 Upgrading Elasticsearch and CodeMirror
7cf7ec1 is described below
commit 7cf7ec1ae7f1e4129b7d1ae481a9e4376e6d1936
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Fri Nov 16 08:24:38 2018 +0100
Upgrading Elasticsearch and CodeMirror
---
.../syncope/core/provisioning/java/job/ElasticsearchReindex.java | 6 +++---
pom.xml | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java b/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
index d098a99..9a0159f 100644
--- a/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
+++ b/ext/elasticsearch/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/job/ElasticsearchReindex.java
@@ -32,10 +32,10 @@ import org.apache.syncope.ext.elasticsearch.client.ElasticsearchUtils;
import org.elasticsearch.action.admin.indices.create.CreateIndexRequest;
import org.elasticsearch.action.admin.indices.create.CreateIndexResponse;
import org.elasticsearch.action.admin.indices.delete.DeleteIndexRequest;
-import org.elasticsearch.action.admin.indices.delete.DeleteIndexResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.index.IndexResponse;
+import org.elasticsearch.action.support.master.AcknowledgedResponse;
import org.elasticsearch.client.Client;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
@@ -72,11 +72,11 @@ public class ElasticsearchReindex extends AbstractSchedTaskJobDelegate {
exists(new IndicesExistsRequest(AuthContextUtils.getDomain().toLowerCase())).
get();
if (existsIndexResponse.isExists()) {
- DeleteIndexResponse deleteIndexResponse = client.admin().indices().
+ AcknowledgedResponse acknowledgedResponse = client.admin().indices().
delete(new DeleteIndexRequest(AuthContextUtils.getDomain().toLowerCase())).
get();
LOG.debug("Successfully removed {}: {}",
- AuthContextUtils.getDomain().toLowerCase(), deleteIndexResponse);
+ AuthContextUtils.getDomain().toLowerCase(), acknowledgedResponse);
}
XContentBuilder settings = XContentFactory.jsonBuilder().
diff --git a/pom.xml b/pom.xml
index 31a0e83..38a1d77 100644
--- a/pom.xml
+++ b/pom.xml
@@ -415,7 +415,7 @@ under the License.
<slf4j.version>1.7.25</slf4j.version>
<opensaml.version>3.3.0</opensaml.version>
- <elasticsearch.version>6.4.3</elasticsearch.version>
+ <elasticsearch.version>6.5.0</elasticsearch.version>
<log4j.version>2.11.1</log4j.version>
<disruptor.version>3.4.2</disruptor.version>
@@ -457,7 +457,7 @@ under the License.
<font-awesome.filename>font-awesome.min.css</font-awesome.filename>
<ionicons.version>2.0.1</ionicons.version>
<highlightjs.version>9.8.0</highlightjs.version>
- <codemirror.version>5.40.2</codemirror.version>
+ <codemirror.version>5.41.0</codemirror.version>
<googlediffmatchpath.version>20121119-1</googlediffmatchpath.version>
<jsplumb.version>2.0.7</jsplumb.version>
<chartjs.version>1.0.2</chartjs.version>
@@ -2331,7 +2331,7 @@ under the License.
<link>https://docs.spring.io/spring-security/site/docs/5.0.x/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.4.3/index.html</link>
+ <link>https://artifacts.elastic.co/javadoc/org/elasticsearch/elasticsearch/6.5.0/index.html</link>
<link>http://docs.swagger.io/swagger-core/v2.0.5/apidocs/</link>
</links>
</configuration>