commit 4af8709e4f39b82cb801d5497e760f00b130397d
author David Pursehouse <dpursehouse@collab.net> Tue Mar 19 15:37:44 2019 +0000
committer David Pursehouse <dpursehouse@collab.net> Tue Mar 19 15:37:44 2019 +0000
tree e6de222add0a7251448086448a3646ec8fcdfa63
parent f2624d7ab009eb94853d72b5ba17bb4d2cfa7f1f
parent c17558b1a4394089581520127d7fb63ba8543377

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Set version to 2.13.13
  WORKSPACE: Update testcontainers to version 1.10.7
  WORKSPACE: Update testcontainers to version 1.10.7
  ElasticContainer: Update the 6.6 version to latest
  Upgrade JGit to 4.5.6.201903121547-r
  Consume JGit artifacts from Maven Central

Change-Id: I1958879be4a4f4782ef532a672a0d1c4c623f0f9

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 81c5b84..a604c92 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1091,8 +1091,8 @@
 # and httpasyncclient as necessary.
 maven_jar(
     name = "elasticsearch-rest-client",
-    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.6.1",
-    sha1 = "dc1c9284ffca28cd169fae2776c3956e90b76c00",
+    artifact = "org.elasticsearch.client:elasticsearch-rest-client:6.6.2",
+    sha1 = "2c429141e488091c358aa43b1e6873d457464c5d",
 )
 
 JACKSON_VERSION = "2.9.8"
@@ -1103,18 +1103,18 @@
     sha1 = "0f5a654e4675769c716e5b387830d19b501ca191",
 )
 
-TESTCONTAINERS_VERSION = "1.10.6"
+TESTCONTAINERS_VERSION = "1.10.7"
 
 maven_jar(
     name = "testcontainers",
     artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
-    sha1 = "435c94ec099e229e62295cec4feec91c192aa764",
+    sha1 = "e7575fedfd010ca1ad80c8c9bf971a8057b1ff8a",
 )
 
 maven_jar(
     name = "testcontainers-elasticsearch",
     artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
-    sha1 = "143a88bd8f5c5a917e5bac5a728bb6a7fc54a50c",
+    sha1 = "1ee43ebd81aea1f29bf60a56643bad80c134f998",
 )
 
 maven_jar(

javatests/com/google/gerrit/elasticsearch/ElasticContainer.java

diff --git a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
index 79170c4..504ec46 100644
--- a/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
+++ b/javatests/com/google/gerrit/elasticsearch/ElasticContainer.java
@@ -47,7 +47,7 @@
       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.1";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:6.6.2";
       case V7_0:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.0-beta1";
     }