Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
ElasticV6QueryChangesTest: Add deps to fix build
Change-Id: Id89d9fbab0be6ba99dafeb4e47420f4614b04688
diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD
index e50f2b5..82a99bd 100644
--- a/javatests/com/google/gerrit/elasticsearch/BUILD
+++ b/javatests/com/google/gerrit/elasticsearch/BUILD
@@ -31,6 +31,11 @@
"//lib/jgit/org.eclipse.jgit:jgit",
]
+HTTP_TEST_DEPS = [
+ "//lib/httpcomponents:httpasyncclient",
+ "//lib/httpcomponents:httpclient",
+]
+
QUERY_TESTS_DEP = "//javatests/com/google/gerrit/server/query/%s:abstract_query_tests"
TYPES = [
@@ -67,7 +72,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(
@@ -75,10 +80,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(
