Merge pull request #1116 from aimansharief/R8.0.0-ESU

Issue #SBCOSS-00 : Updated Elasticsearch version and its related configs compatible to 7.10.2

Author: pallakartheekreddy

search-api/search-core/pom.xml

@@ -36,7 +36,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.5.2</version>
+            <version>4.5.10</version>
         </dependency>
         <dependency>
             <groupId>javax.xml</groupId>
@@ -56,7 +56,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpmime</artifactId>
-            <version>4.5.2</version>
+            <version>4.5.10</version>
         </dependency>
         <dependency>
             <groupId>net.sf.json-lib</groupId>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>
-            <version>7.17.13</version>
+            <version>7.10.2</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.yaml</groupId>

search-api/search-core/src/main/java/org/sunbird/search/client/ElasticSearchUtil.java

@@ -35,7 +35,7 @@
 import org.elasticsearch.action.update.UpdateRequest;
 import org.elasticsearch.action.update.UpdateResponse;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.xcontent.XContentType;
+import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.index.query.BoolQueryBuilder;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.index.query.QueryBuilders;