Merge pull request #32 from opendatasoft/chore/sc-52456/prepare-elasticsearch-7-17-24-upgrade

Prepare the plugin to an elasticsearch 7.17.28 upgrade

Author: 5k4nd

.gitignore

@@ -4,4 +4,5 @@
 build/
 *.iml
 *.log
+.vscode/
 

README.md

@@ -15,11 +15,16 @@ This is a multi bucket aggregation.
 Installation
 ------------
 
-`bin/plugin --install path_hierarchy --url "https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.6.1/pathhierarchy-aggregation-7.17.6.1.zip"`
+To install it, launch this command in Elasticsearch directory replacing the url with a release suiting your case (please check available releases [here](https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases)):
+`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.28.0/pathhierarchy-aggregation-7.17.28.0.zip`
 
 Build
 -----
 
+Built with Java 17 and Gradle 8.10.2.
+
+The first 3 digits of plugin version is Elasticsearch versioning. The last digit is used for plugin versioning under an elasticsearch version.
+
 Development Environment Setup
 ------------
 
@@ -31,11 +36,15 @@ OR
 
 `./gradlew assemble` (to avoid tests)
 
+In case you have to upgrade Gradle, you can do it with `./gradlew wrapper --gradler-version x.y.z`.
+
 Then the following command will start a dockerized ES and will install the previously built plugin:
 
-`
-docker-compose up
-`
+```
+docker compose up
+```
+
+Check the Elasticsearch instance at `localhost:9200` and the plugin version with `localhost:9200/_cat/plugins`.
 
 
 > NOTE: In `docker-compose.yml` you can uncomment the debug env and attach a REMOTE JVM on `*:5005` to debug the plugin.
@@ -301,16 +310,6 @@ GET /calendar/_search?size=0
 
 ```
 
-Installation
-------------
-
-Built with Java 17.
-
-The first 3 digits of plugin version is Elasticsearch versioning. The last digit is used for plugin versioning under an elasticsearch version.
-
-To install it, launch this command in Elasticsearch directory replacing the url with a release suiting your case (please check available releases [here](https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases)):
-`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v7.17.6.1/pathhierarchy-aggregation-7.17.6.1.zip`
-
 
 License
 -------

build.gradle

@@ -22,6 +22,7 @@ apply plugin: 'idea'
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'elasticsearch.yaml-rest-test'
 
+
 esplugin {
     name 'pathhierarchy-aggregation'
     description 'Return a path hierarchy aggregation'
@@ -30,8 +31,17 @@ esplugin {
     noticeFile = rootProject.file('README.md')
 }
 
+
 dependencies {
     implementation "org.elasticsearch:elasticsearch:${es_version}"
     yamlRestTestImplementation "org.elasticsearch.test:framework:${es_version}"
     yamlRestTestImplementation "org.apache.logging.log4j:log4j-core:2.17.1"
-}
+}
+
+tasks.named("yamlRestTest").configure {
+  systemProperty 'tests.security.manager', 'false'
+}
+
+tasks.named("test").configure {
+  systemProperty 'tests.security.manager', 'false'
+}

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.7"
-
 networks:
   es-network:
 
@@ -12,18 +10,18 @@ services:
     environment:
       - discovery.type=single-node
       # NO DEBUG
-      # - ES_JAVA_OPTS=-Xms512m -Xmx512m
+      - ES_JAVA_OPTS=-Xms512m -Xmx512m
       # DEBUG
-      - ES_JAVA_OPTS=-Xms512m -Xmx512m -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
+      # - ES_JAVA_OPTS=-Xms512m -Xmx512m -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005
     ports:
       - "9200:9200"
       # DEBUG
-      - "5005:5005"
+      # - "5005:5005"
     networks:
       - es-network
 
   kibana:
-    image: docker.elastic.co/kibana/kibana:7.17.5
+    image: docker.elastic.co/kibana/kibana:7.17.24
     environment:
       ELASTICSEARCH_HOSTS: http://elasticsearch-plugin-debug:9200/
     ports:

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.6 AS elasticsearch-plugin-debug
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.17.28 AS elasticsearch-plugin-debug
 
-COPY /build/distributions/pathhierarchy-aggregation-7.17.6.1.zip /tmp/pathhierarchy-aggregation-7.17.6.1.zip
-RUN ./bin/elasticsearch-plugin install file:/tmp/pathhierarchy-aggregation-7.17.6.1.zip
+COPY /build/distributions/pathhierarchy-aggregation-7.17.28.0.zip /tmp/pathhierarchy-aggregation-7.17.28.0.zip
+RUN ./bin/elasticsearch-plugin install file:/tmp/pathhierarchy-aggregation-7.17.28.0.zip

gradle.properties

@@ -1,2 +1,2 @@
-es_version = 7.17.6
-plugin_version = 7.17.6.1
+es_version = 7.17.28
+plugin_version = 7.17.28.0

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists