commit 531e94d81b577fbe87551abddbb4f87a7c3dce85
author Edwin Kempin <ekempin@google.com> Thu Dec 05 07:14:11 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Dec 05 07:14:11 2019 +0000
tree 1526b28c53b8f75da0340b5cc74e93eb63539e63
parent c8a7bfff952e00f63508d0bc6d141cda5b01dd6e
parent f3656860a5205efcb6d743b2276d3cf4ff9b51c6

Merge "Merge branch 'stable-3.1'"

javatests/com/google/gerrit/elasticsearch/BUILD

diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index 955930b..6521166 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -30,6 +30,11 @@
     "//lib:jgit",
 ]
 
+HTTP_TEST_DEPS = [
+    "//lib/httpcomponents:httpasyncclient",
+    "//lib/httpcomponents:httpclient",
+]
+
 QUERY_TESTS_DEP = "//javatests/com/google/gerrit/server/query/%s:abstract_query_tests"
 
 TYPES = [
@@ -66,7 +71,7 @@
     size = "large",
     srcs = [src],
     tags = ELASTICSEARCH_TAGS,
-    deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name],
+    deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + HTTP_TEST_DEPS,
 ) for name, src in ELASTICSEARCH_TESTS_V6.items()]
 
 [junit_tests(
@@ -74,10 +79,7 @@
     size = "large",
     srcs = [src],
     tags = ELASTICSEARCH_TAGS,
-    deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + [
-        "//lib/httpcomponents:httpasyncclient",
-        "//lib/httpcomponents:httpclient",
-    ],
+    deps = ELASTICSEARCH_DEPS + [QUERY_TESTS_DEP % name] + HTTP_TEST_DEPS,
 ) for name, src in ELASTICSEARCH_TESTS_V7.items()]
 
 junit_tests(

modules/jgit

diff --git a/modules/jgit b/modules/jgit
index 0356613..a7e454b 160000
--- a/modules/jgit
+++ b/modules/jgit
@@ -1 +1 @@
-Subproject commit 0356613f48ebee2e3d2d65780e71d9e0b43a752e
+Subproject commit a7e454bc51d359c2d46b19fd559f770cad8fd7d4

plugins/replication

diff --git a/plugins/replication b/plugins/replication
index ef5ffc7..c72a720 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit ef5ffc7508627f8c2f86e03c556703aa28c2f134
+Subproject commit c72a72058ff03d9d83b09882a9044a75467c4b1f