Merge branch 'master' into 6.4

Author: Clément Tourrière

README.md

@@ -256,7 +256,7 @@ Plugin versions are available for (at least) all minor versions of Elasticsearch
 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 by the correct link for your Elasticsearch version (see table)
-`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.4.1.1/elasticsearch-aggregation-pathhierarchy-6.4.1.1.zip`
+`./bin/elasticsearch-plugin install https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.4.3.0/elasticsearch-aggregation-pathhierarchy-6.4.3.0.zip`
 
 | elasticsearch version | plugin version | plugin url |
 | --------------------- | -------------- | ---------- |
@@ -265,7 +265,7 @@ To install it, launch this command in Elasticsearch directory replacing the url
 | 6.1.4 | 6.1.4.1 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.1.4.1/elasticsearch-aggregation-pathhierarchy-6.1.4.1.zip |
 | 6.2.4 | 6.2.4.1 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.2.4.1/elasticsearch-aggregation-pathhierarchy-6.2.4.1.zip |
 | 6.3.2 | 6.3.2.1 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.3.2.1/elasticsearch-aggregation-pathhierarchy-6.3.2.1.zip |
-| 6.4.2 | 6.4.2.1 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.4.2.1/elasticsearch-aggregation-pathhierarchy-6.4.2.1.zip |
+| 6.4.3 | 6.4.3.0 | https://github.com/opendatasoft/elasticsearch-aggregation-pathhierarchy/releases/download/v6.4.3.0/elasticsearch-aggregation-pathhierarchy-6.4.3.0.zip |
 
 
 License

build.gradle

@@ -1,52 +1,45 @@
-Properties props = new Properties()
-props.load(project.file('gradle.properties').newDataInputStream())
-def elasticVersion = props.getProperty('elasticVersion')
-def pluginVersion = props.getProperty('pluginVersion')
-
 buildscript {
-    Properties props = new Properties()
-    props.load(project.file('gradle.properties').newDataInputStream())
-    def elasticVersion = props.getProperty('elasticVersion')
     repositories {
         mavenLocal()
         mavenCentral()
         jcenter()
     }
 
     dependencies {
-        classpath "org.elasticsearch.gradle:build-tools:${elasticVersion}"
+        classpath "org.elasticsearch.gradle:build-tools:${es_version}"
     }
 }
 
 group = 'org.elasticsearch.plugin'
-version = pluginVersion
+version = "${plugin_version}"
 
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'elasticsearch.esplugin'
 
+// license of this project
+licenseFile = rootProject.file('LICENSE')
+noticeFile = rootProject.file('README.md')
+
+
 esplugin {
     name 'pathhierarchy-aggregation'
     description 'Return a path hierarchy aggregation'
     classname 'org.opendatasoft.elasticsearch.plugin.PathHierarchyAggregation'
     licenseFile = rootProject.file('LICENSE')
+    noticeFile = rootProject.file('README.md')
 }
 
 dependencies {
-    compile "org.elasticsearch:elasticsearch:${elasticVersion}"
-    testCompile "org.elasticsearch.test:framework:${elasticVersion}"
+    compile "org.elasticsearch:elasticsearch:${es_version}"
 }
 
-test.enabled = true
-
 // Skip license headers check
 licenseHeaders.enabled = false
 
 // Use elasticsearch checkstyle rules
 checkstyleTest.enabled = true
 
-licenseFile = rootProject.file('LICENSE')
-noticeFile = rootProject.file('README.md')
 dependencyLicenses.enabled = true
 
 thirdPartyAudit.enabled = true

gradle.properties

@@ -1,2 +1,2 @@
-elasticVersion = 6.4.2
-pluginVersion = 6.4.2.1
+es_version = 6.4.3
+plugin_version = 6.4.3.0

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists