Merge pull request #217 from vvanholl/es683

Upgrade to ES 6.8.3 and release 6.8.3.0

Author: vvanholl

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: "compuscene/gradle:5.3.1-jdk12"
+image: "gradle:5.5.1-jdk12"
 
 variables:
   GRADLE_OPTS: "-Dorg.gradle.daemon=false"
@@ -13,7 +13,7 @@ stages:
 
 build:
   stage: "build"
-  script: "gradle --build-cache assemble"
+  script: "su gradle -c 'gradle --build-cache assemble'"
   cache:
     key: "$CI_COMMIT_REF_NAME"
     policy: "push"
@@ -23,7 +23,7 @@ build:
 
 test:
   stage: "test"
-  script: "gradle check"
+  script: "su gradle -c 'gradle check'"
   artifacts:
     reports:
       junit: "build/reports/integTestRunnerJunit/TEST-*.xml"
@@ -40,7 +40,7 @@ release:
     - "6.x"
     - "master"
   stage: "release"
-  script: "gradle release"
+  script: "su gradle -c 'gradle release'"
   cache:
     key: "$CI_COMMIT_REF_NAME"
     policy: "pull"

README.md

@@ -27,6 +27,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 | Elasticsearch  | Plugin         | Release date |
 | -------------- | -------------- | ------------ |
+| 6.8.3          | 6.8.3.0        | Sep 12, 2019 |
 | 6.8.2          | 6.8.2.0        | Aug 12, 2019 |
 | 6.8.1          | 6.8.1.0        | Jun 24, 2019 |
 | 6.8.0          | 6.8.0.0        | May 23, 2019 |
@@ -121,7 +122,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 ## Install
 
 - Since Elasticsearch 6.0.0 :
-    `./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/6.8.2.0/prometheus-exporter-6.8.2.0.zip`
+    `./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/6.8.3.0/prometheus-exporter-6.8.3.0.zip`
 
 - On Elasticsearch 5.x.x :
     `./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/5.6.16.0/elasticsearch-prometheus-exporter-5.6.16.0.zip`

build.gradle

@@ -8,7 +8,7 @@ buildscript {
     }
 
     dependencies {
-        classpath "org.elasticsearch.gradle:build-tools:6.8.2" // How can we use ${versions.elasticsearch} here ???
+        classpath "org.elasticsearch.gradle:build-tools:6.8.3" // How can we use ${versions.elasticsearch} here ???
         classpath group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
         classpath group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
         classpath group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'

gradle.properties

@@ -1,6 +1,6 @@
 group = org.elasticsearch.plugin.prometheus
 
-version = 6.8.2.1-SNAPSHOT
+version = 6.8.3.0
 
 pluginName = prometheus-exporter
 pluginClassname = org.elasticsearch.plugin.prometheus.PrometheusExporterPlugin