From 82116c92246f4da25b12a7d6ec6e822e75ac5883 Mon Sep 17 00:00:00 2001
From: iamazy <1448588084@qq.com>
Date: Thu, 5 Aug 2021 20:44:15 +0800
Subject: [PATCH 1/2] update elasticsearch dependencies version to 7.14.0
---
.../parser/reindex/ReindexQueryParser.java | 2 +-
.../dsl/jdbc/cons/JdbcConstants.java | 2 +-
pom.xml | 41 +++++++++----------
3 files changed, 22 insertions(+), 23 deletions(-)
diff --git a/elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/sql/parser/reindex/ReindexQueryParser.java b/elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/sql/parser/reindex/ReindexQueryParser.java
index 8d13088..f1d9ed4 100644
--- a/elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/sql/parser/reindex/ReindexQueryParser.java
+++ b/elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/sql/parser/reindex/ReindexQueryParser.java
@@ -8,7 +8,7 @@
import org.apache.commons.lang3.StringUtils;
import org.elasticsearch.action.ActionRequestValidationException;
import org.elasticsearch.common.bytes.BytesArray;
-import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.core.TimeValue;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.reindex.ReindexRequest;
import org.elasticsearch.index.reindex.RemoteInfo;
diff --git a/elasticsearch-sql-jdbc/src/main/java/io/github/iamazy/elasticsearch/dsl/jdbc/cons/JdbcConstants.java b/elasticsearch-sql-jdbc/src/main/java/io/github/iamazy/elasticsearch/dsl/jdbc/cons/JdbcConstants.java
index 921cb22..da6fcf3 100644
--- a/elasticsearch-sql-jdbc/src/main/java/io/github/iamazy/elasticsearch/dsl/jdbc/cons/JdbcConstants.java
+++ b/elasticsearch-sql-jdbc/src/main/java/io/github/iamazy/elasticsearch/dsl/jdbc/cons/JdbcConstants.java
@@ -1,6 +1,6 @@
package io.github.iamazy.elasticsearch.dsl.jdbc.cons;
-import org.elasticsearch.common.unit.TimeValue;
+import org.elasticsearch.core.TimeValue;
import org.elasticsearch.search.Scroll;
import java.text.SimpleDateFormat;
diff --git a/pom.xml b/pom.xml
index c92ce80..ce18719 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,27 +152,26 @@
-
-
- org.apache.maven.plugins
- maven-gpg-plugin
- 1.6
-
-
- sign-artifacts
- verify
-
- sign
-
-
-
-
-
- --pinentry-mode
- loopback
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From c6e03ddd251a5dff83305302785cb24884a69b36 Mon Sep 17 00:00:00 2001
From: iamazy <1448588084@qq.com>
Date: Thu, 5 Aug 2021 20:45:50 +0800
Subject: [PATCH 2/2] update elasticsearch dependencies version to 7.14.0
---
pom.xml | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/pom.xml b/pom.xml
index ce18719..df2626b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,26 +152,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ org.apache.maven.plugins
+ maven-gpg-plugin
+ 1.6
+
+
+ sign-artifacts
+ verify
+
+ sign
+
+
+
+
+
+ --pinentry-mode
+ loopback
+
+
+
\ No newline at end of file