commit bfeaf28f5816bbd56586a4e5f50ecd94adda5a5d
author David Pursehouse <dpursehouse@collab.net> Wed Nov 07 10:16:18 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 07 10:16:18 2018 +0000
tree 46b2d6511f67957a945b259aac09b566fc4991ae
parent fceff73b6f567383738bc6950b35b07c0a315f2a
parent efcb9927a2a4cbcc5d65fec2355e620f9fc0a0ed

Merge "Bazel: Consume versions directly from lib:versions.bzl in skylib" into stable-2.14

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index d03c23d..09f86e5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -892,8 +892,8 @@
 # and httpasyncclient as necessary.
 maven_jar(
     name = "elasticsearch-rest-client",
-    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.4.2",
-    sha1 = "a2baf2d4fdf03f31fbd39351a32bee25fcdfa1cf",
+    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.4.3",
+    sha1 = "5c24325430971ba2fa4769eb446f026b7680d5e7",
 )
 
 JACKSON_VERSION = "2.9.7"

gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java

diff --git a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java
index e347f75..0b6e3ee 100644
--- a/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java
+++ b/gerrit-elasticsearch/src/main/java/com/google/gerrit/elasticsearch/testing/ElasticContainer.java
@@ -46,13 +46,13 @@
       case V2_4:
         return "elasticsearch:2.4.6-alpine";
       case V5_6:
-        return "docker.elastic.co/elasticsearch/elasticsearch:5.6.12";
+        return "docker.elastic.co/elasticsearch/elasticsearch:5.6.13";
       case V6_2:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.2.4";
       case V6_3:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.3.2";
       case V6_4:
-        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.2";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.4.3";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }