From 9be0010f4b2c9cdfe33e2b3a4819ca4511628deb Mon Sep 17 00:00:00 2001
From: "marco.spasiano" <marco.spasiano@cnr.it>
Date: Mon, 27 Nov 2023 20:09:58 +0100
Subject: [PATCH] Update revElasticSearch7 to 7.17.13 and FIX
 NoClassDefFoundError on org.elasticsearch.common.xcontent.XContentType

---
 dependencies.gradle                                             | 2 +-
 .../netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dependencies.gradle b/dependencies.gradle
index 4a21be2a5..2ead67b73 100644
--- 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/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java b/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java
index 5afbf51d4..32abdeb9c 100644
--- a/index/es7-persistence/src/main/java/com/netflix/conductor/es7/dao/index/ElasticSearchRestDAOV7.java
+++ b/index/es7-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;