opendev
/
gerrit
Code Issues Proposed changes

Merge branch 'stable-2.14' into stable-2.15 

* stable-2.14:
  Bazel: Clean up package visibility settings

Change-Id: I7608cb4c8ea4d0e22185b4633f27867668a282b1
This commit is contained in:
David Pursehouse 2018-12-08 10:10:00 +09:00
parent 74514365ed 1fa4bcfb6e
commit b0ff9fc598
13 changed files with 5 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD
View File

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

6
Documentation/BUILD
View File

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

5
gerrit-httpd/BUILD
View File

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

6
gerrit-reviewdb/BUILD
View File

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

10
lib/commons/BUILD
View File

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

1
lib/elasticsearch-rest-client/BUILD
View File

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

1
lib/greenmail/BUILD
View File

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

3
lib/httpcomponents/BUILD
View File

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

2
lib/jackson/BUILD
View File

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

5
lib/lucene/BUILD
View File

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

4
lib/polymer_externs/BUILD
View File

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

5
polygerrit-ui/BUILD
View File

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

4
polygerrit-ui/app/BUILD
View File

@ -1,6 +1,4 @@
package( package(default_visibility = ["//visibility:public"])
default_visibility = ["//visibility:public"],
)
load(":rules.bzl", "polygerrit_bundle") load(":rules.bzl", "polygerrit_bundle")
load("//tools/bzl:genrule2.bzl", "genrule2") load("//tools/bzl:genrule2.bzl", "genrule2")