Skip to content

Commit d2ea792

Browse files
author
iamazy
committed
update elasticsearch dependencies version to 7.16.0
1 parent 3e92656 commit d2ea792

File tree

8 files changed

+37
-58
lines changed

8 files changed

+37
-58
lines changed

‎elasticsearch-sql-all/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>elasticsearch-sql</artifactId>
77
<groupId>io.github.iamazy.elasticsearch.dsl</groupId>
8-
<version>7.15.2</version>
8+
<version>7.16.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎elasticsearch-sql-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>elasticsearch-sql</artifactId>
77
<groupId>io.github.iamazy.elasticsearch.dsl</groupId>
8-
<version>7.15.2</version>
8+
<version>7.16.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/sql/parser/query/geo/GeoJsonShapeQueryParser.java‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,16 @@
66
import io.github.iamazy.elasticsearch.dsl.sql.parser.ExpressionQueryParser;
77
import io.github.iamazy.elasticsearch.dsl.utils.GeoUtils;
88
import io.github.iamazy.elasticsearch.dsl.utils.StringManager;
9-
import org.elasticsearch.common.geo.parsers.ShapeParser;
9+
import org.elasticsearch.common.geo.GeoJson;
10+
import org.elasticsearch.common.geo.GeometryParser;
1011
import org.elasticsearch.common.xcontent.LoggingDeprecationHandler;
11-
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
12-
import org.elasticsearch.common.xcontent.XContentParser;
13-
import org.elasticsearch.common.xcontent.json.JsonXContent;
1412
import org.elasticsearch.geometry.Geometry;
13+
import org.elasticsearch.geometry.utils.StandardValidator;
1514
import org.elasticsearch.index.query.QueryBuilder;
1615
import org.elasticsearch.index.query.QueryBuilders;
16+
import org.elasticsearch.xcontent.NamedXContentRegistry;
17+
import org.elasticsearch.xcontent.XContentParser;
18+
import org.elasticsearch.xcontent.json.JsonXContent;
1719

1820
import java.io.IOException;
1921

@@ -50,6 +52,6 @@ public boolean isMatchExpressionInvocation(Class clazz) {
5052
private Geometry parseGeometry(String geometry) throws IOException {
5153
XContentParser xContentParser = JsonXContent.jsonXContent.createParser(NamedXContentRegistry.EMPTY, LoggingDeprecationHandler.INSTANCE, geometry);
5254
xContentParser.nextToken();
53-
return ShapeParser.parse(xContentParser).buildGeometry();
55+
return GeoJson.fromXContent(StandardValidator.instance(true), true, true, xContentParser);
5456
}
5557
}

‎elasticsearch-sql-core/src/main/java/io/github/iamazy/elasticsearch/dsl/sql/parser/query/geo/GeometryCollectionQueryParser.java‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎elasticsearch-sql-jdbc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>elasticsearch-sql</artifactId>
77
<groupId>io.github.iamazy.elasticsearch.dsl</groupId>
8-
<version>7.15.2</version>
8+
<version>7.16.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎isql-plugin/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<artifactId>elasticsearch-sql</artifactId>
77
<groupId>io.github.iamazy.elasticsearch.dsl</groupId>
8-
<version>7.15.2</version>
8+
<version>7.16.0</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎isql-plugin/src/main/java/io/github/iamazy/elasticsearch/dsl/plugin/RestSqlAction.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
import org.elasticsearch.client.node.NodeClient;
99
import org.elasticsearch.cluster.metadata.MappingMetadata;
1010
import org.elasticsearch.common.collect.ImmutableOpenMap;
11-
import org.elasticsearch.common.xcontent.XContentBuilder;
12-
import org.elasticsearch.common.xcontent.XContentFactory;
13-
import org.elasticsearch.common.xcontent.XContentParser;
14-
import org.elasticsearch.common.xcontent.XContentType;
1511
import org.elasticsearch.index.reindex.BulkByScrollResponse;
1612
import org.elasticsearch.index.reindex.DeleteByQueryAction;
1713
import org.elasticsearch.index.reindex.ReindexAction;
@@ -24,6 +20,10 @@
2420
import org.elasticsearch.rest.RestStatus;
2521
import org.elasticsearch.tasks.LoggingTaskListener;
2622
import org.elasticsearch.tasks.Task;
23+
import org.elasticsearch.xcontent.XContentBuilder;
24+
import org.elasticsearch.xcontent.XContentFactory;
25+
import org.elasticsearch.xcontent.XContentParser;
26+
import org.elasticsearch.xcontent.XContentType;
2727

2828
import java.io.IOException;
2929
import java.util.ArrayList;

‎pom.xml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>io.github.iamazy.elasticsearch.dsl</groupId>
88
<artifactId>elasticsearch-sql</artifactId>
99
<packaging>pom</packaging>
10-
<version>7.15.2</version>
10+
<version>7.16.0</version>
1111
<name>elasticsearch-sql</name>
1212
<description>elasticsearch sql</description>
1313
<url>https://github.com/iamazy/elasticsearch-sql</url>
@@ -22,7 +22,7 @@
2222

2323

2424
<properties>
25-
<elasticsearch.version>7.15.2</elasticsearch.version>
25+
<elasticsearch.version>${project.version}</elasticsearch.version>
2626
<java.version>1.8</java.version>
2727
<antlr4.version>4.7.2</antlr4.version>
2828
<jackson.version>2.10.1</jackson.version>
@@ -152,26 +152,26 @@
152152
</tags>
153153
</configuration>
154154
</plugin>
155-
<plugin>
156-
<groupId>org.apache.maven.plugins</groupId>
157-
<artifactId>maven-gpg-plugin</artifactId>
158-
<version>1.6</version>
159-
<executions>
160-
<execution>
161-
<id>sign-artifacts</id>
162-
<phase>verify</phase>
163-
<goals>
164-
<goal>sign</goal>
165-
</goals>
166-
</execution>
167-
</executions>
168-
<configuration>
169-
<gpgArguments>
170-
<arg>--pinentry-mode</arg>
171-
<arg>loopback</arg>
172-
</gpgArguments>
173-
</configuration>
174-
</plugin>
155+
<!-- <plugin>-->
156+
<!-- <groupId>org.apache.maven.plugins</groupId>-->
157+
<!-- <artifactId>maven-gpg-plugin</artifactId>-->
158+
<!-- <version>1.6</version>-->
159+
<!-- <executions>-->
160+
<!-- <execution>-->
161+
<!-- <id>sign-artifacts</id>-->
162+
<!-- <phase>verify</phase>-->
163+
<!-- <goals>-->
164+
<!-- <goal>sign</goal>-->
165+
<!-- </goals>-->
166+
<!-- </execution>-->
167+
<!-- </executions>-->
168+
<!-- <configuration>-->
169+
<!-- <gpgArguments>-->
170+
<!-- <arg>&#45;&#45;pinentry-mode</arg>-->
171+
<!-- <arg>loopback</arg>-->
172+
<!-- </gpgArguments>-->
173+
<!-- </configuration>-->
174+
<!-- </plugin>-->
175175
</plugins>
176176
</build>
177177
</project>

0 commit comments

Comments
 (0)