Merge "Merge branch 'stable-2.14' into stable-2.15" into stable-2.15
diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index 8acd663..e065e57 100644
--- a/Documentation/dev-contributing.txt
+++ b/Documentation/dev-contributing.txt
@@ -166,7 +166,7 @@
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.
diff --git a/WORKSPACE b/WORKSPACE
index 44c38f3..711c547 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -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 @@
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 @@
sha1 = "65bd0cacc9c79a21c6ed8e9f588577cd3c2f85b9",
)
-load("//tools/bzl:js.bzl", "npm_binary", "bower_archive")
+load("//tools/bzl:js.bzl", "bower_archive", "npm_binary")
npm_binary(
name = "bower",
diff --git a/gerrit-gwtui/BUILD b/gerrit-gwtui/BUILD
index ff1b862..86e67b5 100644
--- a/gerrit-gwtui/BUILD
+++ b/gerrit-gwtui/BUILD
@@ -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")
diff --git a/lib/BUILD b/lib/BUILD
index 5218424..cddc3cf 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -300,10 +300,3 @@
visibility = ["//visibility:public"],
exports = ["@postgresql//jar"],
)
-
-java_library(
- name = "commons-io",
- data = ["//lib:LICENSE-Apache2.0"],
- visibility = ["//visibility:public"],
- exports = ["@commons-io//jar"],
-)
diff --git a/lib/commons/BUILD b/lib/commons/BUILD
index 55c6b4e..ddb11e3 100644
--- a/lib/commons/BUILD
+++ b/lib/commons/BUILD
@@ -22,6 +22,13 @@
)
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"],
diff --git a/plugins/replication b/plugins/replication
index 6acd8e6..2f5f49f 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit 6acd8e6c042abe22c5c10973d96fbda7f979748a
+Subproject commit 2f5f49f0aae6c31e8cf58af3dbae07ca0f7dc59e
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 0994846..9134097f 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -4,13 +4,13 @@
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(
