Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Format WORKSPACE and BUILD files with buildifier version 0.12.0
  Move commons-io from lib/BUILD to lib/commons/BUILD

Change-Id: I6130353f0cceed80b370e5566d329acd7e0829b3
This commit is contained in:
David Pursehouse 2018-06-14 16:55:29 +09:00
commit e31b257f3f
7 changed files with 16 additions and 16 deletions

View File

@ -166,7 +166,7 @@ To format Java source code, Gerrit uses the
link:https://github.com/google/google-java-format[`google-java-format`]
tool (version 1.5), and to format Bazel BUILD and WORKSPACE files the
link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`]
tool (version 0.11.1).
tool (version 0.12.0).
These tools automatically apply format according to the style guides; this
streamlines code review by reducing the need for time-consuming, tedious,
and contentious discussions about trivial issues like whitespace.

View File

@ -1,7 +1,7 @@
workspace(name = "gerrit")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_LOCAL")
load("//tools/bzl:maven_jar.bzl", "GERRIT", "MAVEN_LOCAL", "maven_jar")
load("//lib/codemirror:cm.bzl", "CM_VERSION", "DIFF_MATCH_PATCH_VERSION")
load("//plugins:external_plugin_deps.bzl", "external_plugin_deps")
@ -218,7 +218,7 @@ maven_jar(
sha1 = "675642ac208e0b741bc9118dcbcae44c271b992a",
)
load("//lib:guava.bzl", "GUAVA_VERSION", "GUAVA_BIN_SHA1")
load("//lib:guava.bzl", "GUAVA_BIN_SHA1", "GUAVA_VERSION")
maven_jar(
name = "guava",
@ -934,7 +934,7 @@ maven_jar(
sha1 = "65bd0cacc9c79a21c6ed8e9f588577cd3c2f85b9",
)
load("//tools/bzl:js.bzl", "npm_binary", "bower_archive")
load("//tools/bzl:js.bzl", "bower_archive", "npm_binary")
npm_binary(
name = "bower",

View File

@ -1,7 +1,7 @@
load(
"//tools/bzl:gwt.bzl",
"gwt_genrule",
"gen_ui_module",
"gwt_genrule",
"gwt_user_agent_permutations",
)
load("//tools/bzl:license.bzl", "license_test")

View File

@ -300,10 +300,3 @@ java_library(
visibility = ["//visibility:public"],
exports = ["@postgresql//jar"],
)
java_library(
name = "commons-io",
data = ["//lib:LICENSE-Apache2.0"],
visibility = ["//visibility:public"],
exports = ["@commons-io//jar"],
)

View File

@ -21,6 +21,13 @@ java_library(
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"],

@ -1 +1 @@
Subproject commit 6acd8e6c042abe22c5c10973d96fbda7f979748a
Subproject commit 2f5f49f0aae6c31e8cf58af3dbae07ca0f7dc59e

View File

@ -4,13 +4,13 @@ package(
load(":rules.bzl", "polygerrit_bundle")
load("//tools/bzl:genrule2.bzl", "genrule2")
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_library", "closure_js_binary")
load("@io_bazel_rules_closure//closure:defs.bzl", "closure_js_binary", "closure_js_library")
load(
"//tools/bzl:js.bzl",
"bower_component_bundle",
"vulcanize",
"bower_component",
"bower_component_bundle",
"js_component",
"vulcanize",
)
polygerrit_bundle(