commit 0ce3a756f6b2efcd5e8949c52e8ccd3b931e58a9
author David Pursehouse <dpursehouse@collab.net> Tue Mar 19 15:39:41 2019 +0000
committer David Pursehouse <dpursehouse@collab.net> Tue Mar 19 15:39:41 2019 +0000
tree 5a020605b57135c7f54e0d815b45eeef5d9273bd
parent 38b659e9d453146672600f2f14eb37ad095ddaaa
parent 4af8709e4f39b82cb801d5497e760f00b130397d

Merge branch 'stable-2.16'

* stable-2.16:
  REST API documentation: Add missing spaces in JSON examples
  Set version to 2.13.13
  Upgrade Flogger to version 0.4
  Set version to 2.15.13-SNAPSHOT
  Set version to 2.15.12
  Set version to 2.14.19
  WORKSPACE: Update testcontainers to version 1.10.7
  Upgrade JGit to 4.9.9.201903122025-r
  WORKSPACE: Update testcontainers to version 1.10.7
  ElasticContainer: Update the 6.6 version to latest
  Upgrade JGit to 4.7.8.201903121755-r
  Set version to 2.16.8-SNAPSHOT
  Set version to 2.16.7
  Upgrade JGit to 5.1.6.201903130242-r
  Do not strip out "-- >8 --" comment in commit-msg hook
  Handle messages with only comments in the commit-msg hook
  Upgrade JGit to 4.5.6.201903121547-r
  ElasticContainer: Update the 5.6 version to latest
  WORKSPACE: Update the testcontainers version to latest
  WORKSPACE: Update the testcontainers version to latest
  WORKSPACE: Fix the httpcore-nio reference typo
  Consume JGit artifacts from Maven Central

Change-Id: I6a719514084f70a05648e6e2cdd9ac569308255a

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index a984c41..b4b1a64 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -156,18 +156,18 @@
     sha1 = "94ad16d728b374d65bd897625f3fbb3da223a2b6",
 )
 
-FLOGGER_VERS = "0.3.1"
+FLOGGER_VERS = "0.4"
 
 maven_jar(
     name = "flogger",
     artifact = "com.google.flogger:flogger:" + FLOGGER_VERS,
-    sha1 = "585030fe1ec709760cbef997a459729fb965df0e",
+    sha1 = "9c8863dcc913b56291c0c88e6d4ca9715b43df98",
 )
 
 maven_jar(
     name = "flogger-log4j-backend",
     artifact = "com.google.flogger:flogger-log4j-backend:" + FLOGGER_VERS,
-    sha1 = "d5085e3996bddc4b105d53b886190cc9a8811a9e",
+    sha1 = "17aa5e31daa1354187e14b6978597d630391c028",
 )
 
 maven_jar(
@@ -1054,12 +1054,12 @@
     sha1 = "76716d529710fc03d1d429b43e3cedd4419f78d4",
 )
 
-# When upgrading elasticsearch-rest-client, also upgrade http-niocore
+# When upgrading elasticsearch-rest-client, also upgrade httpcore-nio
 # 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"
@@ -1070,18 +1070,18 @@
     sha1 = "0f5a654e4675769c716e5b387830d19b501ca191",
 )
 
-TESTCONTAINERS_VERSION = "1.10.3"
+TESTCONTAINERS_VERSION = "1.10.7"
 
 maven_jar(
     name = "testcontainers",
     artifact = "org.testcontainers:testcontainers:" + TESTCONTAINERS_VERSION,
-    sha1 = "e561ce99fc616b383d85f35ce881e58e8de59ae7",
+    sha1 = "e7575fedfd010ca1ad80c8c9bf971a8057b1ff8a",
 )
 
 maven_jar(
     name = "testcontainers-elasticsearch",
     artifact = "org.testcontainers:elasticsearch:" + TESTCONTAINERS_VERSION,
-    sha1 = "0cb114ecba0ed54a116e2be2f031bc45ca4cbfc8",
+    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";
     }