Merge pull request #303 from mspasiano/main

Update revElasticSearch7 to 7.17.13 and FIX NoClassDefFoundError on o…
Netflix · Dec 4, 2023 · 7e1b912 · 7e1b912
2 parents 7a3f482 + 9be0010
commit 7e1b912
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -12,7 +12,7 @@ ext {
     revCommonsIo = '2.7'
     revCuratorRecipes = '5.4.0'
     revCuratorTest = '5.4.0'
-    revElasticSearch7 = '7.6.2'
+    revElasticSearch7 = '7.17.13'
     revEmbeddedRedis = '0.6'
     revEurekaClient = '1.10.10'
     revGrpc = '1.57.+'

diff --git a/...persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java b/...persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java
@@ -44,7 +44,6 @@
 import org.elasticsearch.client.*;
 import org.elasticsearch.client.core.CountRequest;
 import org.elasticsearch.client.core.CountResponse;
-import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;
@@ -53,6 +52,7 @@
 import org.elasticsearch.search.builder.SearchSourceBuilder;
 import org.elasticsearch.search.sort.FieldSortBuilder;
 import org.elasticsearch.search.sort.SortOrder;
+import org.elasticsearch.xcontent.XContentType;
 import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;