commit 36d56eba98ecd3e54886b5ad2d08355acb283caf
author David Pursehouse <dpursehouse@collab.net> Thu Jun 14 07:40:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 14 07:40:39 2018 +0000
tree 0da01a02084b47bbb53edf4d3caa45d39f9bbea7
parent fd0fcb242237bfffe64ddc28094c32ad179c0954
parent fe0735cfaa0fa65008ebffbbde9c22eba4c9d4e8

Merge "Move commons-io from lib/BUILD to lib/commons/BUILD" into stable-2.14

Documentation/dev-contributing.txt

diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt
index 22e3174..ffb9272 100644
--- a/Documentation/dev-contributing.txt
+++ b/Documentation/dev-contributing.txt
@@ -155,7 +155,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.

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index b5e7d4c..3fa38cd 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",
@@ -929,7 +929,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",

gerrit-gwtui/BUILD

diff --git a/gerrit-gwtui/BUILD b/gerrit-gwtui/BUILD
index 721b646..982ac25 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")

polygerrit-ui/app/BUILD

diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 0c4238a..6a668e0 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -3,13 +3,13 @@
 )
 
 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",
 )
 
 vulcanize(