From eef6b198dd8880004fbc7620160b38b22fbabe79 Mon Sep 17 00:00:00 2001
From: Barzilai Spinak <barspi@transactility.com>
Date: Tue, 14 Dec 2021 17:02:48 -0300
Subject: [PATCH] Upgrade elasticsearch to 7.16.1 with workaround for log4j bug

---
 libraries.gradle                                       |  2 +-
 .../org/jpos/elasticsearch/ElasticSearchService.java   | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/libraries.gradle b/libraries.gradle
index b605d34cf9..d58a50c968 100644
--- a/libraries.gradle
+++ b/libraries.gradle
@@ -23,7 +23,7 @@ ext {
     postgresJDBCVersion = '42.2.11'
     flywaydbVersion = '6.0.4'
     liquibaseVersion = '3.8.0'
-    elkVersion = '7.8.0'
+    elkVersion = '7.16.1'
     orgjsonVersion = '20200518'
     postgresqlEmbeddedVersion = '1.2.8'
     postgresqlBinVersion = '12.3.0'
diff --git a/modules/elasticsearch/src/main/java/org/jpos/elasticsearch/ElasticSearchService.java b/modules/elasticsearch/src/main/java/org/jpos/elasticsearch/ElasticSearchService.java
index 314861a59f..3b313f3030 100644
--- a/modules/elasticsearch/src/main/java/org/jpos/elasticsearch/ElasticSearchService.java
+++ b/modules/elasticsearch/src/main/java/org/jpos/elasticsearch/ElasticSearchService.java
@@ -23,6 +23,7 @@
 import org.apache.http.auth.UsernamePasswordCredentials;
 import org.apache.http.client.CredentialsProvider;
 import org.apache.http.impl.client.BasicCredentialsProvider;
+
 import org.elasticsearch.action.bulk.BulkRequest;
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.action.index.IndexRequest;
@@ -30,10 +31,11 @@
 import org.elasticsearch.client.RestClient;
 import org.elasticsearch.client.RestClientBuilder;
 import org.elasticsearch.client.RestHighLevelClient;
-import org.elasticsearch.common.unit.TimeValue;
-import org.elasticsearch.common.xcontent.XContentBuilder;
-import org.elasticsearch.common.xcontent.XContentFactory;
-import org.elasticsearch.common.xcontent.XContentType;
+import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.xcontent.XContentBuilder;
+import org.elasticsearch.xcontent.XContentFactory;
+import org.elasticsearch.xcontent.XContentType;
+
 import org.jpos.core.Configuration;
 import org.jpos.core.ConfigurationException;
 import org.jpos.q2.QBeanSupport;