Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Synchronize protobuf with version used in rules_closure
  Update rules_closure to latest version
  Upgrade elasticsearch-rest-client to 7.1.1

Change-Id: If4cdcc44c53e90f3562bdff1b7a30dd09cd9764f

WORKSPACE

@@ -50,9 +50,9 @@ http_archive(
 
 http_archive(
     name = "io_bazel_rules_closure",
-    sha256 = "bdb00831682cd0923df36e19b01619b8230896d582f16304a937d8dc8270b1b6",
-    strip_prefix = "rules_closure-ad75d7cc1cff0e845cd83683881915d995bd75b2",
-    urls = ["https://github.com/bazelbuild/rules_closure/archive/ad75d7cc1cff0e845cd83683881915d995bd75b2.tar.gz"],
+    sha256 = "75c58680af5f7b938ce9fe2abe8ecd9d24c698d160c0b71a945bd100fa77632b",
+    strip_prefix = "rules_closure-10cb1a78bd6cc8927eb39c2644c0369934f4aed6",
+    urls = ["https://github.com/bazelbuild/rules_closure/archive/10cb1a78bd6cc8927eb39c2644c0369934f4aed6.tar.gz"],
 )
 
 # File is specific to Polymer and copied from the Closure Github -- should be
@@ -288,12 +288,6 @@ maven_jar(
     src_sha1 = "e0b973d5cafef3d145fa80cdf032fcead1186d29",
 )
 
-maven_jar(
-    name = "protobuf",
-    artifact = "com.google.protobuf:protobuf-java:3.7.1",
-    sha1 = "0bce1b6dc9e4531169542ab37a1c8641bcaa8afb",
-)
-
 load("//lib:guava.bzl", "GUAVA_BIN_SHA1", "GUAVA_VERSION")
 
 maven_jar(
@@ -1122,8 +1116,8 @@ maven_jar(
 # and httpasyncclient as necessary.
 maven_jar(
     name = "elasticsearch-rest-client",
-    artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.1.0",
-    sha1 = "93e8e8b96121069d1d6a6f94d29e7aebd3327301",
+    artifact = "org.elasticsearch.client:elasticsearch-rest-client:7.1.1",
+    sha1 = "ca04d8012f92cac561be343b931ec73302b2ff3e",
 )
 
 maven_jar(

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

@@ -53,7 +53,7 @@ public class ElasticContainer extends ElasticsearchContainer {
       case V7_0:
         return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.0.1";
       case V7_1:
-        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.0";
+        return "docker.elastic.co/elasticsearch/elasticsearch-oss:7.1.1";
     }
     throw new IllegalStateException("No tests for version: " + version.name());
   }

lib/BUILD

@@ -65,7 +65,7 @@ java_library(
     name = "protobuf",
     data = ["//lib:LICENSE-protobuf"],
     visibility = ["//visibility:public"],
-    exports = ["@protobuf//jar"],
+    exports = ["@com_google_protobuf//:protobuf_java"],
 )
 
 java_library(