diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index afc0f85a15..d645828363 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD @@ -120,7 +120,6 @@ java_library2( "//java/com/google/gerrit/lucene", "//java/com/google/gerrit/mail", "//java/com/google/gerrit/metrics", - "//java/com/google/gerrit/pgm/init", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/audit", diff --git a/java/com/google/gerrit/acceptance/testsuite/project/BUILD b/java/com/google/gerrit/acceptance/testsuite/project/BUILD index 1ef2931b02..a0f09b0889 100644 --- a/java/com/google/gerrit/acceptance/testsuite/project/BUILD +++ b/java/com/google/gerrit/acceptance/testsuite/project/BUILD @@ -12,7 +12,6 @@ java_library( "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/project/testing:project-test-util", "//lib:guava", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", diff --git a/java/com/google/gerrit/gpg/BUILD b/java/com/google/gerrit/gpg/BUILD index f17dd80761..a9854fc7b5 100644 --- a/java/com/google/gerrit/gpg/BUILD +++ b/java/com/google/gerrit/gpg/BUILD @@ -5,8 +5,6 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/git", diff --git a/java/com/google/gerrit/httpd/BUILD b/java/com/google/gerrit/httpd/BUILD index e5340bf075..c0b207fe62 100644 --- a/java/com/google/gerrit/httpd/BUILD +++ b/java/com/google/gerrit/httpd/BUILD @@ -12,10 +12,8 @@ java_library( deps = [ "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/git", - "//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/json", "//java/com/google/gerrit/launcher", "//java/com/google/gerrit/lifecycle", diff --git a/java/com/google/gerrit/httpd/auth/oauth/BUILD b/java/com/google/gerrit/httpd/auth/oauth/BUILD index 4fec1c2f47..74c6776613 100644 --- a/java/com/google/gerrit/httpd/auth/oauth/BUILD +++ b/java/com/google/gerrit/httpd/auth/oauth/BUILD @@ -8,12 +8,10 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/httpd", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/audit", "//lib:gson", "//lib:guava", "//lib:servlet-api", diff --git a/java/com/google/gerrit/httpd/auth/openid/BUILD b/java/com/google/gerrit/httpd/auth/openid/BUILD index 98b3c11c46..c044788291 100644 --- a/java/com/google/gerrit/httpd/auth/openid/BUILD +++ b/java/com/google/gerrit/httpd/auth/openid/BUILD @@ -10,13 +10,11 @@ java_library( # We want all these deps to be provided_deps "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/httpd", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/util/http", "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/audit", "//lib:guava", "//lib:servlet-api", "//lib/commons:codec", diff --git a/java/com/google/gerrit/httpd/init/BUILD b/java/com/google/gerrit/httpd/init/BUILD index 328a4af841..4175672002 100644 --- a/java/com/google/gerrit/httpd/init/BUILD +++ b/java/com/google/gerrit/httpd/init/BUILD @@ -17,14 +17,12 @@ java_library( "//java/com/google/gerrit/metrics/dropwizard", "//java/com/google/gerrit/pgm/init", "//java/com/google/gerrit/pgm/util", - "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server:module", "//java/com/google/gerrit/server/api", "//java/com/google/gerrit/server/audit", "//java/com/google/gerrit/server/cache/h2", "//java/com/google/gerrit/server/cache/mem", - "//java/com/google/gerrit/server/git/receive", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/sshd", @@ -34,6 +32,5 @@ java_library( "//lib/guice", "//lib/guice:guice-servlet", "//lib/jgit/org.eclipse.jgit:jgit", - "//prolog:gerrit-prolog-common", ], ) diff --git a/java/com/google/gerrit/lucene/BUILD b/java/com/google/gerrit/lucene/BUILD index 40b2548b46..28586a38b8 100644 --- a/java/com/google/gerrit/lucene/BUILD +++ b/java/com/google/gerrit/lucene/BUILD @@ -9,8 +9,6 @@ java_library( deps = [ "//java/com/google/gerrit/index", "//java/com/google/gerrit/index:query_exception", - "//java/com/google/gerrit/reviewdb:server", - "//java/com/google/gerrit/server", "//lib:guava", "//lib/lucene:lucene-core-and-backward-codecs", ], @@ -26,13 +24,10 @@ java_library( deps = [ ":query_builder", "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/exceptions", - "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/index", "//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/index/project", - "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/proto", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD index ead40d037d..a116f4afa5 100644 --- a/java/com/google/gerrit/pgm/BUILD +++ b/java/com/google/gerrit/pgm/BUILD @@ -43,13 +43,11 @@ java_library( "//java/com/google/gerrit/server/audit", "//java/com/google/gerrit/server/cache/h2", "//java/com/google/gerrit/server/cache/mem", - "//java/com/google/gerrit/server/git/receive", "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/sshd", - "//java/com/google/gerrit/util/http", "//lib:args4j", "//lib:guava", "//lib:protobuf", diff --git a/java/com/google/gerrit/pgm/http/jetty/BUILD b/java/com/google/gerrit/pgm/http/jetty/BUILD index aaf0b8a83c..3b89644e3a 100644 --- a/java/com/google/gerrit/pgm/http/jetty/BUILD +++ b/java/com/google/gerrit/pgm/http/jetty/BUILD @@ -5,10 +5,8 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/httpd", - "//java/com/google/gerrit/launcher", "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/util/time", diff --git a/java/com/google/gerrit/pgm/init/api/BUILD b/java/com/google/gerrit/pgm/init/api/BUILD index 19203fcc48..0a11c83c53 100644 --- a/java/com/google/gerrit/pgm/init/api/BUILD +++ b/java/com/google/gerrit/pgm/init/api/BUILD @@ -7,7 +7,6 @@ java_library( deps = [ "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//lib:guava", diff --git a/java/com/google/gerrit/pgm/util/BUILD b/java/com/google/gerrit/pgm/util/BUILD index 94798f70ad..60fb5e4faa 100644 --- a/java/com/google/gerrit/pgm/util/BUILD +++ b/java/com/google/gerrit/pgm/util/BUILD @@ -12,10 +12,8 @@ java_library( "//java/com/google/gerrit/metrics/dropwizard", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server:module", "//java/com/google/gerrit/server/cache/h2", "//java/com/google/gerrit/server/cache/mem", - "//java/com/google/gerrit/server/git/receive", "//java/com/google/gerrit/server/restapi", "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/util/cli", diff --git a/java/com/google/gerrit/prettify/BUILD b/java/com/google/gerrit/prettify/BUILD index 76afbe77b8..7440032175 100644 --- a/java/com/google/gerrit/prettify/BUILD +++ b/java/com/google/gerrit/prettify/BUILD @@ -5,7 +5,6 @@ java_library( srcs = glob(["common/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/reviewdb:server", "//lib:guava", "//lib/jgit/org.eclipse.jgit:jgit", ], diff --git a/java/com/google/gerrit/proto/testing/BUILD b/java/com/google/gerrit/proto/testing/BUILD index acfa8f06ee..0e5f887241 100644 --- a/java/com/google/gerrit/proto/testing/BUILD +++ b/java/com/google/gerrit/proto/testing/BUILD @@ -7,7 +7,6 @@ java_library( srcs = glob(["*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/server/cache/serialize", "//lib:guava", "//lib/commons:lang3", "//lib/truth", diff --git a/java/com/google/gerrit/reviewdb/BUILD b/java/com/google/gerrit/reviewdb/BUILD index 838aee8950..4028448998 100644 --- a/java/com/google/gerrit/reviewdb/BUILD +++ b/java/com/google/gerrit/reviewdb/BUILD @@ -10,7 +10,6 @@ java_library( deps = [ "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/git", "//lib:guava", "//lib:protobuf", "//lib/auto:auto-value", diff --git a/java/com/google/gerrit/server/api/BUILD b/java/com/google/gerrit/server/api/BUILD index b0fe44d7d2..37e04bb588 100644 --- a/java/com/google/gerrit/server/api/BUILD +++ b/java/com/google/gerrit/server/api/BUILD @@ -11,7 +11,6 @@ java_library( "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/restapi", diff --git a/java/com/google/gerrit/server/audit/BUILD b/java/com/google/gerrit/server/audit/BUILD index a0ea448efb..7693ca1f9e 100644 --- a/java/com/google/gerrit/server/audit/BUILD +++ b/java/com/google/gerrit/server/audit/BUILD @@ -10,20 +10,8 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/index", - "//java/com/google/gerrit/index:query_exception", - "//java/com/google/gerrit/index/project", - "//java/com/google/gerrit/lifecycle", - "//java/com/google/gerrit/metrics", - "//java/com/google/gerrit/prettify:server", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/ioutil", - "//java/com/google/gerrit/server/logging", - "//java/com/google/gerrit/server/util/time", - "//java/com/google/gerrit/util/cli", - "//java/com/google/gerrit/util/ssl", - "//java/org/apache/commons/net", "//lib:args4j", "//lib:autolink", "//lib:automaton", @@ -83,7 +71,6 @@ java_library( "//lib/log:jsonevent-layout", "//lib/log:log4j", "//lib/lucene:lucene-analyzers-common", - "//lib/lucene:lucene-core-and-backward-codecs", "//lib/lucene:lucene-queryparser", "//lib/mime4j:core", "//lib/mime4j:dom", diff --git a/java/com/google/gerrit/server/cache/h2/BUILD b/java/com/google/gerrit/server/cache/h2/BUILD index 79baefc467..a191f75fcb 100644 --- a/java/com/google/gerrit/server/cache/h2/BUILD +++ b/java/com/google/gerrit/server/cache/h2/BUILD @@ -6,7 +6,6 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/server", diff --git a/java/com/google/gerrit/server/group/db/testing/BUILD b/java/com/google/gerrit/server/group/db/testing/BUILD index b5d5a43f5f..0cc45fd020 100644 --- a/java/com/google/gerrit/server/group/db/testing/BUILD +++ b/java/com/google/gerrit/server/group/db/testing/BUILD @@ -7,9 +7,6 @@ java_library( testonly = True, srcs = glob(["*.java"]), deps = [ - "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//lib:guava", "//lib/jgit/org.eclipse.jgit:jgit", diff --git a/java/com/google/gerrit/server/project/testing/BUILD b/java/com/google/gerrit/server/project/testing/BUILD index 968e3da744..988a89f1e3 100644 --- a/java/com/google/gerrit/server/project/testing/BUILD +++ b/java/com/google/gerrit/server/project/testing/BUILD @@ -5,9 +5,5 @@ java_library( testonly = True, srcs = glob(["*.java"]), visibility = ["//visibility:public"], - deps = [ - "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/reviewdb:server", - "//java/com/google/gerrit/server", - ], + deps = ["//java/com/google/gerrit/common:server"], ) diff --git a/java/com/google/gerrit/server/restapi/BUILD b/java/com/google/gerrit/server/restapi/BUILD index 9eef36ca52..c5d366f7d1 100644 --- a/java/com/google/gerrit/server/restapi/BUILD +++ b/java/com/google/gerrit/server/restapi/BUILD @@ -24,7 +24,6 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/ioutil", - "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//lib:args4j", diff --git a/java/com/google/gerrit/server/schema/BUILD b/java/com/google/gerrit/server/schema/BUILD index fe07791706..e12b0fbe62 100644 --- a/java/com/google/gerrit/server/schema/BUILD +++ b/java/com/google/gerrit/server/schema/BUILD @@ -18,7 +18,6 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/logging", - "//java/com/google/gerrit/server/util/time", "//lib:guava", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD index 1beaf41b8d..370bfdba06 100644 --- a/java/com/google/gerrit/sshd/BUILD +++ b/java/com/google/gerrit/sshd/BUILD @@ -12,17 +12,14 @@ java_library( "//java/com/google/gerrit/git", "//java/com/google/gerrit/json", "//java/com/google/gerrit/lifecycle", - "//java/com/google/gerrit/lucene", "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/audit", - "//java/com/google/gerrit/server/cache/h2", "//java/com/google/gerrit/server/git/receive", "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/restapi", - "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/util/cli", "//lib:args4j", diff --git a/java/com/google/gerrit/testing/BUILD b/java/com/google/gerrit/testing/BUILD index 3722badcff..a26b0605b7 100644 --- a/java/com/google/gerrit/testing/BUILD +++ b/java/com/google/gerrit/testing/BUILD @@ -15,7 +15,6 @@ java_library( deps = [ "//java/com/google/gerrit/acceptance/testsuite/project", "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/gpg", @@ -24,7 +23,6 @@ java_library( "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/mail", "//java/com/google/gerrit/metrics", - "//java/com/google/gerrit/pgm/init", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server:module", diff --git a/java/com/google/gerrit/util/cli/BUILD b/java/com/google/gerrit/util/cli/BUILD index e4f2c21d86..ebcc67ed70 100644 --- a/java/com/google/gerrit/util/cli/BUILD +++ b/java/com/google/gerrit/util/cli/BUILD @@ -6,7 +6,6 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//lib:args4j", "//lib:guava", "//lib/auto:auto-value-annotations", diff --git a/java/gerrit/BUILD b/java/gerrit/BUILD index d7e23069ba..69b69513b9 100644 --- a/java/gerrit/BUILD +++ b/java/gerrit/BUILD @@ -6,7 +6,6 @@ java_library( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", diff --git a/javatests/com/google/gerrit/acceptance/api/group/BUILD b/javatests/com/google/gerrit/acceptance/api/group/BUILD index e311e256dd..1ba1138481 100644 --- a/javatests/com/google/gerrit/acceptance/api/group/BUILD +++ b/javatests/com/google/gerrit/acceptance/api/group/BUILD @@ -20,7 +20,6 @@ java_library( srcs = ["GroupAssert.java"], deps = [ "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//lib/truth", ], diff --git a/javatests/com/google/gerrit/acceptance/rest/account/BUILD b/javatests/com/google/gerrit/acceptance/rest/account/BUILD index e801dcc820..7509e550cd 100644 --- a/javatests/com/google/gerrit/acceptance/rest/account/BUILD +++ b/javatests/com/google/gerrit/acceptance/rest/account/BUILD @@ -22,7 +22,6 @@ java_library( deps = [ "//java/com/google/gerrit/acceptance:lib", "//java/com/google/gerrit/reviewdb:server", - "//java/com/google/gerrit/server/account/externalids/testing", "//lib:junit", ], ) diff --git a/javatests/com/google/gerrit/common/BUILD b/javatests/com/google/gerrit/common/BUILD index 29a23c3efe..c7b21a3fd3 100644 --- a/javatests/com/google/gerrit/common/BUILD +++ b/javatests/com/google/gerrit/common/BUILD @@ -8,8 +8,6 @@ junit_tests( "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/common:version", "//java/com/google/gerrit/launcher", - "//java/com/google/gerrit/reviewdb:server", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib/auto:auto-value", "//lib/auto:auto-value-annotations", diff --git a/javatests/com/google/gerrit/elasticsearch/BUILD b/javatests/com/google/gerrit/elasticsearch/BUILD index e50f2b5451..cae7ebddaa 100644 --- a/javatests/com/google/gerrit/elasticsearch/BUILD +++ b/javatests/com/google/gerrit/elasticsearch/BUILD @@ -12,7 +12,6 @@ java_library( deps = [ "//java/com/google/gerrit/elasticsearch", "//java/com/google/gerrit/index", - "//java/com/google/gerrit/server", "//lib:guava", "//lib:junit", "//lib/guice", diff --git a/javatests/com/google/gerrit/extensions/BUILD b/javatests/com/google/gerrit/extensions/BUILD index 94e433c346..2202a1168a 100644 --- a/javatests/com/google/gerrit/extensions/BUILD +++ b/javatests/com/google/gerrit/extensions/BUILD @@ -7,7 +7,6 @@ junit_tests( deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/extensions/common/testing:common-test-util", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib/guice", "//lib/truth", diff --git a/javatests/com/google/gerrit/extensions/conditions/BUILD b/javatests/com/google/gerrit/extensions/conditions/BUILD index 7ad2ad3239..e2d595113f 100644 --- a/javatests/com/google/gerrit/extensions/conditions/BUILD +++ b/javatests/com/google/gerrit/extensions/conditions/BUILD @@ -5,7 +5,6 @@ junit_tests( srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/extensions:lib", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/git/BUILD b/javatests/com/google/gerrit/git/BUILD index ca272b2b9a..4ac13af534 100644 --- a/javatests/com/google/gerrit/git/BUILD +++ b/javatests/com/google/gerrit/git/BUILD @@ -10,7 +10,6 @@ junit_tests( tags = ["no_windows"], deps = [ "//java/com/google/gerrit/git", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib:junit", "//lib/jgit/org.eclipse.jgit:jgit", diff --git a/javatests/com/google/gerrit/git/testing/BUILD b/javatests/com/google/gerrit/git/testing/BUILD index 13091853b2..56e9ec29c0 100644 --- a/javatests/com/google/gerrit/git/testing/BUILD +++ b/javatests/com/google/gerrit/git/testing/BUILD @@ -5,7 +5,6 @@ junit_tests( srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/git/testing", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/gpg/BUILD b/javatests/com/google/gerrit/gpg/BUILD index 6edfa93d91..f6926d3008 100644 --- a/javatests/com/google/gerrit/gpg/BUILD +++ b/javatests/com/google/gerrit/gpg/BUILD @@ -5,17 +5,14 @@ junit_tests( srcs = glob(["**/*.java"]), tags = ["no_windows"], visibility = ["//visibility:public"], + runtime_deps = ["//java/com/google/gerrit/lucene"], deps = [ - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/gpg", "//java/com/google/gerrit/gpg/testing:gpg-test-util", "//java/com/google/gerrit/lifecycle", - "//java/com/google/gerrit/lucene", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/cache/h2", - "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", diff --git a/javatests/com/google/gerrit/httpd/BUILD b/javatests/com/google/gerrit/httpd/BUILD index c6cd425be1..f1d0f2af18 100644 --- a/javatests/com/google/gerrit/httpd/BUILD +++ b/javatests/com/google/gerrit/httpd/BUILD @@ -4,14 +4,10 @@ junit_tests( name = "httpd_tests", srcs = glob(["**/*.java"]), deps = [ - "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/httpd", - "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/testing:gerrit-test-util", - "//java/com/google/gerrit/util/http", "//javatests/com/google/gerrit/util/http/testutil", "//lib:gson", "//lib:guava", diff --git a/javatests/com/google/gerrit/mail/BUILD b/javatests/com/google/gerrit/mail/BUILD index 54671dd7e0..b1c97120d0 100644 --- a/javatests/com/google/gerrit/mail/BUILD +++ b/javatests/com/google/gerrit/mail/BUILD @@ -8,18 +8,8 @@ junit_tests( ), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/extensions/common/testing:common-test-util", - "//java/com/google/gerrit/index", - "//java/com/google/gerrit/index:query_exception", - "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/mail", - "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/reviewdb:server", - "//java/com/google/gerrit/server", - "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:gson", "//lib:guava-retrying", diff --git a/javatests/com/google/gerrit/metrics/dropwizard/BUILD b/javatests/com/google/gerrit/metrics/dropwizard/BUILD index 63d4452193..98d12b2e7b 100644 --- a/javatests/com/google/gerrit/metrics/dropwizard/BUILD +++ b/javatests/com/google/gerrit/metrics/dropwizard/BUILD @@ -7,7 +7,6 @@ junit_tests( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/metrics/dropwizard", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib/truth", ], ) diff --git a/javatests/com/google/gerrit/pgm/BUILD b/javatests/com/google/gerrit/pgm/BUILD index 9eaadf8e63..d2e8b2ffb4 100644 --- a/javatests/com/google/gerrit/pgm/BUILD +++ b/javatests/com/google/gerrit/pgm/BUILD @@ -5,14 +5,12 @@ junit_tests( name = "pgm_tests", srcs = glob(["**/*.java"]), deps = [ - "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/pgm", "//java/com/google/gerrit/pgm/http", "//java/com/google/gerrit/pgm/init", "//java/com/google/gerrit/pgm/init/api", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/securestore/testing", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib:junit", "//lib/guice", diff --git a/javatests/com/google/gerrit/reviewdb/client/BUILD b/javatests/com/google/gerrit/reviewdb/client/BUILD index 391d80ee5b..8d3ce483d5 100644 --- a/javatests/com/google/gerrit/reviewdb/client/BUILD +++ b/javatests/com/google/gerrit/reviewdb/client/BUILD @@ -5,7 +5,6 @@ junit_tests( srcs = glob(["*.java"]), deps = [ "//java/com/google/gerrit/reviewdb:server", - "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib/jgit/org.eclipse.jgit:jgit", diff --git a/javatests/com/google/gerrit/server/BUILD b/javatests/com/google/gerrit/server/BUILD index 4383431b74..9445a8f87f 100644 --- a/javatests/com/google/gerrit/server/BUILD +++ b/javatests/com/google/gerrit/server/BUILD @@ -30,6 +30,7 @@ junit_tests( tags = ["no_windows"], visibility = ["//visibility:public"], runtime_deps = [ + "//java/com/google/gerrit/lucene", "//lib/bouncycastle:bcprov", "//prolog:gerrit-prolog-common", ], @@ -40,7 +41,6 @@ junit_tests( "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/extensions/common/testing:common-test-util", "//java/com/google/gerrit/git", "//java/com/google/gerrit/index", "//java/com/google/gerrit/index:query_exception", @@ -49,14 +49,12 @@ junit_tests( "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/mail", "//java/com/google/gerrit/metrics", - "//java/com/google/gerrit/proto", "//java/com/google/gerrit/proto/testing", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/account/externalids/testing", "//java/com/google/gerrit/server/cache/serialize", "//java/com/google/gerrit/server/cache/testing", - "//java/com/google/gerrit/server/group/testing", "//java/com/google/gerrit/server/ioutil", "//java/com/google/gerrit/server/logging", "//java/com/google/gerrit/server/project/testing:project-test-util", diff --git a/javatests/com/google/gerrit/server/cache/h2/BUILD b/javatests/com/google/gerrit/server/cache/h2/BUILD index 2ee8e48c05..98f1b0e9ec 100644 --- a/javatests/com/google/gerrit/server/cache/h2/BUILD +++ b/javatests/com/google/gerrit/server/cache/h2/BUILD @@ -4,7 +4,6 @@ junit_tests( name = "tests", srcs = glob(["**/*.java"]), deps = [ - "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/cache/h2", "//java/com/google/gerrit/server/cache/serialize", "//lib:guava", diff --git a/javatests/com/google/gerrit/server/ioutil/BUILD b/javatests/com/google/gerrit/server/ioutil/BUILD index ef0224397e..ac9530f6fa 100644 --- a/javatests/com/google/gerrit/server/ioutil/BUILD +++ b/javatests/com/google/gerrit/server/ioutil/BUILD @@ -10,7 +10,6 @@ junit_tests( visibility = ["//visibility:public"], deps = [ "//java/com/google/gerrit/server/ioutil", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib/truth", "//lib/truth:truth-java8-extension", diff --git a/javatests/com/google/gerrit/server/query/account/BUILD b/javatests/com/google/gerrit/server/query/account/BUILD index 7b72f4e268..99c6bd9c12 100644 --- a/javatests/com/google/gerrit/server/query/account/BUILD +++ b/javatests/com/google/gerrit/server/query/account/BUILD @@ -8,6 +8,10 @@ java_library( testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], + runtime_deps = [ + "//java/com/google/gerrit/lucene", + "//prolog:gerrit-prolog-common", + ], deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/index", @@ -21,7 +25,6 @@ java_library( "//lib/jgit/org.eclipse.jgit:jgit", "//lib/truth", "//lib/truth:truth-java8-extension", - "//prolog:gerrit-prolog-common", ], ) diff --git a/javatests/com/google/gerrit/server/query/change/BUILD b/javatests/com/google/gerrit/server/query/change/BUILD index 69f181f5d0..ba31271f44 100644 --- a/javatests/com/google/gerrit/server/query/change/BUILD +++ b/javatests/com/google/gerrit/server/query/change/BUILD @@ -11,7 +11,10 @@ java_library( testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], - runtime_deps = ["//prolog:gerrit-prolog-common"], + runtime_deps = [ + "//java/com/google/gerrit/lucene", + "//prolog:gerrit-prolog-common", + ], deps = [ "//java/com/google/gerrit/acceptance/testsuite/project", "//java/com/google/gerrit/common:annotations", @@ -66,7 +69,6 @@ junit_tests( ), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/exceptions", "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/proto/testing", "//java/com/google/gerrit/reviewdb:server", diff --git a/javatests/com/google/gerrit/server/query/group/BUILD b/javatests/com/google/gerrit/server/query/group/BUILD index 1271f4e1ed..528bd1e405 100644 --- a/javatests/com/google/gerrit/server/query/group/BUILD +++ b/javatests/com/google/gerrit/server/query/group/BUILD @@ -8,6 +8,7 @@ java_library( testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], + runtime_deps = ["//java/com/google/gerrit/lucene"], deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/index", diff --git a/javatests/com/google/gerrit/server/query/project/BUILD b/javatests/com/google/gerrit/server/query/project/BUILD index e978be6114..dc38a33a62 100644 --- a/javatests/com/google/gerrit/server/query/project/BUILD +++ b/javatests/com/google/gerrit/server/query/project/BUILD @@ -8,6 +8,7 @@ java_library( testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], + runtime_deps = ["//java/com/google/gerrit/lucene"], deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/index", @@ -35,7 +36,6 @@ junit_tests( deps = [ ":abstract_query_tests", "//java/com/google/gerrit/index/project", - "//java/com/google/gerrit/server", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib/guice", "//lib/jgit/org.eclipse.jgit:jgit", diff --git a/javatests/com/google/gerrit/server/rules/BUILD b/javatests/com/google/gerrit/server/rules/BUILD index 2545431e29..10bf54f653 100644 --- a/javatests/com/google/gerrit/server/rules/BUILD +++ b/javatests/com/google/gerrit/server/rules/BUILD @@ -5,6 +5,7 @@ junit_tests( srcs = glob(["*.java"]), resource_strip_prefix = "prologtests", resources = ["//prologtests:gerrit_common_test"], + runtime_deps = ["//prolog:gerrit-prolog-common"], deps = [ "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/reviewdb:server", @@ -18,6 +19,5 @@ junit_tests( "//lib/mockito", "//lib/prolog:runtime", "//lib/truth", - "//prolog:gerrit-prolog-common", ], ) diff --git a/javatests/com/google/gerrit/server/update/BUILD b/javatests/com/google/gerrit/server/update/BUILD index 6831fa3e95..e613981e56 100644 --- a/javatests/com/google/gerrit/server/update/BUILD +++ b/javatests/com/google/gerrit/server/update/BUILD @@ -4,16 +4,17 @@ junit_tests( name = "small_tests", size = "small", srcs = glob(["*.java"]), - runtime_deps = ["//prolog:gerrit-prolog-common"], + runtime_deps = [ + "//java/com/google/gerrit/lucene", + "//prolog:gerrit-prolog-common", + ], deps = [ "//java/com/google/gerrit/common:annotations", "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/logging", - "//java/com/google/gerrit/server/schema", "//java/com/google/gerrit/server/util/time", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", diff --git a/javatests/com/google/gerrit/server/util/git/BUILD b/javatests/com/google/gerrit/server/util/git/BUILD index 0cb7b8aee9..1cf8890f0e 100644 --- a/javatests/com/google/gerrit/server/util/git/BUILD +++ b/javatests/com/google/gerrit/server/util/git/BUILD @@ -10,8 +10,6 @@ junit_tests( deps = [ "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server/util/git", - "//java/com/google/gerrit/testing:gerrit-test-util", - "//java/com/google/gerrit/truth", "//lib:gson", "//lib:guava", "//lib:guava-retrying", diff --git a/javatests/com/google/gerrit/sshd/BUILD b/javatests/com/google/gerrit/sshd/BUILD index 7a5e18edfa..3e11ff22e2 100644 --- a/javatests/com/google/gerrit/sshd/BUILD +++ b/javatests/com/google/gerrit/sshd/BUILD @@ -5,9 +5,7 @@ junit_tests( srcs = glob(["**/*.java"]), deps = [ "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/server", "//java/com/google/gerrit/sshd", - "//java/com/google/gerrit/testing:gerrit-test-util", "//lib/mina:sshd", "//lib/truth", ], diff --git a/javatests/com/google/gerrit/util/http/BUILD b/javatests/com/google/gerrit/util/http/BUILD index 8edd852174..4711faa589 100644 --- a/javatests/com/google/gerrit/util/http/BUILD +++ b/javatests/com/google/gerrit/util/http/BUILD @@ -4,7 +4,6 @@ junit_tests( name = "http_tests", srcs = glob(["**/*.java"]), deps = [ - "//java/com/google/gerrit/testing:gerrit-test-util", "//java/com/google/gerrit/util/http", "//javatests/com/google/gerrit/util/http/testutil", "//lib:junit", diff --git a/javatests/com/google/gerrit/util/http/testutil/BUILD b/javatests/com/google/gerrit/util/http/testutil/BUILD index bf9915cc42..d7ac5bdf4e 100644 --- a/javatests/com/google/gerrit/util/http/testutil/BUILD +++ b/javatests/com/google/gerrit/util/http/testutil/BUILD @@ -6,7 +6,6 @@ java_library( srcs = glob(["**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/extensions:api", "//lib:guava", "//lib:servlet-api", "//lib/httpcomponents:httpclient", diff --git a/plugins/BUILD b/plugins/BUILD index e3069be79a..9f95c8b401 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -40,6 +40,7 @@ EXPORTS = [ "//java/com/google/gerrit/index:query_exception", "//java/com/google/gerrit/json", "//java/com/google/gerrit/lifecycle", + "//java/com/google/gerrit/lucene", "//java/com/google/gerrit/mail", "//java/com/google/gerrit/metrics", "//java/com/google/gerrit/metrics/dropwizard", diff --git a/tools/bzl/pkg_war.bzl b/tools/bzl/pkg_war.bzl index ab753bda69..c9ac0fe5a0 100644 --- a/tools/bzl/pkg_war.bzl +++ b/tools/bzl/pkg_war.bzl @@ -23,6 +23,7 @@ LIBS = [ "//lib/bouncycastle:bcprov", "//lib/bouncycastle:bcpg", "//lib/log:impl-log4j", + "//prolog:gerrit-prolog-common", "//resources:log4j-config", ]