Upgrade to Elasticsearch 7.14.0 and release version 7.14.0.0

Author: vvanholl

.github/workflows/ci.yml

@@ -13,7 +13,7 @@ on:
       - "6.x"
 
 env:
-  gradle-version: "7.0.2"
+  gradle-version: "7.1.1"
   java-version: "16"
 
 jobs:

README.md

@@ -27,6 +27,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 | Elasticsearch  | Plugin         | Release date |
 | -------------- | -------------- | ------------ |
+| 7.14.0         | 7.14.0.0       | Aug 07, 2021 |
 | 7.13.4         | 7.13.4.0       | Jul 21, 2021 |
 | 7.13.3         | 7.13.3.0       | Jul 07, 2021 |
 | 7.13.2         | 7.13.2.0       | Jun 15, 2021 |
@@ -47,7 +48,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 | 7.8.0          | 7.8.0.0        | Jun 22, 2020 |
 | 7.7.1          | 7.7.1.0        | Jun 04, 2020 |
 | 7.7.0          | 7.7.0.0        | May 14, 2020 |
-| 7.6.2          | 7.6.2.0        | Apr  6, 2020 |
+| 7.6.2          | 7.6.2.0        | Apr 06, 2020 |
 | 7.6.1          | 7.6.1.0        | Mar 30, 2020 |
 | 7.6.0          | 7.6.0.0        | Feb 12, 2020 |
 | 7.5.2          | 7.5.2.0        | Jan 25, 2020 |
@@ -68,7 +69,7 @@ It collects all relevant metrics and makes them available to Prometheus via the
 
 ## Install
 
-`./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.13.4.0/prometheus-exporter-7.13.4.0.zip`
+`./bin/elasticsearch-plugin install -b https://github.com/vvanholl/elasticsearch-prometheus-exporter/releases/download/7.14.0.0/prometheus-exporter-7.14.0.0.zip`
 
 **Do not forget to restart the node after the installation!**
 

build.gradle

@@ -28,7 +28,6 @@ plugins {
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'elasticsearch.esplugin'
-apply plugin: 'elasticsearch.rest-resources'
 apply plugin: 'elasticsearch.testclusters'
 
 // Uncomment if you want to use: System.out.println("Emergency!");
@@ -37,14 +36,6 @@ apply plugin: 'elasticsearch.testclusters'
 //    ignoreFailures = true
 //}
 
-// license of this project
-licenseFile = rootProject.file('LICENSE.txt')
-// copyright notices
-noticeFile = rootProject.file('NOTICE.txt')
-
-// POM validation can be enabled
-validateElasticPom.enabled = false
-
 // No unit tests in this plugin
 test.enabled = false
 
@@ -78,10 +69,10 @@ configurations {
 }
 
 dependencies {
-    api "org.elasticsearch:elasticsearch:${versions.elasticsearch}"
-    api "io.prometheus:simpleclient:${versions.prometheus}"
-    api "io.prometheus:simpleclient_common:${versions.prometheus}"
-    api "org.apache.logging.log4j:log4j-api:${versions.log4j}"
+    implementation "org.elasticsearch:elasticsearch:${versions.elasticsearch}"
+    implementation "io.prometheus:simpleclient:${versions.prometheus}"
+    implementation "io.prometheus:simpleclient_common:${versions.prometheus}"
+    implementation "org.apache.logging.log4j:log4j-api:${versions.log4j}"
     testImplementation (group: 'junit', name: 'junit', version: "${versions.junit}") {
         exclude group:'org.hamcrest' //also included in ES test framework
     }

gradle.properties

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

src/main/java/org/elasticsearch/action/ClusterStatsData.java

@@ -21,7 +21,7 @@
 import org.elasticsearch.ElasticsearchParseException;
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
 import org.elasticsearch.cluster.metadata.Metadata;
-import org.elasticsearch.common.Nullable;
+import org.elasticsearch.core.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.ClusterSettings;

src/main/java/org/elasticsearch/action/NodePrometheusMetricsResponse.java

@@ -22,7 +22,7 @@
 import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
 import org.elasticsearch.action.admin.indices.stats.IndicesStatsResponse;
 import org.elasticsearch.action.admin.indices.stats.PackageAccessHelper;
-import org.elasticsearch.common.Nullable;
+import org.elasticsearch.core.Nullable;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.common.settings.ClusterSettings;

src/main/java/org/elasticsearch/action/TransportNodePrometheusMetricsAction.java

@@ -33,7 +33,7 @@
 import org.elasticsearch.action.support.HandledTransportAction;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.client.Requests;
-import org.elasticsearch.common.Nullable;
+import org.elasticsearch.core.Nullable;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;