Skip to content

Commit

Permalink
Bump to 7.17.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Hugo Mercier committed Oct 7, 2022
1 parent a7ae868 commit c71d692
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 11 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
### 7.17.6.0

* Repackaging for ES 7.17.6

### 7.17.1.2

* Simplify consistency: script is now using the same tolerance value as the agg one

### 7.17.1.1

* Fix deduplication of points
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is an `Ingest`, `Search` and `Script` plugin.

## Installation

`bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-plugin-geoshape/releases/download/v7.17.1.2/elasticsearch-plugin-geoshape-7.17.1.2.zip"`
`bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-plugin-geoshape/releases/download/v7.17.6.0/elasticsearch-plugin-geoshape-7.17.6.0.zip"`


## Build
Expand Down Expand Up @@ -353,13 +353,13 @@ Result:

## Installation

Current supported version is Elasticsearch 7.x (7.17.1).
Current supported version is Elasticsearch 7.x (7.17.6).
You can find past releases [here](https://github.com/opendatasoft/elasticsearch-plugin-geoshape/releases).

The first 3 digits of the plugin version is the corresponding Elasticsearch version. The last digit is used for plugin versioning.

To install it, launch this command in Elasticsearch directory replacing the url by the correct link for your Elasticsearch version (see table)
`bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-plugin-geoshape/releases/download/v7.17.1.2/elasticsearch-plugin-geoshape-7.17.1.2.zip"`
`bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-plugin-geoshape/releases/download/v7.17.6.0/elasticsearch-plugin-geoshape-7.17.6.0.zip"`


## Development Environment Setup
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ dependencies {
// However this archive is not included in the final plugin bundle, since
// legacy geo and its dependencies (JTS) are already present at runtime
// with ES (see the jar/manifest rule below)
compileOnly files('libs/legacy-geo-7.17.1.jar')
compileOnly files('libs/legacy-geo-7.17.6.jar')

// jts.io.common is not part of ES and will be shipped with this plugin
implementation group: 'org.locationtech.jts.io', name: 'jts-io-common', version: '1.15.0'
Expand All @@ -66,7 +66,7 @@ dependencies {
jar {
manifest {
attributes(
"Class-Path": "../../modules/legacy-geo/legacy-geo-7.17.1.jar ../../modules/legacy-geo/jts-core-1.15.0.jar ../../modules/legacy-geo/spatial4j-0.7.jar")
"Class-Path": "../../modules/legacy-geo/legacy-geo-7.17.6.jar ../../modules/legacy-geo/jts-core-1.15.0.jar ../../modules/legacy-geo/spatial4j-0.7.jar")

}
}
Expand Down
6 changes: 3 additions & 3 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.1 AS elasticsearch-plugin-debug
FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.6 AS elasticsearch-plugin-debug

COPY /build/distributions/elasticsearch-plugin-geoshape-7.17.1.2.zip /tmp/elasticsearch-plugin-geoshape-7.17.1.2.zip
RUN ./bin/elasticsearch-plugin install file:/tmp/elasticsearch-plugin-geoshape-7.17.1.2.zip
COPY /build/distributions/elasticsearch-plugin-geoshape-7.17.6.0.zip /tmp/elasticsearch-plugin-geoshape-7.17.6.0.zip
RUN ./bin/elasticsearch-plugin install file:/tmp/elasticsearch-plugin-geoshape-7.17.6.0.zip
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
elastic_version = 7.17.1
plugin_version = 7.17.1.2
elastic_version = 7.17.6
plugin_version = 7.17.6.0
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Binary file not shown.

0 comments on commit c71d692

Please sign in to comment.