Bazel: Clean up package visibility settings

For packages having a default visiblity defined, it is redundant to also
set the same visibility per package, so remove those.

For packages that only have one rule, and its visibility differs from the
default visibility, remove the default visibility.

Also clean up wrapping of some of the default definitions.

Change-Id: I9e81c3f724b4ffde7a652b485d33c650866ad122
This commit is contained in:
David Pursehouse
2018-12-07 11:07:41 +09:00
parent 0f13adc0bb
commit 1fa4bcfb6e
13 changed files with 5 additions and 49 deletions

2
BUILD
View File

@@ -9,7 +9,6 @@ genrule(
cmd = ("cat bazel-out/volatile-status.txt bazel-out/stable-status.txt | " +
"grep STABLE_BUILD_GERRIT_LABEL | cut -d ' ' -f 2 > $@"),
stamp = 1,
visibility = ["//visibility:public"],
)
genrule(
@@ -17,7 +16,6 @@ genrule(
srcs = ["//Documentation:licenses.txt"],
outs = ["LICENSES.txt"],
cmd = "cp $< $@",
visibility = ["//visibility:public"],
)
pkg_war(name = "gerrit")

View File

@@ -40,7 +40,6 @@ filegroup(
":prettify_files",
"//:LICENSES.txt",
],
visibility = ["//visibility:public"],
)
license_map(
@@ -51,7 +50,6 @@ license_map(
"//gerrit-gwtui:ui_module",
"//polygerrit-ui/app:polygerrit_ui",
],
visibility = ["//visibility:public"],
)
license_map(
@@ -60,7 +58,6 @@ license_map(
"//gerrit-gwtui:ui_module",
"//polygerrit-ui/app:polygerrit_ui",
],
visibility = ["//visibility:public"],
)
DOC_DIR = "Documentation"
@@ -88,7 +85,6 @@ genasciidoc(
srcs = SRCS,
attributes = documentation_attributes(),
backend = "html5",
visibility = ["//visibility:public"],
)
genasciidoc_zip(
@@ -97,7 +93,6 @@ genasciidoc_zip(
attributes = documentation_attributes(),
backend = "html5",
directory = DOC_DIR,
visibility = ["//visibility:public"],
)
genasciidoc_zip(
@@ -107,5 +102,4 @@ genasciidoc_zip(
backend = "html5",
directory = DOC_DIR,
searchbox = False,
visibility = ["//visibility:public"],
)

View File

@@ -1,6 +1,4 @@
package(
default_visibility = ["//visibility:public"],
)
package(default_visibility = ["//visibility:public"])
load("//tools/bzl:junit.bzl", "junit_tests")
@@ -14,7 +12,6 @@ java_library(
name = "httpd",
srcs = SRCS,
resources = RESOURCES,
visibility = ["//visibility:public"],
deps = [
"//gerrit-antlr:query_exception",
"//gerrit-common:annotations",

View File

@@ -1,6 +1,4 @@
package(
default_visibility = ["//visibility:public"],
)
package(default_visibility = ["//visibility:public"])
load("//tools/bzl:gwt.bzl", "gwt_module")
load("//tools/bzl:junit.bzl", "junit_tests")
@@ -13,7 +11,6 @@ gwt_module(
name = "client",
srcs = glob([SRC + "client/**/*.java"]),
gwt_xml = SRC + "ReviewDB.gwt.xml",
visibility = ["//visibility:public"],
deps = [
"//gerrit-extension-api:client",
"//lib:gwtorm-client",
@@ -25,7 +22,6 @@ java_library(
name = "server",
srcs = glob([SRC + "**/*.java"]),
resources = glob(["src/main/resources/**/*"]),
visibility = ["//visibility:public"],
deps = [
"//gerrit-extension-api:api",
"//lib:guava",

View File

@@ -3,49 +3,42 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "codec",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-codec//jar"],
)
java_library(
name = "collections",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-collections//jar"],
)
java_library(
name = "compress",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-compress//jar"],
)
java_library(
name = "io",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-io//jar"],
)
java_library(
name = "lang",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-lang//jar"],
)
java_library(
name = "net",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-net//jar"],
)
java_library(
name = "dbcp",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-dbcp//jar"],
runtime_deps = [":pool"],
)
@@ -53,20 +46,17 @@ java_library(
java_library(
name = "pool",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-pool//jar"],
)
java_library(
name = "oro",
data = ["//lib:LICENSE-Apache1.1"],
visibility = ["//visibility:public"],
exports = ["@commons-oro//jar"],
)
java_library(
name = "validator",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-validator//jar"],
)

View File

@@ -3,6 +3,5 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "elasticsearch-rest-client",
data = ["//lib:LICENSE-elasticsearch"],
visibility = ["//visibility:public"],
exports = ["@elasticsearch-rest-client//jar"],
)

View File

@@ -3,6 +3,5 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "greenmail",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@greenmail//jar"],
)

View File

@@ -3,7 +3,6 @@ package(default_visibility = ["//visibility:public"])
java_library(
name = "fluent-hc",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@fluent-hc//jar"],
runtime_deps = [":httpclient"],
)
@@ -11,7 +10,6 @@ java_library(
java_library(
name = "httpclient",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@httpclient//jar"],
runtime_deps = [
":httpcore",
@@ -23,7 +21,6 @@ java_library(
java_library(
name = "httpcore",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@httpcore//jar"],
)

View File

@@ -1,5 +1,3 @@
package(default_visibility = ["//visibility:public"])
java_library(
name = "jackson-core",
data = ["//lib:LICENSE-Apache2.0"],

View File

@@ -11,13 +11,11 @@ merge_maven_jars(
"@lucene-core//jar",
],
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
)
java_library(
name = "lucene-analyzers-common",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene-analyzers-common//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -25,14 +23,12 @@ java_library(
java_library(
name = "lucene-core",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene-core//jar"],
)
java_library(
name = "lucene-misc",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene-misc//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)
@@ -40,7 +36,6 @@ java_library(
java_library(
name = "lucene-queryparser",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@lucene-queryparser//jar"],
runtime_deps = [":lucene-core-and-backward-codecs"],
)

View File

@@ -12,9 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
package(
default_visibility = ["//visibility:public"],
)
package(default_visibility = ["//visibility:public"])
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library")

View File

@@ -1,6 +1,4 @@
package(
default_visibility = ["//visibility:public"],
)
package(default_visibility = ["//visibility:public"])
load("//tools/bzl:js.bzl", "bower_component_bundle")
load("//tools/bzl:genrule2.bzl", "genrule2")
@@ -39,5 +37,4 @@ genrule2(
"zip -qr $$ROOT/$@ fonts",
]),
output_to_bindir = 1,
visibility = ["//visibility:public"],
)

View File

@@ -1,6 +1,4 @@
package(
default_visibility = ["//visibility:public"],
)
package(default_visibility = ["//visibility:public"])
load("//tools/bzl:genrule2.bzl", "genrule2")
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_library")