From 2cd5b7470897796b91488b57333d542a325a8276 Mon Sep 17 00:00:00 2001 From: David Ostrovsky Date: Sun, 6 Oct 2019 00:13:58 +0200 Subject: [PATCH] Bazel: Remove superfluous dependencies flagged by unused_deps Bazel buildtools project includes in addition to buildifier also unused deps and buildozer utilities, that detect unused dependencies and fix them by applying the removal to the build files. This change is created by installing unused_deps from buildtools@HEAD and running: $ unused_deps //... and applying the suggested modifications. One side effect of this clean up, is that some plugins might need to be adapted. Particularly, j.c.g.g.server.audit:audit rule excessively added unused dependencies, among other lucene, and the audit rule is included in j.c.g.g.testing:gerrit-test-util rules and thus inherited by the core and plugins testing code. The correct way to do it, is to add lucene as runtime dependency instead. Another side effect is that //prolog:gerrit-prolog-common is now removed from j.c.g.g.httpd.init:init rule (as it is unused there). Given that init rule is a root for gerrit.war gathering machinery, the prolog predicates would be missing in the final build artifact. To rectify, add prolog predicates in addition to the init rule to the gerrit.war gathering machinery. Change-Id: Ib3e6c218ffc6a85f31e8a1192cdd60c759cbd68e --- java/com/google/gerrit/acceptance/BUILD | 1 - java/com/google/gerrit/httpd/auth/oauth/BUILD | 1 - java/com/google/gerrit/httpd/auth/openid/BUILD | 1 - java/com/google/gerrit/httpd/init/BUILD | 3 --- java/com/google/gerrit/lucene/BUILD | 4 ---- java/com/google/gerrit/pgm/BUILD | 2 -- java/com/google/gerrit/pgm/http/jetty/BUILD | 2 -- java/com/google/gerrit/pgm/util/BUILD | 2 -- java/com/google/gerrit/prettify/BUILD | 1 - java/com/google/gerrit/server/api/BUILD | 1 - java/com/google/gerrit/server/audit/BUILD | 13 ------------- java/com/google/gerrit/server/cache/h2/BUILD | 1 - .../com/google/gerrit/server/group/db/testing/BUILD | 3 --- java/com/google/gerrit/server/restapi/BUILD | 1 - java/com/google/gerrit/server/schema/BUILD | 1 - java/com/google/gerrit/sshd/BUILD | 2 -- java/com/google/gerrit/util/cli/BUILD | 1 - javatests/com/google/gerrit/gpg/BUILD | 4 ---- javatests/com/google/gerrit/httpd/BUILD | 4 ---- javatests/com/google/gerrit/mail/BUILD | 10 ---------- javatests/com/google/gerrit/reviewdb/BUILD | 1 - javatests/com/google/gerrit/server/cache/h2/BUILD | 1 - .../com/google/gerrit/server/query/account/BUILD | 2 +- .../com/google/gerrit/server/query/project/BUILD | 1 - javatests/com/google/gerrit/server/rules/BUILD | 2 +- javatests/com/google/gerrit/server/update/BUILD | 2 -- javatests/com/google/gerrit/server/util/git/BUILD | 1 - javatests/com/google/gerrit/sshd/BUILD | 1 - .../com/google/gerrit/util/http/testutil/BUILD | 1 - plugins/BUILD | 1 + tools/bzl/pkg_war.bzl | 1 + 31 files changed, 4 insertions(+), 68 deletions(-) diff --git a/java/com/google/gerrit/acceptance/BUILD b/java/com/google/gerrit/acceptance/BUILD index 3a0e89b9f9..55d38d88f2 100644 --- a/java/com/google/gerrit/acceptance/BUILD +++ b/java/com/google/gerrit/acceptance/BUILD @@ -103,7 +103,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/git/receive", diff --git a/java/com/google/gerrit/httpd/auth/oauth/BUILD b/java/com/google/gerrit/httpd/auth/oauth/BUILD index 4f60965bbb..a99d6df173 100644 --- a/java/com/google/gerrit/httpd/auth/oauth/BUILD +++ b/java/com/google/gerrit/httpd/auth/oauth/BUILD @@ -12,7 +12,6 @@ java_library( "//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:gwtorm", diff --git a/java/com/google/gerrit/httpd/auth/openid/BUILD b/java/com/google/gerrit/httpd/auth/openid/BUILD index 9f0767a445..2355833879 100644 --- a/java/com/google/gerrit/httpd/auth/openid/BUILD +++ b/java/com/google/gerrit/httpd/auth/openid/BUILD @@ -15,7 +15,6 @@ java_library( "//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:gwtorm", "//lib:servlet-api-3_1", diff --git a/java/com/google/gerrit/httpd/init/BUILD b/java/com/google/gerrit/httpd/init/BUILD index 17f4cef03b..d3b9e964fd 100644 --- a/java/com/google/gerrit/httpd/init/BUILD +++ b/java/com/google/gerrit/httpd/init/BUILD @@ -16,14 +16,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 ad08ff57eb..0eef397f7e 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:gwtorm", "//lib/lucene:lucene-core-and-backward-codecs", @@ -27,12 +25,10 @@ java_library( deps = [ ":query_builder", "//java/com/google/gerrit/common:annotations", - "//java/com/google/gerrit/common:server", "//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/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/logging", diff --git a/java/com/google/gerrit/pgm/BUILD b/java/com/google/gerrit/pgm/BUILD index e022e86475..c6cef19988 100644 --- a/java/com/google/gerrit/pgm/BUILD +++ b/java/com/google/gerrit/pgm/BUILD @@ -42,13 +42,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:gwtorm", diff --git a/java/com/google/gerrit/pgm/http/jetty/BUILD b/java/com/google/gerrit/pgm/http/jetty/BUILD index 43a8ed92b8..6e54a9461a 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/metrics", "//java/com/google/gerrit/server", diff --git a/java/com/google/gerrit/pgm/util/BUILD b/java/com/google/gerrit/pgm/util/BUILD index e31208fcd9..526a9324ad 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 8a11376634..c8657cf787 100644 --- a/java/com/google/gerrit/prettify/BUILD +++ b/java/com/google/gerrit/prettify/BUILD @@ -23,7 +23,6 @@ java_library( srcs = glob(["common/**/*.java"]), visibility = ["//visibility:public"], deps = [ - "//java/com/google/gerrit/reviewdb:server", "//java/org/eclipse/jgit:server", "//lib:guava", "//lib:gwtjsonrpc", diff --git a/java/com/google/gerrit/server/api/BUILD b/java/com/google/gerrit/server/api/BUILD index c4d735cc8d..61bc119672 100644 --- a/java/com/google/gerrit/server/api/BUILD +++ b/java/com/google/gerrit/server/api/BUILD @@ -10,7 +10,6 @@ java_library( "//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/restapi", diff --git a/java/com/google/gerrit/server/audit/BUILD b/java/com/google/gerrit/server/audit/BUILD index 5d6b749c1f..d8d3eba980 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", "//java/org/eclipse/jgit:server", "//lib:args4j", "//lib:autolink", @@ -86,7 +74,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/restapi/BUILD b/java/com/google/gerrit/server/restapi/BUILD index 6661fd7d18..ad54404f6f 100644 --- a/java/com/google/gerrit/server/restapi/BUILD +++ b/java/com/google/gerrit/server/restapi/BUILD @@ -20,7 +20,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", "//java/org/eclipse/jgit:server", diff --git a/java/com/google/gerrit/server/schema/BUILD b/java/com/google/gerrit/server/schema/BUILD index 50b92d3e8d..41016b0d95 100644 --- a/java/com/google/gerrit/server/schema/BUILD +++ b/java/com/google/gerrit/server/schema/BUILD @@ -15,7 +15,6 @@ java_library( "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", "//java/com/google/gerrit/server/util/time", - "//java/org/eclipse/jgit:server", "//lib:guava", "//lib:gwtorm", "//lib/auto:auto-value", diff --git a/java/com/google/gerrit/sshd/BUILD b/java/com/google/gerrit/sshd/BUILD index 99501a67d8..400ed0ebe6 100644 --- a/java/com/google/gerrit/sshd/BUILD +++ b/java/com/google/gerrit/sshd/BUILD @@ -9,12 +9,10 @@ java_library( "//java/com/google/gerrit/common:server", "//java/com/google/gerrit/extensions:api", "//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", diff --git a/java/com/google/gerrit/util/cli/BUILD b/java/com/google/gerrit/util/cli/BUILD index 754cb76f4e..e8e2911add 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/flogger:api", diff --git a/javatests/com/google/gerrit/gpg/BUILD b/javatests/com/google/gerrit/gpg/BUILD index baf65b75c4..c22e3eda04 100644 --- a/javatests/com/google/gerrit/gpg/BUILD +++ b/javatests/com/google/gerrit/gpg/BUILD @@ -6,16 +6,12 @@ junit_tests( tags = ["no_windows"], visibility = ["//visibility:public"], 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 ec2df15a71..d58e816ec9 100644 --- a/javatests/com/google/gerrit/httpd/BUILD +++ b/javatests/com/google/gerrit/httpd/BUILD @@ -4,13 +4,9 @@ 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/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 2fd8f24978..601429de45 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", "//java/org/eclipse/jgit:server", "//lib:gson", diff --git a/javatests/com/google/gerrit/reviewdb/BUILD b/javatests/com/google/gerrit/reviewdb/BUILD index 0fd140e91a..f93026219a 100644 --- a/javatests/com/google/gerrit/reviewdb/BUILD +++ b/javatests/com/google/gerrit/reviewdb/BUILD @@ -5,7 +5,6 @@ junit_tests( srcs = glob(["client/**/*.java"]), deps = [ "//java/com/google/gerrit/reviewdb:client", - "//java/com/google/gerrit/server/project/testing:project-test-util", "//java/com/google/gerrit/testing:gerrit-test-util", "//lib:guava", "//lib:gwtorm", 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/query/account/BUILD b/javatests/com/google/gerrit/server/query/account/BUILD index 7b72f4e268..95f493aae0 100644 --- a/javatests/com/google/gerrit/server/query/account/BUILD +++ b/javatests/com/google/gerrit/server/query/account/BUILD @@ -8,6 +8,7 @@ java_library( testonly = True, srcs = ABSTRACT_QUERY_TEST, visibility = ["//visibility:public"], + runtime_deps = ["//prolog:gerrit-prolog-common"], deps = [ "//java/com/google/gerrit/extensions:api", "//java/com/google/gerrit/index", @@ -21,7 +22,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/project/BUILD b/javatests/com/google/gerrit/server/query/project/BUILD index e978be6114..5afc7da590 100644 --- a/javatests/com/google/gerrit/server/query/project/BUILD +++ b/javatests/com/google/gerrit/server/query/project/BUILD @@ -35,7 +35,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 62d9a79177..1e335db063 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", @@ -17,6 +18,5 @@ junit_tests( "//lib/jgit/org.eclipse.jgit:jgit", "//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 cef3d631f8..d7038b6e0e 100644 --- a/javatests/com/google/gerrit/server/update/BUILD +++ b/javatests/com/google/gerrit/server/update/BUILD @@ -27,10 +27,8 @@ junit_tests( ), deps = [ "//java/com/google/gerrit/common:server", - "//java/com/google/gerrit/lifecycle", "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server", - "//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 61a776fafa..73587f9c11 100644 --- a/javatests/com/google/gerrit/server/util/git/BUILD +++ b/javatests/com/google/gerrit/server/util/git/BUILD @@ -10,7 +10,6 @@ junit_tests( deps = [ "//java/com/google/gerrit/reviewdb:server", "//java/com/google/gerrit/server/util/git", - "//java/com/google/gerrit/truth", "//java/org/eclipse/jgit:server", "//lib:gson", "//lib:guava", diff --git a/javatests/com/google/gerrit/sshd/BUILD b/javatests/com/google/gerrit/sshd/BUILD index ad7d8a9f27..3e11ff22e2 100644 --- a/javatests/com/google/gerrit/sshd/BUILD +++ b/javatests/com/google/gerrit/sshd/BUILD @@ -5,7 +5,6 @@ junit_tests( srcs = glob(["**/*.java"]), deps = [ "//java/com/google/gerrit/extensions:api", - "//java/com/google/gerrit/server", "//java/com/google/gerrit/sshd", "//lib/mina:sshd", "//lib/truth", diff --git a/javatests/com/google/gerrit/util/http/testutil/BUILD b/javatests/com/google/gerrit/util/http/testutil/BUILD index 5cb94c6d60..6acc7caf03 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-3_1", "//lib/httpcomponents:httpclient", diff --git a/plugins/BUILD b/plugins/BUILD index 345d50dad1..7d0a2ede57 100644 --- a/plugins/BUILD +++ b/plugins/BUILD @@ -37,6 +37,7 @@ EXPORTS = [ "//java/com/google/gerrit/index/project", "//java/com/google/gerrit/index:query_exception", "//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 ee57e54bf0..0943c51ebb 100644 --- a/tools/bzl/pkg_war.bzl +++ b/tools/bzl/pkg_war.bzl @@ -24,6 +24,7 @@ LIBS = [ "//lib/bouncycastle:bcprov", "//lib/bouncycastle:bcpg", "//lib/log:impl-log4j", + "//prolog:gerrit-prolog-common", "//resources:log4j-config", ]