chore(deps): bump elasticsearch from 7.13.4 to 7.17.6
MODIFY
common/es/src/main/java/io/apiman/common/es/util/AbstractClientFactory.java
common/es/src/main/java/io/apiman/common/es/util/AbstractClientFactory.java
@@ -38,8 +38,8 @@ import org.elasticsearch.client.RestHighLevelClient;
import org.elasticsearch.client.indices.CreateIndexRequest;
import org.elasticsearch.client.indices.CreateIndexResponse;
import org.elasticsearch.client.indices.GetIndexRequest;
-import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.xcontent.XContentType;
/**
* Base class for client factories. Provides caching of clients.

MODIFY
common/es/src/main/java/io/apiman/common/es/util/EsConnectionPoller.java
common/es/src/main/java/io/apiman/common/es/util/EsConnectionPoller.java
@@ -31,13 +31,12 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.net.ssl.SSLException;
-import org.apache.commons.lang3.Validate;
import org.elasticsearch.ElasticsearchException;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthRequest;
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.core.TimeValue;
/**
* Poll Elasticsearch to see whether a successful healthy connection can be established.

MODIFY
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsCacheStoreComponent.java
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsCacheStoreComponent.java
@@ -40,7 +40,7 @@ import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
import static io.apiman.gateway.engine.storage.util.BackingStoreUtil.JSON_MAPPER;

MODIFY
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsMetrics.java
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsMetrics.java
@@ -51,7 +51,7 @@ import org.elasticsearch.action.bulk.BulkResponse;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.client.RequestOptions;
import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
import static io.apiman.common.es.util.builder.index.EsIndexUtils.BOOL_PROP;
import static io.apiman.common.es.util.builder.index.EsIndexUtils.DATE_PROP;

MODIFY
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsRateLimiterComponent.java
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsRateLimiterComponent.java
@@ -34,8 +34,8 @@ import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.action.index.IndexResponse;
import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.rest.RestStatus;
+import org.elasticsearch.xcontent.XContentType;
import static io.apiman.common.es.util.builder.index.EsIndexUtils.KEYWORD_PROP;
import static io.apiman.common.es.util.builder.index.EsIndexUtils.LONG_PROP;

MODIFY
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsRegistry.java
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsRegistry.java
@@ -35,10 +35,14 @@ import io.apiman.gateway.engine.beans.exceptions.NoContractFoundException;
import io.apiman.gateway.engine.beans.exceptions.PublishingException;
import io.apiman.gateway.engine.beans.exceptions.RegistrationException;
import io.apiman.gateway.engine.es.i18n.Messages;
+
+import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
+
import org.elasticsearch.action.delete.DeleteRequest;
import org.elasticsearch.action.delete.DeleteResponse;
import org.elasticsearch.action.get.GetRequest;
@@ -49,7 +53,6 @@ import org.elasticsearch.action.search.SearchRequest;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.action.support.WriteRequest;
import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.query.MatchQueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.rest.RestStatus;
@@ -61,9 +64,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders;
import org.elasticsearch.search.aggregations.bucket.terms.ParsedTerms;
import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilder;
import org.elasticsearch.search.builder.SearchSourceBuilder;
-
-import java.io.IOException;
-import java.util.stream.Collectors;
+import org.elasticsearch.xcontent.XContentType;
import static io.apiman.gateway.engine.storage.util.BackingStoreUtil.JSON_MAPPER;

MODIFY
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsSharedStateComponent.java
gateway/engine/es/src/main/java/io/apiman/gateway/engine/es/EsSharedStateComponent.java
@@ -26,7 +26,6 @@ import io.apiman.gateway.engine.storage.util.BackingStoreUtil;
import java.util.HashMap;
import java.util.Map;
-
import javax.xml.namespace.QName;
import org.apache.commons.codec.binary.Base64;
@@ -35,7 +34,7 @@ import org.elasticsearch.action.get.GetRequest;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.index.IndexRequest;
import org.elasticsearch.client.RequestOptions;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.xcontent.XContentType;
import static io.apiman.common.es.util.builder.index.EsIndexUtils.KEYWORD_PROP;
import static io.apiman.common.es.util.builder.index.EsIndexUtils.TEXT_AND_KEYWORD_PROP_256;

MODIFY
parent/pom.xml
parent/pom.xml
<version.org.agrona>1.16.0</version.org.agrona>
<version.org.eclipse.jetty>9.4.41.v20210516</version.org.eclipse.jetty>
<version.org.glassfish.javax.el>3.0.0</version.org.glassfish.javax.el>
- <version.org.elasticsearch>7.13.4</version.org.elasticsearch>
+ <version.org.elasticsearch>7.17.6</version.org.elasticsearch>
<version.org.hamcrest>1.3</version.org.hamcrest>
<version.org.hibernate>5.3.20.Final</version.org.hibernate> <!-- Pin to WildFly version -->
<version.org.infinispan>8.2.12.Final</version.org.infinispan>

chore(deps): bump elasticsearch from 7.13.4 to 7.17.6