From 9ede3627aa31ab3995a87e1f3d61ef6bd98221b6 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Thu, 30 May 2019 12:46:39 +0900
Subject: [PATCH 1/4] Upgrade elasticsearch-rest-client to 7.1.1

Also update the test container to use this version for V7_1 tests.

Change-Id: Ia397cc9b8de094747fd4f9e8df942a4d4be17c34
---
 WORKSPACE                                                     | 4 ++--
 .../com/google/gerrit/elasticsearch/ElasticContainer.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index cb2146244c..365fbd6567 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -931,8 +931,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(
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 edda653f7f..058dddbf71 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
@@ -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());
   }

From 3ae5c328079850c63b7109b99f332308860a308d Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Thu, 30 May 2019 15:05:29 +0200
Subject: [PATCH 2/4] Update rules_closure to latest version

This version updated closure compiler.

Change-Id: Ic327dd85adba53bfc2db4c03ec8135b787058234
---
 WORKSPACE | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 54ea5e49d0..567653fb2c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -48,9 +48,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

From 51e6455546a0e7926ddcee1218288b2712454ff5 Mon Sep 17 00:00:00 2001
From: David Ostrovsky <david@ostrovsky.org>
Date: Sun, 2 Jun 2019 11:02:34 +0200
Subject: [PATCH 3/4] Synchronize protobuf with version used in rules_closure

Avoid fetching a potentially different version of protobuf-java and use
version that rules_closure transitively depends on.

Change-Id: Ief63f06cb531cd76e2bcf8c5623d653a5c1b69c7
---
 WORKSPACE | 6 ------
 lib/BUILD | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index 54ea5e49d0..cd3609bd20 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -228,12 +228,6 @@ maven_jar(
     src_sha1 = "e0b973d5cafef3d145fa80cdf032fcead1186d29",
 )
 
-maven_jar(
-    name = "protobuf",
-    artifact = "com.google.protobuf:protobuf-java:3.0.0-beta-2",
-    sha1 = "de80fe047052445869b96f6def6baca7182c95af",
-)
-
 maven_jar(
     name = "joda-time",
     artifact = "joda-time:joda-time:2.9.4",
diff --git a/lib/BUILD b/lib/BUILD
index 7fe6e10d7b..7e4d2e8b93 100644
--- a/lib/BUILD
+++ b/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(

From e39b4f420a3c0ae09af3f6fdf531c9862b3c3f59 Mon Sep 17 00:00:00 2001
From: David Pursehouse <dpursehouse@collab.net>
Date: Wed, 5 Jun 2019 15:23:20 +0900
Subject: [PATCH 4/4] Error Prone: Enable DateFormatConstant at ERROR severity

Change-Id: I4928d22f6f330bad6753c438b4c7b68c21265154
---
 tools/BUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/BUILD b/tools/BUILD
index 101741422e..befe8e3132 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -40,6 +40,7 @@ java_package_configuration(
         "-Xep:CannotMockFinalClass:WARN",
         "-Xep:ClassCanBeStatic:WARN",
         "-Xep:ClassNewInstance:WARN",
+        "-Xep:DateFormatConstant:ERROR",
         "-Xep:DefaultCharset:ERROR",
         "-Xep:DoubleCheckedLocking:WARN",
         "-Xep:ElementsCountedInLoop:WARN",