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
This commit is contained in:
committed by
David Pursehouse
parent
17ef12713b
commit
2cd5b74708
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
1
java/com/google/gerrit/server/cache/h2/BUILD
vendored
1
java/com/google/gerrit/server/cache/h2/BUILD
vendored
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
],
|
||||
)
|
||||
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
],
|
||||
)
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -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",
|
||||
|
||||
@@ -24,6 +24,7 @@ LIBS = [
|
||||
"//lib/bouncycastle:bcprov",
|
||||
"//lib/bouncycastle:bcpg",
|
||||
"//lib/log:impl-log4j",
|
||||
"//prolog:gerrit-prolog-common",
|
||||
"//resources:log4j-config",
|
||||
]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user