Build against elasticsearch 7.8 (#123)

opendistro-for-elasticsearch · Jun 22, 2020 · a6218d8 · a6218d8
1 parent b0f3a09
commit a6218d8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@
 buildscript {
 
     ext {
-        es_version = System.getProperty("es.version", "7.7.0")
+        es_version = System.getProperty("es.version", "7.8.0")
     }
     // This isn't applying from repositories.gradle so repeating it here
     repositories {
@@ -34,7 +34,7 @@ plugins {
 }
 
 ext {
-    opendistroVersion = '1.8.0'
+    opendistroVersion = '1.9.0'
     isSnapshot = "true" == System.getProperty("build.snapshot", "true")
 }
 
@@ -56,6 +56,7 @@ test {
 }
 
 licenseHeaders.enabled = false
+validateNebulaPom.enabled = false
 
 esplugin {
     name 'opendistro_performance_analyzer'

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/...-notes/opendistro-for-elasticsearch.performance-analyzer.release-notes-1.8.0.md b/...-notes/opendistro-for-elasticsearch.performance-analyzer.release-notes-1.8.0.md
@@ -1,4 +1,4 @@
-## Version 1.8.0 (Current)
+## Version 1.8.0
 
 Version compatible with elasticsearch 7.7.0
 

diff --git a/...-notes/opendistro-for-elasticsearch.performance-analyzer.release-notes-1.9.0.md b/...-notes/opendistro-for-elasticsearch.performance-analyzer.release-notes-1.9.0.md
@@ -0,0 +1,8 @@
+## Version 1.9.0 (Current)
+
+Version compatible with elasticsearch 7.8.0
+
+### New Features
+
+This is the release of the Open Distro Performance Analyzer that will work with elasticsearch 7.8.0
+
diff --git a/...va/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerPlugin.java b/...va/com/amazon/opendistro/elasticsearch/performanceanalyzer/PerformanceAnalyzerPlugin.java
@@ -69,6 +69,7 @@
 import org.elasticsearch.plugins.NetworkPlugin;
 import org.elasticsearch.plugins.Plugin;
 import org.elasticsearch.plugins.SearchPlugin;
+import org.elasticsearch.repositories.RepositoriesService;
 import org.elasticsearch.rest.RestController;
 import org.elasticsearch.script.ScriptService;
 import org.elasticsearch.threadpool.ThreadPool;
@@ -197,7 +198,8 @@ public Collection<Object> createComponents(Client client, ClusterService cluster
                                                ResourceWatcherService resourceWatcherService, ScriptService scriptService,
                                                NamedXContentRegistry xContentRegistry, Environment environment,
                                                NodeEnvironment nodeEnvironment, NamedWriteableRegistry namedWriteableRegistry,
-                                               IndexNameExpressionResolver indexNameExpressionResolver) {
+                                               IndexNameExpressionResolver indexNameExpressionResolver,
+                                               Supplier<RepositoriesService> repositoriesServiceSupplier) {
         ESResources.INSTANCE.setClusterService(clusterService);
         ESResources.INSTANCE.setThreadPool(threadPool);
         ESResources.INSTANCE.setEnvironment(environment);
@@ -218,3 +220,4 @@ public Map<String, Supplier<Transport>> getTransports(Settings settings, ThreadP
 
 }
 
+