From e238e4ebe1550026be16a490889f972c09fe2935 Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Wed, 20 Feb 2019 19:08:58 +0900 Subject: [PATCH] Upgrade elasticsearch-rest-client to 6.6.1 According to the release notes [1] there are no REST client specific fixes. This upgrade is only to keep up-to-date with the latest version. Also update the test container to use this version for the 6.6 tests. [1] https://www.elastic.co/guide/en/elasticsearch/reference/current/release-notes-6.6.1.html Change-Id: Ie17d0402e0f7b6c02da6875cf2f765ba2f2ad7ec --- WORKSPACE | 4 ++-- .../com/google/gerrit/elasticsearch/ElasticContainer.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 0778c8768f..ed0f3bd640 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -896,8 +896,8 @@ maven_jar( # and httpasyncclient as necessary. maven_jar( name = "elasticsearch-rest-client", - artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.6.0", - sha1 = "f0ce1ea819fedde731511b440b025e4fb5a2f5f7", + artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.6.1", + sha1 = "dc1c9284ffca28cd169fae2776c3956e90b76c00", ) JACKSON_VERSION = "2.9.8" diff --git a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java index b4ca6d862d..1c7102a8c3 100644 --- a/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java +++ b/gerrit-elasticsearch/src/test/java/com/google/gerrit/elasticsearch/ElasticContainer.java @@ -47,7 +47,7 @@ public class ElasticContainer extends ElasticsearchContainer { case V6_5: return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.5.4"; case V6_6: - return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.0"; + return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.1"; case V7_0: return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-beta1"; }