svn commit: r1879356 - in /jackrabbit/oak/trunk/oak-search-elastic: pom.xml src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriter.java

[fortino]

Author: fortino
Date: Tue Jun 30 06:53:26 2020
New Revision: 1879356

URL: http://svn.apache.org/viewvc?rev=1879356&view=rev
Log:
OAK-9129: bump elastic version to 7.8.0

Modified:
    jackrabbit/oak/trunk/oak-search-elastic/pom.xml
    
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriter.java

Modified: jackrabbit/oak/trunk/oak-search-elastic/pom.xml
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/pom.xml?rev=1879356&r1=1879355&r2=1879356&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-search-elastic/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-search-elastic/pom.xml Tue Jun 30 06:53:26 2020
@@ -33,7 +33,7 @@
   <description>Oak Elasticsearch integration subproject</description>
 
   <properties>
-    <elasticsearch.version>7.7.1</elasticsearch.version>
+    <elasticsearch.version>7.8.0</elasticsearch.version>
     <lucene.version>8.5.1</lucene.version>
   </properties>
 

Modified: 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriter.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriter.java?rev=1879356&r1=1879355&r2=1879356&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriter.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-search-elastic/src/main/java/org/apache/jackrabbit/oak/plugins/index/elastic/index/ElasticIndexWriter.java
 Tue Jun 30 06:53:26 2020
@@ -38,7 +38,7 @@ import org.elasticsearch.client.RequestO
 import org.elasticsearch.client.indices.CreateIndexRequest;
 import org.elasticsearch.client.indices.CreateIndexResponse;
 import org.elasticsearch.client.indices.GetIndexRequest;
-import org.elasticsearch.cluster.metadata.AliasMetaData;
+import org.elasticsearch.cluster.metadata.AliasMetadata;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.unit.ByteSizeValue;
 import org.elasticsearch.common.unit.TimeValue;
@@ -185,7 +185,7 @@ class ElasticIndexWriter implements Full
         // update the mapping
         GetAliasesRequest getAliasesRequest = new 
GetAliasesRequest(indexDefinition.getRemoteIndexAlias());
         GetAliasesResponse aliasesResponse = 
indicesClient.getAlias(getAliasesRequest, RequestOptions.DEFAULT);
-        Map<String, Set<AliasMetaData>> aliases = aliasesResponse.getAliases();
+        Map<String, Set<AliasMetadata>> aliases = aliasesResponse.getAliases();
         IndicesAliasesRequest indicesAliasesRequest = new 
IndicesAliasesRequest();
         for (String oldIndexName : aliases.keySet()) {
             IndicesAliasesRequest.AliasActions removeAction = new 
IndicesAliasesRequest.AliasActions(IndicesAliasesRequest.AliasActions.Type.REMOVE);