Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

Build against elasticsearch 7.8 #123

Merged
merged 1 commit into from
Jun 22, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -34,7 +34,7 @@ plugins {
}

ext {
opendistroVersion = '1.8.0'
opendistroVersion = '1.9.0'
isSnapshot = "true" == System.getProperty("build.snapshot", "true")
}

Expand All @@ -56,6 +56,7 @@ test {
}

licenseHeaders.enabled = false
validateNebulaPom.enabled = false

esplugin {
name 'opendistro_performance_analyzer'
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## Version 1.8.0 (Current)
## Version 1.8.0

Version compatible with elasticsearch 7.7.0

Expand Down
Original file line number Diff line number Diff line change
@@ -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

Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand All @@ -218,3 +220,4 @@ public Map<String, Supplier<Transport>> getTransports(Settings settings, ThreadP

}