Merge "Send email notification to user that is assigned to a change"
diff --git a/BUILD b/BUILD
index c914fb7..b859642 100644
--- a/BUILD
+++ b/BUILD
@@ -1,26 +1,44 @@
-package(default_visibility = ['//visibility:public'])
-load('//tools/bzl:pkg_war.bzl', 'pkg_war')
+package(default_visibility = ["//visibility:public"])
+
+load("//tools/bzl:pkg_war.bzl", "pkg_war")
 
 genrule(
-  name = 'gen_version',
-  stamp = 1,
-  cmd = ("cat bazel-out/volatile-status.txt bazel-out/stable-status.txt | " +
-    "grep STABLE_BUILD_GERRIT_LABEL | cut -d ' ' -f 2 > $@"),
-  outs = ['version.txt'],
-  visibility = ['//visibility:public'],
+    name = "gen_version",
+    outs = ["version.txt"],
+    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(
-  name = "LICENSES",
-  srcs = ["//Documentation:licenses.txt"],
-  cmd = "cp $< $@",
-  outs = ["LICENSES.txt"],
-  visibility = ['//visibility:public'],
+    name = "LICENSES",
+    srcs = ["//Documentation:licenses.txt"],
+    outs = ["LICENSES.txt"],
+    cmd = "cp $< $@",
+    visibility = ["//visibility:public"],
 )
 
-pkg_war(name = 'gerrit')
-pkg_war(name = 'headless', ui = None)
-pkg_war(name = "polygerrit", ui = "polygerrit")
-pkg_war(name = 'release', ui = 'ui_optdbg_r', context = ['//plugins:core'], doc = True)
-pkg_war(name = 'withdocs', doc = True)
+pkg_war(name = "gerrit")
 
+pkg_war(
+    name = "headless",
+    ui = None,
+)
+
+pkg_war(
+    name = "polygerrit",
+    ui = "polygerrit",
+)
+
+pkg_war(
+    name = "release",
+    context = ["//plugins:core"],
+    doc = True,
+    ui = "ui_optdbg_r",
+)
+
+pkg_war(
+    name = "withdocs",
+    doc = True,
+)
diff --git a/Documentation/BUILD b/Documentation/BUILD
index 4f5ed5e..d9c123d 100644
--- a/Documentation/BUILD
+++ b/Documentation/BUILD
@@ -1,4 +1,4 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
 
 load("//tools/bzl:asciidoc.bzl", "documentation_attributes")
 load("//tools/bzl:asciidoc.bzl", "genasciidoc")
@@ -6,96 +6,97 @@
 load("//tools/bzl:license.bzl", "license_map")
 
 exports_files([
-  "replace_macros.py",
+    "replace_macros.py",
 ])
 
 filegroup(
-  name = "prettify_files",
-  srcs = [
-    ":prettify.min.css",
-    ":prettify.min.js",
-  ],
+    name = "prettify_files",
+    srcs = [
+        ":prettify.min.css",
+        ":prettify.min.js",
+    ],
 )
 
 genrule(
-  name = "prettify_min_css",
-  srcs = ["//gerrit-prettify:src/main/resources/com/google/gerrit/prettify/client/prettify.css"],
-  cmd = "cp $< $@",
-  outs = ["prettify.min.css"],
+    name = "prettify_min_css",
+    srcs = ["//gerrit-prettify:src/main/resources/com/google/gerrit/prettify/client/prettify.css"],
+    outs = ["prettify.min.css"],
+    cmd = "cp $< $@",
 )
 
 genrule(
-  name = "prettify_min_js",
-  srcs = ["//gerrit-prettify:src/main/resources/com/google/gerrit/prettify/client/prettify.js"],
-  cmd = "cp $< $@",
-  outs = ["prettify.min.js"],
+    name = "prettify_min_js",
+    srcs = ["//gerrit-prettify:src/main/resources/com/google/gerrit/prettify/client/prettify.js"],
+    outs = ["prettify.min.js"],
+    cmd = "cp $< $@",
 )
 
 filegroup(
-  name = "resources",
-  srcs = glob([
-    "images/*.jpg",
-    "images/*.png",
-  ]) + [
-    ":prettify_files",
-    "//:LICENSES.txt",
-  ],
-  visibility = ['//visibility:public'],
+    name = "resources",
+    srcs = glob([
+        "images/*.jpg",
+        "images/*.png",
+    ]) + [
+        ":prettify_files",
+        "//:LICENSES.txt",
+    ],
+    visibility = ["//visibility:public"],
 )
 
 license_map(
-  name = "licenses",
-  targets = [
-    "//gerrit-pgm:pgm",
-    "//gerrit-gwtui:ui_module",
-    "//polygerrit-ui/app:polygerrit_ui",
-  ],
-  opts = ["--asciidoctor"],
-  visibility = ['//visibility:public'],
+    name = "licenses",
+    opts = ["--asciidoctor"],
+    targets = [
+        "//gerrit-pgm:pgm",
+        "//gerrit-gwtui:ui_module",
+        "//polygerrit-ui/app:polygerrit_ui",
+    ],
+    visibility = ["//visibility:public"],
 )
 
 DOC_DIR = "Documentation"
+
 SRCS = glob(["*.txt"]) + [":licenses.txt"]
 
 genrule(
-  name = "index",
-  cmd = "$(location //lib/asciidoctor:doc_indexer) " +
-      "-o $(OUTS) " +
-      '--prefix "%s/" ' % DOC_DIR +
-      '--in-ext ".txt" ' +
-      '--out-ext ".html" ' +
-      "$(SRCS)",
-  tools = ["//lib/asciidoctor:doc_indexer"],
-  srcs = SRCS,
-  outs = ["index.jar"],
+    name = "index",
+    srcs = SRCS,
+    outs = ["index.jar"],
+    cmd = "$(location //lib/asciidoctor:doc_indexer) " +
+          "-o $(OUTS) " +
+          "--prefix \"%s/\" " % DOC_DIR +
+          "--in-ext \".txt\" " +
+          "--out-ext \".html\" " +
+          "$(SRCS)",
+    tools = ["//lib/asciidoctor:doc_indexer"],
 )
 
 # For the same srcs, we can have multiple genasciidoc_zip rules, but only one
 # genasciidoc rule. Because multiple genasciidoc rules will have conflicting
 # output files.
 genasciidoc(
-  name = "Documentation",
-  srcs = SRCS,
-  attributes = documentation_attributes(),
-  backend = "html5",
-  visibility = ["//visibility:public"],
+    name = "Documentation",
+    srcs = SRCS,
+    attributes = documentation_attributes(),
+    backend = "html5",
+    visibility = ["//visibility:public"],
 )
 
 genasciidoc_zip(
-  name = "html",
-  srcs = SRCS,
-  attributes = documentation_attributes(),
-  backend = "html5",
-  directory = DOC_DIR,
-  visibility = ["//visibility:public"],
+    name = "html",
+    srcs = SRCS,
+    attributes = documentation_attributes(),
+    backend = "html5",
+    directory = DOC_DIR,
+    visibility = ["//visibility:public"],
 )
 
 genasciidoc_zip(
-  name = "searchfree",
-  srcs = SRCS,
-  attributes = documentation_attributes(),
-  backend = "html5",
-  directory = DOC_DIR,
-  searchbox = False,
-  visibility = ["//visibility:public"],
+    name = "searchfree",
+    srcs = SRCS,
+    attributes = documentation_attributes(),
+    backend = "html5",
+    directory = DOC_DIR,
+    searchbox = False,
+    visibility = ["//visibility:public"],
 )
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index 1564bb6..33c63b2 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -2915,6 +2915,15 @@
 +
 Default is `cn`.
 
+[[ldap.mandatoryGroup]]ldap.mandatoryGroup::
++
+All users must be a member of this group to allow account creation or
+authentication.
++
+Setting mandatoryGroup implies enabling of `ldap.fetchMemberOfEagerly`
++
+By default, unset.
+
 [[ldap.localUsernameToLowerCase]]ldap.localUsernameToLowerCase::
 +
 Converts the local username, that is used to login into the Gerrit
diff --git a/Documentation/rest-api-changes.txt b/Documentation/rest-api-changes.txt
index acb8a47..d60385c 100644
--- a/Documentation/rest-api-changes.txt
+++ b/Documentation/rest-api-changes.txt
@@ -294,9 +294,9 @@
 --
 * `REVIEWED`: include the `reviewed` field if all of the following are
   true:
-  * the change is open
-  * the caller is authenticated
-  * the caller has commented on the change more recently than the last update
+  - the change is open
+  - the caller is authenticated
+  - the caller has commented on the change more recently than the last update
     from the change owner, i.e. this change would show up in the results of
     link:user-search.html#reviewedby[reviewedby:self].
 --
diff --git a/ReleaseNotes/BUILD b/ReleaseNotes/BUILD
index 9bf572e..b0c8a13 100644
--- a/ReleaseNotes/BUILD
+++ b/ReleaseNotes/BUILD
@@ -2,26 +2,24 @@
 load("//tools/bzl:asciidoc.bzl", "genasciidoc")
 load("//tools/bzl:asciidoc.bzl", "genasciidoc_zip")
 
-
-SRCS = glob(['*.txt'])
-
+SRCS = glob(["*.txt"])
 
 genasciidoc(
-  name = 'ReleaseNotes',
-  srcs = SRCS,
-  attributes = release_notes_attributes(),
-  backend = 'html5',
-  searchbox = False,
-  resources = False,
-  visibility = ["//visibility:public"],
+    name = "ReleaseNotes",
+    srcs = SRCS,
+    attributes = release_notes_attributes(),
+    backend = "html5",
+    resources = False,
+    searchbox = False,
+    visibility = ["//visibility:public"],
 )
 
 genasciidoc_zip(
-  name = "html",
-  srcs = SRCS,
-  attributes = release_notes_attributes(),
-  backend = 'html5',
-  searchbox = False,
-  resources = False,
-  visibility = ["//visibility:public"],
+    name = "html",
+    srcs = SRCS,
+    attributes = release_notes_attributes(),
+    backend = "html5",
+    resources = False,
+    searchbox = False,
+    visibility = ["//visibility:public"],
 )
diff --git a/WORKSPACE b/WORKSPACE
index 251b4f5..9224464 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,1106 +1,1107 @@
-workspace(name="gerrit")
+workspace(name = "gerrit")
+
 load("//tools/bzl:maven_jar.bzl", "maven_jar", "GERRIT", "MAVEN_LOCAL")
 
-ANTLR_VERS = '3.5.2'
+ANTLR_VERS = "3.5.2"
 
 maven_jar(
-  name = 'java_runtime',
-  artifact = 'org.antlr:antlr-runtime:' + ANTLR_VERS,
-  sha1 = 'cd9cd41361c155f3af0f653009dcecb08d8b4afd',
+    name = "java_runtime",
+    artifact = "org.antlr:antlr-runtime:" + ANTLR_VERS,
+    sha1 = "cd9cd41361c155f3af0f653009dcecb08d8b4afd",
 )
 
 maven_jar(
-  name = 'stringtemplate',
-  artifact = 'org.antlr:stringtemplate:4.0.2',
-  sha1 = 'e28e09e2d44d60506a7bcb004d6c23ff35c6ac08',
+    name = "stringtemplate",
+    artifact = "org.antlr:stringtemplate:4.0.2",
+    sha1 = "e28e09e2d44d60506a7bcb004d6c23ff35c6ac08",
 )
 
 maven_jar(
-  name = 'org_antlr',
-  artifact = 'org.antlr:antlr:' + ANTLR_VERS,
-  sha1 = 'c4a65c950bfc3e7d04309c515b2177c00baf7764',
+    name = "org_antlr",
+    artifact = "org.antlr:antlr:" + ANTLR_VERS,
+    sha1 = "c4a65c950bfc3e7d04309c515b2177c00baf7764",
 )
 
 maven_jar(
-  name = 'antlr27',
-  artifact = 'antlr:antlr:2.7.7',
-  sha1 = '83cd2cd674a217ade95a4bb83a8a14f351f48bd0',
-  attach_source = False,
+    name = "antlr27",
+    artifact = "antlr:antlr:2.7.7",
+    attach_source = False,
+    sha1 = "83cd2cd674a217ade95a4bb83a8a14f351f48bd0",
 )
 
-GUICE_VERS = '4.1.0'
+GUICE_VERS = "4.1.0"
 
 maven_jar(
-  name = 'guice_library',
-  artifact = 'com.google.inject:guice:' + GUICE_VERS,
-  sha1 = 'eeb69005da379a10071aa4948c48d89250febb07',
+    name = "guice_library",
+    artifact = "com.google.inject:guice:" + GUICE_VERS,
+    sha1 = "eeb69005da379a10071aa4948c48d89250febb07",
 )
 
 maven_jar(
-  name = 'guice_assistedinject',
-  artifact = 'com.google.inject.extensions:guice-assistedinject:' + GUICE_VERS,
-  sha1 = 'af799dd7e23e6fe8c988da12314582072b07edcb',
+    name = "guice_assistedinject",
+    artifact = "com.google.inject.extensions:guice-assistedinject:" + GUICE_VERS,
+    sha1 = "af799dd7e23e6fe8c988da12314582072b07edcb",
 )
 
 maven_jar(
-  name = 'guice_servlet',
-  artifact = 'com.google.inject.extensions:guice-servlet:' + GUICE_VERS,
-  sha1 = '90ac2db772d9b85e2b05417b74f7464bcc061dcb',
+    name = "guice_servlet",
+    artifact = "com.google.inject.extensions:guice-servlet:" + GUICE_VERS,
+    sha1 = "90ac2db772d9b85e2b05417b74f7464bcc061dcb",
 )
 
 maven_jar(
-  name = 'multibindings',
-  artifact = 'com.google.inject.extensions:guice-multibindings:' + GUICE_VERS,
-  sha1 = '3b27257997ac51b0f8d19676f1ea170427e86d51',
+    name = "multibindings",
+    artifact = "com.google.inject.extensions:guice-multibindings:" + GUICE_VERS,
+    sha1 = "3b27257997ac51b0f8d19676f1ea170427e86d51",
 )
 
 maven_jar(
-  name = 'aopalliance',
-  artifact = 'aopalliance:aopalliance:1.0',
-  sha1 = '0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8',
+    name = "aopalliance",
+    artifact = "aopalliance:aopalliance:1.0",
+    sha1 = "0235ba8b489512805ac13a8f9ea77a1ca5ebe3e8",
 )
 
 maven_jar(
-  name = 'javax_inject',
-  artifact = 'javax.inject:javax.inject:1',
-  sha1 = '6975da39a7040257bd51d21a231b76c915872d38',
+    name = "javax_inject",
+    artifact = "javax.inject:javax.inject:1",
+    sha1 = "6975da39a7040257bd51d21a231b76c915872d38",
 )
 
 maven_jar(
-  name = 'servlet_api_3_1',
-  artifact = 'org.apache.tomcat:tomcat-servlet-api:8.0.24',
-  sha1 = '5d9e2e895e3111622720157d0aa540066d5fce3a',
+    name = "servlet_api_3_1",
+    artifact = "org.apache.tomcat:tomcat-servlet-api:8.0.24",
+    sha1 = "5d9e2e895e3111622720157d0aa540066d5fce3a",
 )
 
-GWT_VERS = '2.8.0'
+GWT_VERS = "2.8.0"
 
 maven_jar(
-  name = 'user',
-  artifact = 'com.google.gwt:gwt-user:' + GWT_VERS,
-  sha1 = '518579870499e15531f454f35dca0772d7fa31f7',
+    name = "user",
+    artifact = "com.google.gwt:gwt-user:" + GWT_VERS,
+    sha1 = "518579870499e15531f454f35dca0772d7fa31f7",
 )
 
 maven_jar(
-  name = 'dev',
-  artifact = 'com.google.gwt:gwt-dev:' + GWT_VERS,
-  sha1 = 'f160a61272c5ebe805cd2d3d3256ed3ecf14893f',
+    name = "dev",
+    artifact = "com.google.gwt:gwt-dev:" + GWT_VERS,
+    sha1 = "f160a61272c5ebe805cd2d3d3256ed3ecf14893f",
 )
 
 maven_jar(
-  name = 'javax_validation',
-  artifact = 'javax.validation:validation-api:1.0.0.GA',
-  sha1 = 'b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e',
-  src_sha1 = '7a561191db2203550fbfa40d534d4997624cd369',
+    name = "javax_validation",
+    artifact = "javax.validation:validation-api:1.0.0.GA",
+    sha1 = "b6bd7f9d78f6fdaa3c37dae18a4bd298915f328e",
+    src_sha1 = "7a561191db2203550fbfa40d534d4997624cd369",
 )
 
 maven_jar(
-  name = 'jsinterop_annotations',
-  artifact = 'com.google.jsinterop:jsinterop-annotations:1.0.0',
-  sha1 = '23c3a3c060ffe4817e67673cc8294e154b0a4a95',
-  src_sha1 = '5d7c478efbfccc191430d7c118d7bd2635e43750',
+    name = "jsinterop_annotations",
+    artifact = "com.google.jsinterop:jsinterop-annotations:1.0.0",
+    sha1 = "23c3a3c060ffe4817e67673cc8294e154b0a4a95",
+    src_sha1 = "5d7c478efbfccc191430d7c118d7bd2635e43750",
 )
 
 maven_jar(
-  name = 'ant',
-  artifact = 'ant:ant:1.6.5',
-  sha1 = '7d18faf23df1a5c3a43613952e0e8a182664564b',
-  attach_source = False,
+    name = "ant",
+    artifact = "ant:ant:1.6.5",
+    attach_source = False,
+    sha1 = "7d18faf23df1a5c3a43613952e0e8a182664564b",
 )
 
 maven_jar(
-  name = 'colt',
-  artifact = 'colt:colt:1.2.0',
-  sha1 = '0abc984f3adc760684d49e0f11ddf167ba516d4f',
-  attach_source = False,
+    name = "colt",
+    artifact = "colt:colt:1.2.0",
+    attach_source = False,
+    sha1 = "0abc984f3adc760684d49e0f11ddf167ba516d4f",
 )
 
 maven_jar(
-  name = 'tapestry',
-  artifact = 'tapestry:tapestry:4.0.2',
-  sha1 = 'e855a807425d522e958cbce8697f21e9d679b1f7',
-  attach_source = False,
+    name = "tapestry",
+    artifact = "tapestry:tapestry:4.0.2",
+    attach_source = False,
+    sha1 = "e855a807425d522e958cbce8697f21e9d679b1f7",
 )
 
 maven_jar(
-  name = 'w3c_css_sac',
-  artifact = 'org.w3c.css:sac:1.3',
-  sha1 = 'cdb2dcb4e22b83d6b32b93095f644c3462739e82',
+    name = "w3c_css_sac",
+    artifact = "org.w3c.css:sac:1.3",
+    sha1 = "cdb2dcb4e22b83d6b32b93095f644c3462739e82",
 )
 
-load('//lib/jgit:jgit.bzl', 'JGIT_VERS')
+load("//lib/jgit:jgit.bzl", "JGIT_VERS")
 
 maven_jar(
-  name = 'jgit',
-  artifact = 'org.eclipse.jgit:org.eclipse.jgit:' + JGIT_VERS,
-  sha1 = '34315f71bb9becf6ff75947a9c43c415b929ec21',
-  src_sha1 = '8320c18472870904eb7fb860af353fea818d07e4',
-  repository = GERRIT,
-  unsign = True,
+    name = "jgit",
+    artifact = "org.eclipse.jgit:org.eclipse.jgit:" + JGIT_VERS,
+    repository = GERRIT,
+    sha1 = "34315f71bb9becf6ff75947a9c43c415b929ec21",
+    src_sha1 = "8320c18472870904eb7fb860af353fea818d07e4",
+    unsign = True,
 )
 
 maven_jar(
-  name = 'jgit_servlet',
-  artifact = 'org.eclipse.jgit:org.eclipse.jgit.http.server:' + JGIT_VERS,
-  sha1 = '927990025d2970995dbb58f03763eeb776fec8fd',
-  repository = GERRIT,
-  unsign = True,
+    name = "jgit_servlet",
+    artifact = "org.eclipse.jgit:org.eclipse.jgit.http.server:" + JGIT_VERS,
+    repository = GERRIT,
+    sha1 = "927990025d2970995dbb58f03763eeb776fec8fd",
+    unsign = True,
 )
 
 maven_jar(
-  name = 'javaewah',
-  artifact = 'com.googlecode.javaewah:JavaEWAH:1.1.6',
-  sha1 = '94ad16d728b374d65bd897625f3fbb3da223a2b6',
-  attach_source = False,
+    name = "javaewah",
+    artifact = "com.googlecode.javaewah:JavaEWAH:1.1.6",
+    attach_source = False,
+    sha1 = "94ad16d728b374d65bd897625f3fbb3da223a2b6",
 )
 
 maven_jar(
-  name = 'jgit_archive',
-  artifact = 'org.eclipse.jgit:org.eclipse.jgit.archive:' + JGIT_VERS,
-  sha1 = '4a5d058915400c1ef497bfeeb5e87d235213e273',
-  repository = GERRIT,
+    name = "jgit_archive",
+    artifact = "org.eclipse.jgit:org.eclipse.jgit.archive:" + JGIT_VERS,
+    repository = GERRIT,
+    sha1 = "4a5d058915400c1ef497bfeeb5e87d235213e273",
 )
 
 maven_jar(
-  name = 'jgit_junit',
-  artifact = 'org.eclipse.jgit:org.eclipse.jgit.junit:' + JGIT_VERS,
-  sha1 = '8e3cb9b1f632fdfea76b04c286a2c0d8d260ebce',
-  repository = GERRIT,
-  unsign = True,
+    name = "jgit_junit",
+    artifact = "org.eclipse.jgit:org.eclipse.jgit.junit:" + JGIT_VERS,
+    repository = GERRIT,
+    sha1 = "8e3cb9b1f632fdfea76b04c286a2c0d8d260ebce",
+    unsign = True,
 )
 
 maven_jar(
-  name = 'gwtjsonrpc',
-  artifact = 'com.google.gerrit:gwtjsonrpc:1.11',
-  sha1 = '0990e7eec9eec3a15661edcf9232acbac4aeacec',
-  src_sha1 = 'a682afc46284fb58197a173cb5818770a1e7834a',
+    name = "gwtjsonrpc",
+    artifact = "com.google.gerrit:gwtjsonrpc:1.11",
+    sha1 = "0990e7eec9eec3a15661edcf9232acbac4aeacec",
+    src_sha1 = "a682afc46284fb58197a173cb5818770a1e7834a",
 )
 
 maven_jar(
-  name = 'gson',
-  artifact = 'com.google.code.gson:gson:2.7',
-  sha1 = '751f548c85fa49f330cecbb1875893f971b33c4e',
+    name = "gson",
+    artifact = "com.google.code.gson:gson:2.7",
+    sha1 = "751f548c85fa49f330cecbb1875893f971b33c4e",
 )
 
 maven_jar(
-  name = 'gwtorm_client',
-  artifact = 'com.google.gerrit:gwtorm:1.16',
-  sha1 = '3e41b6d7bb352fa0539ce23b9bce97cf8c26c3bf',
-  src_sha1 = 'f45b7bacc79a0e5a7f6cf799a2dba23cc5bca19b',
+    name = "gwtorm_client",
+    artifact = "com.google.gerrit:gwtorm:1.16",
+    sha1 = "3e41b6d7bb352fa0539ce23b9bce97cf8c26c3bf",
+    src_sha1 = "f45b7bacc79a0e5a7f6cf799a2dba23cc5bca19b",
 )
 
 maven_jar(
-  name = 'protobuf',
-  artifact = 'com.google.protobuf:protobuf-java:2.5.0',
-  sha1 = 'a10732c76bfacdbd633a7eb0f7968b1059a65dfa',
+    name = "protobuf",
+    artifact = "com.google.protobuf:protobuf-java:2.5.0",
+    sha1 = "a10732c76bfacdbd633a7eb0f7968b1059a65dfa",
 )
 
 maven_jar(
-  name = 'joda_time',
-  artifact = 'joda-time:joda-time:2.9.4',
-  sha1 = '1c295b462f16702ebe720bbb08f62e1ba80da41b',
+    name = "joda_time",
+    artifact = "joda-time:joda-time:2.9.4",
+    sha1 = "1c295b462f16702ebe720bbb08f62e1ba80da41b",
 )
 
 maven_jar(
-  name = 'joda_convert',
-  artifact = 'org.joda:joda-convert:1.8.1',
-  sha1 = '675642ac208e0b741bc9118dcbcae44c271b992a',
+    name = "joda_convert",
+    artifact = "org.joda:joda-convert:1.8.1",
+    sha1 = "675642ac208e0b741bc9118dcbcae44c271b992a",
 )
 
-load('//lib:guava.bzl', 'GUAVA_VERSION', 'GUAVA_BIN_SHA1')
+load("//lib:guava.bzl", "GUAVA_VERSION", "GUAVA_BIN_SHA1")
 
 maven_jar(
-  name = 'guava',
-  artifact = 'com.google.guava:guava:' + GUAVA_VERSION,
-  sha1 = GUAVA_BIN_SHA1,
+    name = "guava",
+    artifact = "com.google.guava:guava:" + GUAVA_VERSION,
+    sha1 = GUAVA_BIN_SHA1,
 )
 
 maven_jar(
-  name = 'velocity',
-  artifact = 'org.apache.velocity:velocity:1.7',
-  sha1 = '2ceb567b8f3f21118ecdec129fe1271dbc09aa7a',
+    name = "velocity",
+    artifact = "org.apache.velocity:velocity:1.7",
+    sha1 = "2ceb567b8f3f21118ecdec129fe1271dbc09aa7a",
 )
 
 maven_jar(
-  name = 'jsch',
-  artifact = 'com.jcraft:jsch:0.1.54',
-  sha1 = 'da3584329a263616e277e15462b387addd1b208d',
+    name = "jsch",
+    artifact = "com.jcraft:jsch:0.1.54",
+    sha1 = "da3584329a263616e277e15462b387addd1b208d",
 )
 
 maven_jar(
-  name = 'juniversalchardet',
-  artifact = 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3',
-  sha1 = 'cd49678784c46aa8789c060538e0154013bb421b',
+    name = "juniversalchardet",
+    artifact = "com.googlecode.juniversalchardet:juniversalchardet:1.0.3",
+    sha1 = "cd49678784c46aa8789c060538e0154013bb421b",
 )
 
-SLF4J_VERS = '1.7.7'
+SLF4J_VERS = "1.7.7"
 
 maven_jar(
-  name = 'log_api',
-  artifact = 'org.slf4j:slf4j-api:' + SLF4J_VERS,
-  sha1 = '2b8019b6249bb05d81d3a3094e468753e2b21311',
+    name = "log_api",
+    artifact = "org.slf4j:slf4j-api:" + SLF4J_VERS,
+    sha1 = "2b8019b6249bb05d81d3a3094e468753e2b21311",
 )
 
 maven_jar(
-  name = 'log_nop',
-  artifact = 'org.slf4j:slf4j-nop:' + SLF4J_VERS,
-  sha1 = '6cca9a3b999ff28b7a35ca762b3197cd7e4c2ad1',
+    name = "log_nop",
+    artifact = "org.slf4j:slf4j-nop:" + SLF4J_VERS,
+    sha1 = "6cca9a3b999ff28b7a35ca762b3197cd7e4c2ad1",
 )
 
 maven_jar(
-  name = 'impl_log4j',
-  artifact = 'org.slf4j:slf4j-log4j12:' + SLF4J_VERS,
-  sha1 = '58f588119ffd1702c77ccab6acb54bfb41bed8bd',
+    name = "impl_log4j",
+    artifact = "org.slf4j:slf4j-log4j12:" + SLF4J_VERS,
+    sha1 = "58f588119ffd1702c77ccab6acb54bfb41bed8bd",
 )
 
 maven_jar(
-  name = 'jcl_over_slf4j',
-  artifact = 'org.slf4j:jcl-over-slf4j:' + SLF4J_VERS,
-  sha1 = '56003dcd0a31deea6391b9e2ef2f2dc90b205a92',
+    name = "jcl_over_slf4j",
+    artifact = "org.slf4j:jcl-over-slf4j:" + SLF4J_VERS,
+    sha1 = "56003dcd0a31deea6391b9e2ef2f2dc90b205a92",
 )
 
 maven_jar(
-  name = 'log4j',
-  artifact = 'log4j:log4j:1.2.17',
-  sha1 = '5af35056b4d257e4b64b9e8069c0746e8b08629f',
+    name = "log4j",
+    artifact = "log4j:log4j:1.2.17",
+    sha1 = "5af35056b4d257e4b64b9e8069c0746e8b08629f",
 )
 
 maven_jar(
-  name = 'jsonevent_layout',
-  artifact = 'net.logstash.log4j:jsonevent-layout:1.7',
-  sha1 = '507713504f0ddb75ba512f62763519c43cf46fde',
+    name = "jsonevent_layout",
+    artifact = "net.logstash.log4j:jsonevent-layout:1.7",
+    sha1 = "507713504f0ddb75ba512f62763519c43cf46fde",
 )
 
 maven_jar(
-  name = 'json_smart',
-  artifact = 'net.minidev:json-smart:1.1.1',
-  sha1 = '24a2f903d25e004de30ac602c5b47f2d4e420a59',
+    name = "json_smart",
+    artifact = "net.minidev:json-smart:1.1.1",
+    sha1 = "24a2f903d25e004de30ac602c5b47f2d4e420a59",
 )
 
 maven_jar(
-  name = 'args4j',
-  artifact = 'args4j:args4j:2.0.26',
-  sha1 = '01ebb18ebb3b379a74207d5af4ea7c8338ebd78b',
+    name = "args4j",
+    artifact = "args4j:args4j:2.0.26",
+    sha1 = "01ebb18ebb3b379a74207d5af4ea7c8338ebd78b",
 )
 
 maven_jar(
-  name = 'commons_codec',
-  artifact = 'commons-codec:commons-codec:1.4',
-  sha1 = '4216af16d38465bbab0f3dff8efa14204f7a399a',
+    name = "commons_codec",
+    artifact = "commons-codec:commons-codec:1.4",
+    sha1 = "4216af16d38465bbab0f3dff8efa14204f7a399a",
 )
 
 maven_jar(
-  name = 'commons_collections',
-  artifact = 'commons-collections:commons-collections:3.2.2',
-  sha1 = '8ad72fe39fa8c91eaaf12aadb21e0c3661fe26d5',
+    name = "commons_collections",
+    artifact = "commons-collections:commons-collections:3.2.2",
+    sha1 = "8ad72fe39fa8c91eaaf12aadb21e0c3661fe26d5",
 )
 
 maven_jar(
-  name = 'commons_compress',
-  artifact = 'org.apache.commons:commons-compress:1.12',
-  sha1 = '84caa68576e345eb5e7ae61a0e5a9229eb100d7b',
+    name = "commons_compress",
+    artifact = "org.apache.commons:commons-compress:1.12",
+    sha1 = "84caa68576e345eb5e7ae61a0e5a9229eb100d7b",
 )
 
 maven_jar(
-  name = 'commons_lang',
-  artifact = 'commons-lang:commons-lang:2.6',
-  sha1 = '0ce1edb914c94ebc388f086c6827e8bdeec71ac2',
+    name = "commons_lang",
+    artifact = "commons-lang:commons-lang:2.6",
+    sha1 = "0ce1edb914c94ebc388f086c6827e8bdeec71ac2",
 )
 
 maven_jar(
-  name = 'commons_lang3',
-  artifact = 'org.apache.commons:commons-lang3:3.3.2',
-  sha1 = '90a3822c38ec8c996e84c16a3477ef632cbc87a3',
+    name = "commons_lang3",
+    artifact = "org.apache.commons:commons-lang3:3.3.2",
+    sha1 = "90a3822c38ec8c996e84c16a3477ef632cbc87a3",
 )
 
 maven_jar(
-  name = 'commons_dbcp',
-  artifact = 'commons-dbcp:commons-dbcp:1.4',
-  sha1 = '30be73c965cc990b153a100aaaaafcf239f82d39',
+    name = "commons_dbcp",
+    artifact = "commons-dbcp:commons-dbcp:1.4",
+    sha1 = "30be73c965cc990b153a100aaaaafcf239f82d39",
 )
 
 maven_jar(
-  name = 'commons_pool',
-  artifact = 'commons-pool:commons-pool:1.5.5',
-  sha1 = '7d8ffbdc47aa0c5a8afe5dc2aaf512f369f1d19b',
+    name = "commons_pool",
+    artifact = "commons-pool:commons-pool:1.5.5",
+    sha1 = "7d8ffbdc47aa0c5a8afe5dc2aaf512f369f1d19b",
 )
 
 maven_jar(
-  name = 'commons_net',
-  artifact = 'commons-net:commons-net:3.5',
-  sha1 = '342fc284019f590e1308056990fdb24a08f06318',
+    name = "commons_net",
+    artifact = "commons-net:commons-net:3.5",
+    sha1 = "342fc284019f590e1308056990fdb24a08f06318",
 )
 
 maven_jar(
-  name = 'commons_oro',
-  artifact = 'oro:oro:2.0.8',
-  sha1 = '5592374f834645c4ae250f4c9fbb314c9369d698',
+    name = "commons_oro",
+    artifact = "oro:oro:2.0.8",
+    sha1 = "5592374f834645c4ae250f4c9fbb314c9369d698",
 )
 
 maven_jar(
-  name = 'commons_validator',
-  artifact = 'commons-validator:commons-validator:1.5.1',
-  sha1 = '86d05a46e8f064b300657f751b5a98c62807e2a0',
+    name = "commons_validator",
+    artifact = "commons-validator:commons-validator:1.5.1",
+    sha1 = "86d05a46e8f064b300657f751b5a98c62807e2a0",
 )
 
 maven_jar(
-  name = 'automaton',
-  artifact = 'dk.brics.automaton:automaton:1.11-8',
-  sha1 = '6ebfa65eb431ff4b715a23be7a750cbc4cc96d0f',
+    name = "automaton",
+    artifact = "dk.brics.automaton:automaton:1.11-8",
+    sha1 = "6ebfa65eb431ff4b715a23be7a750cbc4cc96d0f",
 )
 
 maven_jar(
-  name = 'pegdown',
-  artifact = 'org.pegdown:pegdown:1.4.2',
-  sha1 = 'd96db502ed832df867ff5d918f05b51ba3879ea7',
+    name = "pegdown",
+    artifact = "org.pegdown:pegdown:1.4.2",
+    sha1 = "d96db502ed832df867ff5d918f05b51ba3879ea7",
 )
 
 maven_jar(
-  name = 'grappa',
-  artifact = 'com.github.parboiled1:grappa:1.0.4',
-  sha1 = 'ad4b44b9c305dad7aa1e680d4b5c8eec9c4fd6f5',
+    name = "grappa",
+    artifact = "com.github.parboiled1:grappa:1.0.4",
+    sha1 = "ad4b44b9c305dad7aa1e680d4b5c8eec9c4fd6f5",
 )
 
 maven_jar(
-  name = 'jitescript',
-  artifact = 'me.qmx.jitescript:jitescript:0.4.0',
-  sha1 = '2e35862b0435c1b027a21f3d6eecbe50e6e08d54',
+    name = "jitescript",
+    artifact = "me.qmx.jitescript:jitescript:0.4.0",
+    sha1 = "2e35862b0435c1b027a21f3d6eecbe50e6e08d54",
 )
 
-GREENMAIL_VERS = '1.5.2'
+GREENMAIL_VERS = "1.5.2"
 
 maven_jar(
-  name = 'greenmail',
-  artifact = 'com.icegreen:greenmail:' + GREENMAIL_VERS,
-  sha1 = '6b4862a09f8642da58c109117b24ccc19a4a6d39',
+    name = "greenmail",
+    artifact = "com.icegreen:greenmail:" + GREENMAIL_VERS,
+    sha1 = "6b4862a09f8642da58c109117b24ccc19a4a6d39",
 )
 
-MAIL_VERS = '1.5.6'
+MAIL_VERS = "1.5.6"
 
 maven_jar(
-  name = 'mail',
-  artifact = 'com.sun.mail:javax.mail:' + MAIL_VERS,
-  sha1 = 'ab5daef2f881c42c8e280cbe918ec4d7fdfd7efe',
+    name = "mail",
+    artifact = "com.sun.mail:javax.mail:" + MAIL_VERS,
+    sha1 = "ab5daef2f881c42c8e280cbe918ec4d7fdfd7efe",
 )
 
-MIME4J_VERS = '0.8.0'
+MIME4J_VERS = "0.8.0"
 
 maven_jar(
-  name = 'mime4j_core',
-  artifact = 'org.apache.james:apache-mime4j-core:' + MIME4J_VERS,
-  sha1 = 'd54f45fca44a2f210569656b4ca3574b42911c95',
+    name = "mime4j_core",
+    artifact = "org.apache.james:apache-mime4j-core:" + MIME4J_VERS,
+    sha1 = "d54f45fca44a2f210569656b4ca3574b42911c95",
 )
 
 maven_jar(
-  name = 'mime4j_dom',
-  artifact = 'org.apache.james:apache-mime4j-dom:' + MIME4J_VERS,
-  sha1 = '6720c93d14225c3e12c4a69768a0370c80e376a3',
+    name = "mime4j_dom",
+    artifact = "org.apache.james:apache-mime4j-dom:" + MIME4J_VERS,
+    sha1 = "6720c93d14225c3e12c4a69768a0370c80e376a3",
 )
 
 maven_jar(
-  name = 'jsoup',
-  artifact = 'org.jsoup:jsoup:1.9.2',
-  sha1 = '5e3bda828a80c7a21dfbe2308d1755759c2fd7b4',
+    name = "jsoup",
+    artifact = "org.jsoup:jsoup:1.9.2",
+    sha1 = "5e3bda828a80c7a21dfbe2308d1755759c2fd7b4",
 )
 
-OW2_VERS = '5.1'
+OW2_VERS = "5.1"
 
 maven_jar(
-  name = 'ow2_asm',
-  artifact = 'org.ow2.asm:asm:' + OW2_VERS,
-  sha1 = '5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45',
+    name = "ow2_asm",
+    artifact = "org.ow2.asm:asm:" + OW2_VERS,
+    sha1 = "5ef31c4fe953b1fd00b8a88fa1d6820e8785bb45",
 )
 
 maven_jar(
-  name = 'ow2_asm_analysis',
-  artifact = 'org.ow2.asm:asm-analysis:' + OW2_VERS,
-  sha1 = '6d1bf8989fc7901f868bee3863c44f21aa63d110',
+    name = "ow2_asm_analysis",
+    artifact = "org.ow2.asm:asm-analysis:" + OW2_VERS,
+    sha1 = "6d1bf8989fc7901f868bee3863c44f21aa63d110",
 )
 
 maven_jar(
-  name = 'ow2_asm_commons',
-  artifact = 'org.ow2.asm:asm-commons:' + OW2_VERS,
-  sha1 = '25d8a575034dd9cfcb375a39b5334f0ba9c8474e',
+    name = "ow2_asm_commons",
+    artifact = "org.ow2.asm:asm-commons:" + OW2_VERS,
+    sha1 = "25d8a575034dd9cfcb375a39b5334f0ba9c8474e",
 )
 
 maven_jar(
-  name = 'ow2_asm_tree',
-  artifact = 'org.ow2.asm:asm-tree:' + OW2_VERS,
-  sha1 = '87b38c12a0ea645791ead9d3e74ae5268d1d6c34',
+    name = "ow2_asm_tree",
+    artifact = "org.ow2.asm:asm-tree:" + OW2_VERS,
+    sha1 = "87b38c12a0ea645791ead9d3e74ae5268d1d6c34",
 )
 
 maven_jar(
-  name = 'ow2_asm_util',
-  artifact = 'org.ow2.asm:asm-util:' + OW2_VERS,
-  sha1 = 'b60e33a6bd0d71831e0c249816d01e6c1dd90a47',
+    name = "ow2_asm_util",
+    artifact = "org.ow2.asm:asm-util:" + OW2_VERS,
+    sha1 = "b60e33a6bd0d71831e0c249816d01e6c1dd90a47",
 )
 
 maven_jar(
-  name = 'auto_value',
-  artifact = 'com.google.auto.value:auto-value:1.4-rc1',
-  sha1 = '9347939002003a7a3c3af48271fc2c18734528a4',
+    name = "auto_value",
+    artifact = "com.google.auto.value:auto-value:1.4-rc1",
+    sha1 = "9347939002003a7a3c3af48271fc2c18734528a4",
 )
 
 maven_jar(
-  name = 'tukaani_xz',
-  artifact = 'org.tukaani:xz:1.4',
-  sha1 = '18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3',
+    name = "tukaani_xz",
+    artifact = "org.tukaani:xz:1.4",
+    sha1 = "18a9a2ce6abf32ea1b5fd31dae5210ad93f4e5e3",
 )
 
-LUCENE_VERS = '5.5.2'
+LUCENE_VERS = "5.5.2"
 
 maven_jar(
-  name = 'lucene_core',
-  artifact = 'org.apache.lucene:lucene-core:' + LUCENE_VERS,
-  sha1 = 'de5e5c3161ea01e89f2a09a14391f9b7ed66cdbb',
+    name = "lucene_core",
+    artifact = "org.apache.lucene:lucene-core:" + LUCENE_VERS,
+    sha1 = "de5e5c3161ea01e89f2a09a14391f9b7ed66cdbb",
 )
 
 maven_jar(
-  name = 'lucene_analyzers_common',
-  artifact = 'org.apache.lucene:lucene-analyzers-common:' + LUCENE_VERS,
-  sha1 = 'f0bc3114a6b43f8e64a33c471d5b9e8ddc51564d',
+    name = "lucene_analyzers_common",
+    artifact = "org.apache.lucene:lucene-analyzers-common:" + LUCENE_VERS,
+    sha1 = "f0bc3114a6b43f8e64a33c471d5b9e8ddc51564d",
 )
 
 maven_jar(
-  name = 'lucene_codecs',
-  artifact = 'org.apache.lucene:lucene-codecs:' + LUCENE_VERS,
-  sha1 = 'e01fe463d9490bb1b4a6a168e771f7b7255a50b1',
+    name = "lucene_codecs",
+    artifact = "org.apache.lucene:lucene-codecs:" + LUCENE_VERS,
+    sha1 = "e01fe463d9490bb1b4a6a168e771f7b7255a50b1",
 )
 
 maven_jar(
-  name = 'backward_codecs',
-  artifact = 'org.apache.lucene:lucene-backward-codecs:' + LUCENE_VERS,
-  sha1 = 'c5cfcd7a8cf48a0144b61fb991c8e50a0bf868d5',
+    name = "backward_codecs",
+    artifact = "org.apache.lucene:lucene-backward-codecs:" + LUCENE_VERS,
+    sha1 = "c5cfcd7a8cf48a0144b61fb991c8e50a0bf868d5",
 )
 
 maven_jar(
-  name = 'lucene_misc',
-  artifact = 'org.apache.lucene:lucene-misc:' + LUCENE_VERS,
-  sha1 = '37bbe5a2fb429499dfbe75d750d1778881fff45d',
+    name = "lucene_misc",
+    artifact = "org.apache.lucene:lucene-misc:" + LUCENE_VERS,
+    sha1 = "37bbe5a2fb429499dfbe75d750d1778881fff45d",
 )
 
 maven_jar(
-  name = 'lucene_queryparser',
-  artifact = 'org.apache.lucene:lucene-queryparser:' + LUCENE_VERS,
-  sha1 = '8ac921563e744463605284c6d9d2d95e1be5b87c',
+    name = "lucene_queryparser",
+    artifact = "org.apache.lucene:lucene-queryparser:" + LUCENE_VERS,
+    sha1 = "8ac921563e744463605284c6d9d2d95e1be5b87c",
 )
 
-
 maven_jar(
-  name = 'lucene_highlighter',
-  artifact = 'org.apache.lucene:lucene-highlighter:' + LUCENE_VERS,
-  sha1 = 'd127ac514e9df965ab0b57d92bbe0c68d3d145b8',
+    name = "lucene_highlighter",
+    artifact = "org.apache.lucene:lucene-highlighter:" + LUCENE_VERS,
+    sha1 = "d127ac514e9df965ab0b57d92bbe0c68d3d145b8",
 )
 
 maven_jar(
-  name = 'lucene_join',
-  artifact = 'org.apache.lucene:lucene-join:'+ LUCENE_VERS,
-  sha1 = 'dac1b322508f3f2696ecc49a97311d34d8382054',
+    name = "lucene_join",
+    artifact = "org.apache.lucene:lucene-join:" + LUCENE_VERS,
+    sha1 = "dac1b322508f3f2696ecc49a97311d34d8382054",
 )
 
 maven_jar(
-  name = 'lucene_memory',
-  artifact = 'org.apache.lucene:lucene-memory:' + LUCENE_VERS,
-  sha1 = '7409db9863d8fbc265c27793c6cc7511304182c2',
+    name = "lucene_memory",
+    artifact = "org.apache.lucene:lucene-memory:" + LUCENE_VERS,
+    sha1 = "7409db9863d8fbc265c27793c6cc7511304182c2",
 )
 
 maven_jar(
-  name = 'lucene_sandbox',
-  artifact = 'org.apache.lucene:lucene-sandbox:' + LUCENE_VERS,
-  sha1 = '30a91f120706ba66732d5a974b56c6971b3c8a16',
+    name = "lucene_sandbox",
+    artifact = "org.apache.lucene:lucene-sandbox:" + LUCENE_VERS,
+    sha1 = "30a91f120706ba66732d5a974b56c6971b3c8a16",
 )
 
 maven_jar(
-  name = 'lucene_spatial',
-  artifact = 'org.apache.lucene:lucene-spatial:' + LUCENE_VERS,
-  sha1 = '8ed7a9a43d78222038573dd1c295a61f3c0bb0db',
+    name = "lucene_spatial",
+    artifact = "org.apache.lucene:lucene-spatial:" + LUCENE_VERS,
+    sha1 = "8ed7a9a43d78222038573dd1c295a61f3c0bb0db",
 )
 
 maven_jar(
-  name = 'lucene_suggest',
-  artifact = 'org.apache.lucene:lucene-suggest:' + LUCENE_VERS,
-  sha1 = 'e8316b37dddcf2092a54dab2ce6aad0d5ad78585',
+    name = "lucene_suggest",
+    artifact = "org.apache.lucene:lucene-suggest:" + LUCENE_VERS,
+    sha1 = "e8316b37dddcf2092a54dab2ce6aad0d5ad78585",
 )
 
 maven_jar(
-  name = 'lucene_queries',
-  artifact = 'org.apache.lucene:lucene-queries:' + LUCENE_VERS,
-  sha1 = '692f1ad887cf4e006a23f45019e6de30f3312d3f',
+    name = "lucene_queries",
+    artifact = "org.apache.lucene:lucene-queries:" + LUCENE_VERS,
+    sha1 = "692f1ad887cf4e006a23f45019e6de30f3312d3f",
 )
 
 maven_jar(
-  name = 'mime_util',
-  artifact = 'eu.medsea.mimeutil:mime-util:2.1.3',
-  sha1 = '0c9cfae15c74f62491d4f28def0dff1dabe52a47',
-  attach_source = False,
+    name = "mime_util",
+    artifact = "eu.medsea.mimeutil:mime-util:2.1.3",
+    attach_source = False,
+    sha1 = "0c9cfae15c74f62491d4f28def0dff1dabe52a47",
 )
 
-PROLOG_VERS = '1.4.2'
+PROLOG_VERS = "1.4.2"
 
 maven_jar(
-  name = 'prolog_runtime',
-  repository = GERRIT,
-  artifact = 'com.googlecode.prolog-cafe:prolog-runtime:' + PROLOG_VERS,
-  sha1 = '4421b4806b6e3a318680f6ab1d57569e857169c6',
-  attach_source = False,
+    name = "prolog_runtime",
+    artifact = "com.googlecode.prolog-cafe:prolog-runtime:" + PROLOG_VERS,
+    attach_source = False,
+    repository = GERRIT,
+    sha1 = "4421b4806b6e3a318680f6ab1d57569e857169c6",
 )
 
 maven_jar(
-  name = 'prolog_compiler',
-  repository = GERRIT,
-  artifact = 'com.googlecode.prolog-cafe:prolog-compiler:' + PROLOG_VERS,
-  sha1 = '7e5a7ca5efe7db7f69e015cf492f8f04665244d8',
-  attach_source = False,
+    name = "prolog_compiler",
+    artifact = "com.googlecode.prolog-cafe:prolog-compiler:" + PROLOG_VERS,
+    attach_source = False,
+    repository = GERRIT,
+    sha1 = "7e5a7ca5efe7db7f69e015cf492f8f04665244d8",
 )
 
 maven_jar(
-  name = 'prolog_io',
-  repository = GERRIT,
-  artifact = 'com.googlecode.prolog-cafe:prolog-io:' + PROLOG_VERS,
-  sha1 = 'd177f6211d1013e0f31a507127f5c87a7f6941f3',
-  attach_source = False,
+    name = "prolog_io",
+    artifact = "com.googlecode.prolog-cafe:prolog-io:" + PROLOG_VERS,
+    attach_source = False,
+    repository = GERRIT,
+    sha1 = "d177f6211d1013e0f31a507127f5c87a7f6941f3",
 )
 
 maven_jar(
-  name = 'cafeteria',
-  repository = GERRIT,
-  artifact = 'com.googlecode.prolog-cafe:prolog-cafeteria:' + PROLOG_VERS,
-  sha1 = '11f396cb2588b65e6a78070488aaa58d12bf000e',
-  attach_source = False,
+    name = "cafeteria",
+    artifact = "com.googlecode.prolog-cafe:prolog-cafeteria:" + PROLOG_VERS,
+    attach_source = False,
+    repository = GERRIT,
+    sha1 = "11f396cb2588b65e6a78070488aaa58d12bf000e",
 )
 
 maven_jar(
-  name = 'guava_retrying',
-  artifact = 'com.github.rholder:guava-retrying:2.0.0',
-  sha1 = '974bc0a04a11cc4806f7c20a34703bd23c34e7f4',
+    name = "guava_retrying",
+    artifact = "com.github.rholder:guava-retrying:2.0.0",
+    sha1 = "974bc0a04a11cc4806f7c20a34703bd23c34e7f4",
 )
 
 maven_jar(
-  name = 'jsr305',
-  artifact = 'com.google.code.findbugs:jsr305:3.0.1',
-  sha1 = 'f7be08ec23c21485b9b5a1cf1654c2ec8c58168d',
+    name = "jsr305",
+    artifact = "com.google.code.findbugs:jsr305:3.0.1",
+    sha1 = "f7be08ec23c21485b9b5a1cf1654c2ec8c58168d",
 )
 
 maven_jar(
-  name = 'blame_cache',
-  repository = GERRIT,
-  artifact = 'com/google/gitiles:blame-cache:0.1-9',
-  sha1 = '51d35e6f8bbc2412265066cea9653dd758c95826',
-  attach_source = False,
+    name = "blame_cache",
+    artifact = "com/google/gitiles:blame-cache:0.1-9",
+    attach_source = False,
+    repository = GERRIT,
+    sha1 = "51d35e6f8bbc2412265066cea9653dd758c95826",
 )
 
 # Keep this version of Soy synchronized with the version used in Gitiles.
 maven_jar(
-  name = 'soy',
-  artifact = 'com.google.template:soy:2016-08-09',
-  sha1 = '43d33651e95480d515fe26c10a662faafe3ad1e4',
+    name = "soy",
+    artifact = "com.google.template:soy:2016-08-09",
+    sha1 = "43d33651e95480d515fe26c10a662faafe3ad1e4",
 )
 
 maven_jar(
-  name = 'icu4j',
-  artifact = 'com.ibm.icu:icu4j:57.1',
-  sha1 = '198ea005f41219f038f4291f0b0e9f3259730e92',
+    name = "icu4j",
+    artifact = "com.ibm.icu:icu4j:57.1",
+    sha1 = "198ea005f41219f038f4291f0b0e9f3259730e92",
 )
 
 maven_jar(
-  name = 'dropwizard_core',
-  artifact = 'io.dropwizard.metrics:metrics-core:3.1.2',
-  sha1 = '224f03afd2521c6c94632f566beb1bb5ee32cf07',
+    name = "dropwizard_core",
+    artifact = "io.dropwizard.metrics:metrics-core:3.1.2",
+    sha1 = "224f03afd2521c6c94632f566beb1bb5ee32cf07",
 )
 
 # This version must match the version that also appears in
 # gerrit-pgm/src/main/resources/com/google/gerrit/pgm/init/libraries.config
-BC_VERS = '1.55'
+BC_VERS = "1.55"
 
 maven_jar(
-  name = 'bcprov',
-  artifact = 'org.bouncycastle:bcprov-jdk15on:' + BC_VERS,
-  sha1 = '935f2e57a00ec2c489cbd2ad830d4a399708f979',
+    name = "bcprov",
+    artifact = "org.bouncycastle:bcprov-jdk15on:" + BC_VERS,
+    sha1 = "935f2e57a00ec2c489cbd2ad830d4a399708f979",
 )
 
 maven_jar(
-  name = 'bcpg',
-  artifact = 'org.bouncycastle:bcpg-jdk15on:' + BC_VERS,
-  sha1 = '54ce841795ecdf10f24e50c48d4fdec59c691699',
+    name = "bcpg",
+    artifact = "org.bouncycastle:bcpg-jdk15on:" + BC_VERS,
+    sha1 = "54ce841795ecdf10f24e50c48d4fdec59c691699",
 )
 
 maven_jar(
-  name = 'bcpkix',
-  artifact = 'org.bouncycastle:bcpkix-jdk15on:' + BC_VERS,
-  sha1 = '6392d8cba22b722c6570d660ca0b3921ff1bae4f',
+    name = "bcpkix",
+    artifact = "org.bouncycastle:bcpkix-jdk15on:" + BC_VERS,
+    sha1 = "6392d8cba22b722c6570d660ca0b3921ff1bae4f",
 )
 
 maven_jar(
-  name = 'sshd',
-  artifact = 'org.apache.sshd:sshd-core:1.2.0',
-  sha1 = '4bc24a8228ba83dac832680366cf219da71dae8e',
+    name = "sshd",
+    artifact = "org.apache.sshd:sshd-core:1.2.0",
+    sha1 = "4bc24a8228ba83dac832680366cf219da71dae8e",
 )
 
 maven_jar(
-  name = 'mina_core',
-  artifact = 'org.apache.mina:mina-core:2.0.10',
-  sha1 = 'a1cb1136b104219d6238de886bf5a3ea4554eb58',
+    name = "mina_core",
+    artifact = "org.apache.mina:mina-core:2.0.10",
+    sha1 = "a1cb1136b104219d6238de886bf5a3ea4554eb58",
 )
 
 maven_jar(
-  name = 'h2',
-  artifact = 'com.h2database:h2:1.3.176',
-  sha1 = 'fd369423346b2f1525c413e33f8cf95b09c92cbd',
+    name = "h2",
+    artifact = "com.h2database:h2:1.3.176",
+    sha1 = "fd369423346b2f1525c413e33f8cf95b09c92cbd",
 )
 
-HTTPCOMP_VERS = '4.4.1'
+HTTPCOMP_VERS = "4.4.1"
 
 maven_jar(
-  name = 'fluent_hc',
-  artifact = 'org.apache.httpcomponents:fluent-hc:' + HTTPCOMP_VERS,
-  sha1 = '96fb842b68a44cc640c661186828b60590c71261',
+    name = "fluent_hc",
+    artifact = "org.apache.httpcomponents:fluent-hc:" + HTTPCOMP_VERS,
+    sha1 = "96fb842b68a44cc640c661186828b60590c71261",
 )
 
 maven_jar(
-  name = 'httpclient',
-  artifact = 'org.apache.httpcomponents:httpclient:' + HTTPCOMP_VERS,
-  sha1 = '016d0bc512222f1253ee6b64d389c84e22f697f0',
+    name = "httpclient",
+    artifact = "org.apache.httpcomponents:httpclient:" + HTTPCOMP_VERS,
+    sha1 = "016d0bc512222f1253ee6b64d389c84e22f697f0",
 )
 
 maven_jar(
-  name = 'httpcore',
-  artifact = 'org.apache.httpcomponents:httpcore:' + HTTPCOMP_VERS,
-  sha1 = 'f5aa318bda4c6c8d688c9d00b90681dcd82ce636',
+    name = "httpcore",
+    artifact = "org.apache.httpcomponents:httpcore:" + HTTPCOMP_VERS,
+    sha1 = "f5aa318bda4c6c8d688c9d00b90681dcd82ce636",
 )
 
 maven_jar(
-  name = 'httpmime',
-  artifact = 'org.apache.httpcomponents:httpmime:' + HTTPCOMP_VERS,
-  sha1 = '2f8757f5ac5e38f46c794e5229d1f3c522e9b1df',
+    name = "httpmime",
+    artifact = "org.apache.httpcomponents:httpmime:" + HTTPCOMP_VERS,
+    sha1 = "2f8757f5ac5e38f46c794e5229d1f3c522e9b1df",
 )
 
 # Test-only dependencies below.
 
 maven_jar(
-  name = 'jimfs',
-  artifact = 'com.google.jimfs:jimfs:1.1',
-  sha1 = '8fbd0579dc68aba6186935cc1bee21d2f3e7ec1c',
+    name = "jimfs",
+    artifact = "com.google.jimfs:jimfs:1.1",
+    sha1 = "8fbd0579dc68aba6186935cc1bee21d2f3e7ec1c",
 )
 
 maven_jar(
-  name = 'junit',
-  artifact = 'junit:junit:4.11',
-  sha1 = '4e031bb61df09069aeb2bffb4019e7a5034a4ee0',
+    name = "junit",
+    artifact = "junit:junit:4.11",
+    sha1 = "4e031bb61df09069aeb2bffb4019e7a5034a4ee0",
 )
 
 maven_jar(
-  name = 'hamcrest_core',
-  artifact = 'org.hamcrest:hamcrest-core:1.3',
-  sha1 = '42a25dc3219429f0e5d060061f71acb49bf010a0',
+    name = "hamcrest_core",
+    artifact = "org.hamcrest:hamcrest-core:1.3",
+    sha1 = "42a25dc3219429f0e5d060061f71acb49bf010a0",
 )
 
 maven_jar(
-  name = 'truth',
-  artifact = 'com.google.truth:truth:0.30',
-  sha1 = '9d591b5a66eda81f0b88cf1c748ab8853d99b18b',
+    name = "truth",
+    artifact = "com.google.truth:truth:0.30",
+    sha1 = "9d591b5a66eda81f0b88cf1c748ab8853d99b18b",
 )
 
 maven_jar(
-  name = 'easymock',
-  artifact = 'org.easymock:easymock:3.1', # When bumping the version
-  sha1 = '3e127311a86fc2e8f550ef8ee4abe094bbcf7e7e',
+    name = "easymock",
+    artifact = "org.easymock:easymock:3.1",  # When bumping the version
+    sha1 = "3e127311a86fc2e8f550ef8ee4abe094bbcf7e7e",
 )
 
 maven_jar(
-  name = 'cglib_3_2',
-  artifact = 'cglib:cglib-nodep:3.2.0',
-  sha1 = 'cf1ca207c15b04ace918270b6cb3f5601160cdfd',
+    name = "cglib_3_2",
+    artifact = "cglib:cglib-nodep:3.2.0",
+    sha1 = "cf1ca207c15b04ace918270b6cb3f5601160cdfd",
 )
 
 maven_jar(
-  name = 'objenesis',
-  artifact = 'org.objenesis:objenesis:1.3',
-  sha1 = 'dc13ae4faca6df981fc7aeb5a522d9db446d5d50',
+    name = "objenesis",
+    artifact = "org.objenesis:objenesis:1.3",
+    sha1 = "dc13ae4faca6df981fc7aeb5a522d9db446d5d50",
 )
 
-POWERM_VERS = '1.6.1'
+POWERM_VERS = "1.6.1"
 
 maven_jar(
-  name = 'powermock_module_junit4',
-  artifact = 'org.powermock:powermock-module-junit4:' + POWERM_VERS,
-  sha1 = 'ea8530b2848542624f110a393513af397b37b9cf',
+    name = "powermock_module_junit4",
+    artifact = "org.powermock:powermock-module-junit4:" + POWERM_VERS,
+    sha1 = "ea8530b2848542624f110a393513af397b37b9cf",
 )
 
 maven_jar(
-  name = 'powermock_module_junit4_common',
-  artifact = 'org.powermock:powermock-module-junit4-common:' + POWERM_VERS,
-  sha1 = '7222ced54dabc310895d02e45c5428ca05193cda',
+    name = "powermock_module_junit4_common",
+    artifact = "org.powermock:powermock-module-junit4-common:" + POWERM_VERS,
+    sha1 = "7222ced54dabc310895d02e45c5428ca05193cda",
 )
 
 maven_jar(
-  name = 'powermock_reflect',
-  artifact = 'org.powermock:powermock-reflect:' + POWERM_VERS,
-  sha1 = '97d25eda8275c11161bcddda6ef8beabd534c878',
+    name = "powermock_reflect",
+    artifact = "org.powermock:powermock-reflect:" + POWERM_VERS,
+    sha1 = "97d25eda8275c11161bcddda6ef8beabd534c878",
 )
 
 maven_jar(
-  name = 'powermock_api_easymock',
-  artifact = 'org.powermock:powermock-api-easymock:' + POWERM_VERS,
-  sha1 = 'aa740ecf89a2f64d410b3d93ef8cd6833009ef00',
+    name = "powermock_api_easymock",
+    artifact = "org.powermock:powermock-api-easymock:" + POWERM_VERS,
+    sha1 = "aa740ecf89a2f64d410b3d93ef8cd6833009ef00",
 )
 
 maven_jar(
-  name = 'powermock_api_support',
-  artifact = 'org.powermock:powermock-api-support:' + POWERM_VERS,
-  sha1 = '592ee6d929c324109d3469501222e0c76ccf0869',
+    name = "powermock_api_support",
+    artifact = "org.powermock:powermock-api-support:" + POWERM_VERS,
+    sha1 = "592ee6d929c324109d3469501222e0c76ccf0869",
 )
 
 maven_jar(
-  name = 'powermock_core',
-  artifact = 'org.powermock:powermock-core:' + POWERM_VERS,
-  sha1 = '5afc1efce8d44ed76b30af939657bd598e45d962',
+    name = "powermock_core",
+    artifact = "org.powermock:powermock-core:" + POWERM_VERS,
+    sha1 = "5afc1efce8d44ed76b30af939657bd598e45d962",
 )
 
 maven_jar(
-  name = 'javassist',
-  artifact = 'org.javassist:javassist:3.20.0-GA',
-  sha1 = 'a9cbcdfb7e9f86fbc74d3afae65f2248bfbf82a0',
+    name = "javassist",
+    artifact = "org.javassist:javassist:3.20.0-GA",
+    sha1 = "a9cbcdfb7e9f86fbc74d3afae65f2248bfbf82a0",
 )
 
 maven_jar(
-  name = 'derby',
-  artifact = 'org.apache.derby:derby:10.11.1.1',
-  sha1 = 'df4b50061e8e4c348ce243b921f53ee63ba9bbe1',
-  attach_source = False,
+    name = "derby",
+    artifact = "org.apache.derby:derby:10.11.1.1",
+    attach_source = False,
+    sha1 = "df4b50061e8e4c348ce243b921f53ee63ba9bbe1",
 )
 
-JETTY_VERS = '9.3.11.v20160721'
+JETTY_VERS = "9.3.11.v20160721"
 
 maven_jar(
-  name = 'jetty_servlet',
-  artifact = 'org.eclipse.jetty:jetty-servlet:' + JETTY_VERS,
-  sha1 = 'd550147b85c73ea81084a4ac7915ba7f609021c5',
+    name = "jetty_servlet",
+    artifact = "org.eclipse.jetty:jetty-servlet:" + JETTY_VERS,
+    sha1 = "d550147b85c73ea81084a4ac7915ba7f609021c5",
 )
 
 maven_jar(
-  name = 'jetty_security',
-  artifact = 'org.eclipse.jetty:jetty-security:' + JETTY_VERS,
-  sha1 = '1cbefc5d1196b9e1ca6f4cc36738998a6ebde8bf',
+    name = "jetty_security",
+    artifact = "org.eclipse.jetty:jetty-security:" + JETTY_VERS,
+    sha1 = "1cbefc5d1196b9e1ca6f4cc36738998a6ebde8bf",
 )
 
 maven_jar(
-  name = 'jetty_servlets',
-  artifact = 'org.eclipse.jetty:jetty-servlets:' + JETTY_VERS,
-  sha1 = 'a9f7a43977151a463aa21a9b0e882aa3d25452ef',
+    name = "jetty_servlets",
+    artifact = "org.eclipse.jetty:jetty-servlets:" + JETTY_VERS,
+    sha1 = "a9f7a43977151a463aa21a9b0e882aa3d25452ef",
 )
 
 maven_jar(
-  name = 'jetty_server',
-  artifact = 'org.eclipse.jetty:jetty-server:' + JETTY_VERS,
-  sha1 = 'd932e0dc1e9bd4839ae446754615163d60271a66',
+    name = "jetty_server",
+    artifact = "org.eclipse.jetty:jetty-server:" + JETTY_VERS,
+    sha1 = "d932e0dc1e9bd4839ae446754615163d60271a66",
 )
 
 maven_jar(
-  name = 'jetty_jmx',
-  artifact = 'org.eclipse.jetty:jetty-jmx:' + JETTY_VERS,
-  sha1 = '21a658d2f5eb87c23eef4911966625ea95f66d32',
+    name = "jetty_jmx",
+    artifact = "org.eclipse.jetty:jetty-jmx:" + JETTY_VERS,
+    sha1 = "21a658d2f5eb87c23eef4911966625ea95f66d32",
 )
 
 maven_jar(
-  name = 'jetty_continuation',
-  artifact = 'org.eclipse.jetty:jetty-continuation:' + JETTY_VERS,
-  sha1 = '92a91c0dcc5f5d779a1c9f94038332be3f46c9df',
+    name = "jetty_continuation",
+    artifact = "org.eclipse.jetty:jetty-continuation:" + JETTY_VERS,
+    sha1 = "92a91c0dcc5f5d779a1c9f94038332be3f46c9df",
 )
 
 maven_jar(
-  name = 'jetty_http',
-  artifact = 'org.eclipse.jetty:jetty-http:' + JETTY_VERS,
-  sha1 = 'dcfb95e5b886a981bb76467b911c5b706117f9cf',
+    name = "jetty_http",
+    artifact = "org.eclipse.jetty:jetty-http:" + JETTY_VERS,
+    sha1 = "dcfb95e5b886a981bb76467b911c5b706117f9cf",
 )
 
 maven_jar(
-  name = 'jetty_io',
-  artifact = 'org.eclipse.jetty:jetty-io:' + JETTY_VERS,
-  sha1 = 'db5f4f481159894a4b670072a34917b5414d0c98',
+    name = "jetty_io",
+    artifact = "org.eclipse.jetty:jetty-io:" + JETTY_VERS,
+    sha1 = "db5f4f481159894a4b670072a34917b5414d0c98",
 )
 
 maven_jar(
-  name = 'jetty_util',
-  artifact = 'org.eclipse.jetty:jetty-util:' + JETTY_VERS,
-  sha1 = '1812ffd5a04698051180d582c146ca807760c808',
+    name = "jetty_util",
+    artifact = "org.eclipse.jetty:jetty-util:" + JETTY_VERS,
+    sha1 = "1812ffd5a04698051180d582c146ca807760c808",
 )
 
 maven_jar(
-  name = 'openid_consumer',
-  artifact = 'org.openid4java:openid4java:0.9.8',
-  sha1 = 'de4f1b33d3b0f0b2ab1d32834ec1190b39db4160',
+    name = "openid_consumer",
+    artifact = "org.openid4java:openid4java:0.9.8",
+    sha1 = "de4f1b33d3b0f0b2ab1d32834ec1190b39db4160",
 )
 
 maven_jar(
-  name = 'nekohtml',
-  artifact = 'net.sourceforge.nekohtml:nekohtml:1.9.10',
-  sha1 = '14052461031a7054aa094f5573792feb6686d3de',
+    name = "nekohtml",
+    artifact = "net.sourceforge.nekohtml:nekohtml:1.9.10",
+    sha1 = "14052461031a7054aa094f5573792feb6686d3de",
 )
 
 maven_jar(
-  name = 'xerces',
-  artifact = 'xerces:xercesImpl:2.8.1',
-  sha1 = '25101e37ec0c907db6f0612cbf106ee519c1aef1',
-  attach_source = False,
+    name = "xerces",
+    artifact = "xerces:xercesImpl:2.8.1",
+    attach_source = False,
+    sha1 = "25101e37ec0c907db6f0612cbf106ee519c1aef1",
 )
 
 maven_jar(
-  name = 'postgresql',
-  artifact = 'postgresql:postgresql:9.1-901-1.jdbc4',
-  sha1 = '9bfabe48876ec38f6cbaa6931bad05c64a9ea942',
+    name = "postgresql",
+    artifact = "postgresql:postgresql:9.1-901-1.jdbc4",
+    sha1 = "9bfabe48876ec38f6cbaa6931bad05c64a9ea942",
 )
 
-CM_VERSION = '5.19.0'
+CM_VERSION = "5.19.0"
 
 maven_jar(
-  name = 'codemirror_minified',
-  artifact = 'org.webjars.npm:codemirror-minified:' + CM_VERSION,
-  sha1 = '263bf4acb7c4429be3fe46908af240f9f629d51c',
+    name = "codemirror_minified",
+    artifact = "org.webjars.npm:codemirror-minified:" + CM_VERSION,
+    sha1 = "263bf4acb7c4429be3fe46908af240f9f629d51c",
 )
 
 maven_jar(
-  name = 'codemirror_original',
-  artifact = 'org.webjars.npm:codemirror:' + CM_VERSION,
-  sha1 = 'e9ab382c6be240d55f112051bba3f6c637b798ce',
+    name = "codemirror_original",
+    artifact = "org.webjars.npm:codemirror:" + CM_VERSION,
+    sha1 = "e9ab382c6be240d55f112051bba3f6c637b798ce",
 )
 
 maven_jar(
-  name = 'diff_match_patch',
-  artifact = 'org.webjars:google-diff-match-patch:20121119-1',
-  sha1 = '0cf1782dbcb8359d95070da9176059a5a9d37709',
-  attach_source = False,
+    name = "diff_match_patch",
+    artifact = "org.webjars:google-diff-match-patch:20121119-1",
+    attach_source = False,
+    sha1 = "0cf1782dbcb8359d95070da9176059a5a9d37709",
 )
 
 maven_jar(
-  name = 'commons_io',
-  artifact = 'commons-io:commons-io:1.4',
-  sha1 = 'a8762d07e76cfde2395257a5da47ba7c1dbd3dce',
+    name = "commons_io",
+    artifact = "commons-io:commons-io:1.4",
+    sha1 = "a8762d07e76cfde2395257a5da47ba7c1dbd3dce",
 )
 
 maven_jar(
-  name = "asciidoctor",
-  artifact = "org.asciidoctor:asciidoctorj:1.5.4.1",
-  sha1 = "f7ddfb2bbed2f8da3f9ad0d1a5514f04b4274a5a",
+    name = "asciidoctor",
+    artifact = "org.asciidoctor:asciidoctorj:1.5.4.1",
+    sha1 = "f7ddfb2bbed2f8da3f9ad0d1a5514f04b4274a5a",
 )
 
 maven_jar(
-  name = "jruby",
-  artifact = "org.jruby:jruby-complete:9.1.5.0",
-  sha1 = "00d0003e99da3c4d830b12c099691ce910c84e39",
+    name = "jruby",
+    artifact = "org.jruby:jruby-complete:9.1.5.0",
+    sha1 = "00d0003e99da3c4d830b12c099691ce910c84e39",
 )
 
 maven_jar(
-  name = 'elasticsearch',
-  artifact = 'org.elasticsearch:elasticsearch:2.4.0',
-  sha1 = 'aeb9704a76fa8654c348f38fcbb993a952a7ab07',
+    name = "elasticsearch",
+    artifact = "org.elasticsearch:elasticsearch:2.4.0",
+    sha1 = "aeb9704a76fa8654c348f38fcbb993a952a7ab07",
 )
 
 # Java REST client for Elasticsearch.
-JEST_VERSION = '2.0.3'
+JEST_VERSION = "2.0.3"
 
 maven_jar(
-  name = 'jest_common',
-  artifact = 'io.searchbox:jest-common:' + JEST_VERSION,
-  sha1 = 'f304c66894aaf2f6c17a886bc826f09c7a161cf9',
+    name = "jest_common",
+    artifact = "io.searchbox:jest-common:" + JEST_VERSION,
+    sha1 = "f304c66894aaf2f6c17a886bc826f09c7a161cf9",
 )
 
 maven_jar(
-  name = 'jest',
-  artifact = 'io.searchbox:jest:' + JEST_VERSION,
-  sha1 = 'b8f9ed1423489b361804e47f640515ea9f1fa08d',
+    name = "jest",
+    artifact = "io.searchbox:jest:" + JEST_VERSION,
+    sha1 = "b8f9ed1423489b361804e47f640515ea9f1fa08d",
 )
 
 maven_jar(
-  name = 'compress_lzf',
-  artifact = 'com.ning:compress-lzf:1.0.2',
-  sha1 = '62896e6fca184c79cc01a14d143f3ae2b4f4b4ae',
+    name = "compress_lzf",
+    artifact = "com.ning:compress-lzf:1.0.2",
+    sha1 = "62896e6fca184c79cc01a14d143f3ae2b4f4b4ae",
 )
 
 maven_jar(
-  name = 'hppc',
-  artifact = 'com.carrotsearch:hppc:0.7.1',
-  sha1 = '8b5057f74ea378c0150a1860874a3ebdcb713767',
+    name = "hppc",
+    artifact = "com.carrotsearch:hppc:0.7.1",
+    sha1 = "8b5057f74ea378c0150a1860874a3ebdcb713767",
 )
 
 maven_jar(
-  name = 'jsr166e',
-  artifact = 'com.twitter:jsr166e:1.1.0',
-  sha1 = '233098147123ee5ddcd39ffc57ff648be4b7e5b2',
+    name = "jsr166e",
+    artifact = "com.twitter:jsr166e:1.1.0",
+    sha1 = "233098147123ee5ddcd39ffc57ff648be4b7e5b2",
 )
 
 maven_jar(
-  name = 'netty',
-  artifact = 'io.netty:netty:3.10.0.Final',
-  sha1 = 'ad61cd1bba067e6634ddd3e160edf0727391ac30',
+    name = "netty",
+    artifact = "io.netty:netty:3.10.0.Final",
+    sha1 = "ad61cd1bba067e6634ddd3e160edf0727391ac30",
 )
 
 maven_jar(
-  name = 't_digest',
-  artifact = 'com.tdunning:t-digest:3.0',
-  sha1 = '84ccf145ac2215e6bfa63baa3101c0af41017cfc',
+    name = "t_digest",
+    artifact = "com.tdunning:t-digest:3.0",
+    sha1 = "84ccf145ac2215e6bfa63baa3101c0af41017cfc",
 )
 
 maven_jar(
-  name = 'jna',
-  artifact = 'net.java.dev.jna:jna:4.1.0',
-  sha1 = '1c12d070e602efd8021891cdd7fd18bc129372d4',
+    name = "jna",
+    artifact = "net.java.dev.jna:jna:4.1.0",
+    sha1 = "1c12d070e602efd8021891cdd7fd18bc129372d4",
 )
 
-JACKSON_VERSION = '2.6.6'
+JACKSON_VERSION = "2.6.6"
 
 maven_jar(
-  name = 'jackson_core',
-  artifact = 'com.fasterxml.jackson.core:jackson-core:' + JACKSON_VERSION,
-  sha1 = '02eb801df67aacaf5b1deb4ac626e1964508e47b',
+    name = "jackson_core",
+    artifact = "com.fasterxml.jackson.core:jackson-core:" + JACKSON_VERSION,
+    sha1 = "02eb801df67aacaf5b1deb4ac626e1964508e47b",
 )
 
 maven_jar(
-  name = 'jackson_dataformat_smile',
-  artifact = 'com.fasterxml.jackson.dataformat:jackson-dataformat-smile:' + JACKSON_VERSION,
-  sha1 = 'ccbfc948748ed2754a58c1af9e0a02b5cc1aed69',
+    name = "jackson_dataformat_smile",
+    artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-smile:" + JACKSON_VERSION,
+    sha1 = "ccbfc948748ed2754a58c1af9e0a02b5cc1aed69",
 )
 
 maven_jar(
-  name = 'jackson_dataformat_cbor',
-  artifact = 'com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:' + JACKSON_VERSION,
-  sha1 = '34c7b7ff495fc6b049612bdc9db0900a68e112f8',
+    name = "jackson_dataformat_cbor",
+    artifact = "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:" + JACKSON_VERSION,
+    sha1 = "34c7b7ff495fc6b049612bdc9db0900a68e112f8",
 )
 
 maven_jar(
-  name = 'httpasyncclient',
-  artifact = 'org.apache.httpcomponents:httpasyncclient:4.1.2',
-  sha1 = '95aa3e6fb520191a0970a73cf09f62948ee614be',
+    name = "httpasyncclient",
+    artifact = "org.apache.httpcomponents:httpasyncclient:4.1.2",
+    sha1 = "95aa3e6fb520191a0970a73cf09f62948ee614be",
 )
 
 maven_jar(
-  name = 'httpcore_nio',
-  artifact = 'org.apache.httpcomponents:httpcore-nio:' + HTTPCOMP_VERS,
-  sha1 = 'a8c5e3c3bfea5ce23fb647c335897e415eb442e3',
+    name = "httpcore_nio",
+    artifact = "org.apache.httpcomponents:httpcore-nio:" + HTTPCOMP_VERS,
+    sha1 = "a8c5e3c3bfea5ce23fb647c335897e415eb442e3",
 )
 
 maven_jar(
-  name = 'httpcore_niossl',
-  artifact = 'org.apache.httpcomponents:httpcore-niossl:4.0-alpha6',
-  sha1 = '9c662e7247ca8ceb1de5de629f685c9ef3e4ab58',
-  attach_source = False,
+    name = "httpcore_niossl",
+    artifact = "org.apache.httpcomponents:httpcore-niossl:4.0-alpha6",
+    attach_source = False,
+    sha1 = "9c662e7247ca8ceb1de5de629f685c9ef3e4ab58",
 )
 
 load("//tools/bzl:js.bzl", "npm_binary", "bower_archive")
 
 npm_binary(
-  name = "bower",
+    name = "bower",
 )
 
 npm_binary(
-  name = "vulcanize",
-  repository = GERRIT,
+    name = "vulcanize",
+    repository = GERRIT,
 )
 
 npm_binary(
-  name = "crisper",
-  repository = GERRIT,
+    name = "crisper",
+    repository = GERRIT,
 )
 
 # bower_archive() seed components.
 bower_archive(
-  name = 'iron-autogrow-textarea',
-  package = 'polymerelements/iron-autogrow-textarea',
-  version = '1.0.12',
-  sha1 = 'b9b6874c9a2b5be435557a827ff8bd6661672ee3',
+    name = "iron-autogrow-textarea",
+    package = "polymerelements/iron-autogrow-textarea",
+    sha1 = "b9b6874c9a2b5be435557a827ff8bd6661672ee3",
+    version = "1.0.12",
 )
 
 bower_archive(
-  name = 'es6-promise',
-  package = 'stefanpenner/es6-promise',
-  version = '3.3.0',
-  sha1 = 'a3a797bb22132f1ef75f9a2556173f81870c2e53',
+    name = "es6-promise",
+    package = "stefanpenner/es6-promise",
+    sha1 = "a3a797bb22132f1ef75f9a2556173f81870c2e53",
+    version = "3.3.0",
 )
 
 bower_archive(
-  name = 'fetch',
-  package = 'fetch',
-  version = '1.0.0',
-  sha1 = '1b05a2bb40c73232c2909dc196de7519fe4db7a9',
+    name = "fetch",
+    package = "fetch",
+    sha1 = "1b05a2bb40c73232c2909dc196de7519fe4db7a9",
+    version = "1.0.0",
 )
 
 bower_archive(
-  name = 'iron-dropdown',
-  package = 'polymerelements/iron-dropdown',
-  version = '1.4.0',
-  sha1 = '63e3d669a09edaa31c4f05afc76b53b919ef0595',
+    name = "iron-dropdown",
+    package = "polymerelements/iron-dropdown",
+    sha1 = "63e3d669a09edaa31c4f05afc76b53b919ef0595",
+    version = "1.4.0",
 )
 
 bower_archive(
-  name = 'iron-input',
-  package = 'polymerelements/iron-input',
-  version = '1.0.10',
-  sha1 = '9bc0c8e81de2527125383cbcf74dd9f27e7fa9ac',
+    name = "iron-input",
+    package = "polymerelements/iron-input",
+    sha1 = "9bc0c8e81de2527125383cbcf74dd9f27e7fa9ac",
+    version = "1.0.10",
 )
 
 bower_archive(
-  name = 'iron-overlay-behavior',
-  package = 'polymerelements/iron-overlay-behavior',
-  version = '1.7.6',
-  sha1 = '83181085fda59446ce74fd0d5ca30c223f38ee4a',
+    name = "iron-overlay-behavior",
+    package = "polymerelements/iron-overlay-behavior",
+    sha1 = "83181085fda59446ce74fd0d5ca30c223f38ee4a",
+    version = "1.7.6",
 )
 
 bower_archive(
-  name = 'iron-selector',
-  package = 'polymerelements/iron-selector',
-  version = '1.5.2',
-  sha1 = 'c57235dfda7fbb987c20ad0e97aac70babf1a1bf',
+    name = "iron-selector",
+    package = "polymerelements/iron-selector",
+    sha1 = "c57235dfda7fbb987c20ad0e97aac70babf1a1bf",
+    version = "1.5.2",
 )
 
 bower_archive(
-  name = 'moment',
-  package = 'moment/moment',
-  version = '2.13.0',
-  sha1 = 'fc8ce2c799bab21f6ced7aff928244f4ca8880aa',
+    name = "moment",
+    package = "moment/moment",
+    sha1 = "fc8ce2c799bab21f6ced7aff928244f4ca8880aa",
+    version = "2.13.0",
 )
 
 bower_archive(
-  name = 'page',
-  package = 'visionmedia/page.js',
-  version = '1.7.1',
-  sha1 = '51a05428dd4f68fae1df5f12d0e2b61ba67f7757',
+    name = "page",
+    package = "visionmedia/page.js",
+    sha1 = "51a05428dd4f68fae1df5f12d0e2b61ba67f7757",
+    version = "1.7.1",
 )
 
 bower_archive(
-  name = 'polymer',
-  package = 'polymer/polymer',
-  version = '1.4.0',
-  sha1 = 'b84725939ead7c7bdf9917b065f68ef8dc790d06',
+    name = "polymer",
+    package = "polymer/polymer",
+    sha1 = "b84725939ead7c7bdf9917b065f68ef8dc790d06",
+    version = "1.4.0",
 )
 
 bower_archive(
-  name = 'promise-polyfill',
-  package = 'polymerlabs/promise-polyfill',
-  version = '1.0.0',
-  sha1 = 'a3b598c06cbd7f441402e666ff748326030905d6',
+    name = "promise-polyfill",
+    package = "polymerlabs/promise-polyfill",
+    sha1 = "a3b598c06cbd7f441402e666ff748326030905d6",
+    version = "1.0.0",
 )
 
 # bower test stuff
 
 bower_archive(
-  name = 'iron-test-helpers',
-  package = 'polymerelements/iron-test-helpers',
-  version = '1.2.5',
-  sha1 = '433b03b106f5ff32049b84150cd70938e18b67ac',
+    name = "iron-test-helpers",
+    package = "polymerelements/iron-test-helpers",
+    sha1 = "433b03b106f5ff32049b84150cd70938e18b67ac",
+    version = "1.2.5",
 )
 
 bower_archive(
-  name = 'test-fixture',
-  package = 'polymerelements/test-fixture',
-  version = '1.1.1',
-  sha1 = 'e373bd21c069163c3a754e234d52c07c77b20d3c',
+    name = "test-fixture",
+    package = "polymerelements/test-fixture",
+    sha1 = "e373bd21c069163c3a754e234d52c07c77b20d3c",
+    version = "1.1.1",
 )
 
 bower_archive(
-  name = 'web-component-tester',
-  package = 'web-component-tester',
-  version = '4.2.2',
-  sha1 = '54556000c33d9ed7949aa546c1b4a1531491a5f0',
+    name = "web-component-tester",
+    package = "web-component-tester",
+    sha1 = "54556000c33d9ed7949aa546c1b4a1531491a5f0",
+    version = "4.2.2",
 )
 
 # Bower component transitive dependencies.
 load("//lib/js:bower_archives.bzl", "load_bower_archives")
+
 load_bower_archives()
diff --git a/gerrit-acceptance-framework/BUILD b/gerrit-acceptance-framework/BUILD
index 7f06cd3..69f132b 100644
--- a/gerrit-acceptance-framework/BUILD
+++ b/gerrit-acceptance-framework/BUILD
@@ -1,73 +1,74 @@
-load('//tools/bzl:java.bzl', 'java_library2')
+load("//tools/bzl:java.bzl", "java_library2")
 
-SRCS = glob(['src/test/java/com/google/gerrit/acceptance/*.java'])
+SRCS = glob(["src/test/java/com/google/gerrit/acceptance/*.java"])
 
 PROVIDED = [
-  '//gerrit-common:annotations',
-  '//gerrit-common:server',
-  '//gerrit-extension-api:api',
-  '//gerrit-httpd:httpd',
-  '//gerrit-lucene:lucene',
-  '//gerrit-pgm:init',
-  '//gerrit-reviewdb:server',
-  '//gerrit-server:server',
-  '//lib:gson',
-  '//lib:jsch',
-  '//lib/jgit/org.eclipse.jgit:jgit',
-  '//lib/mina:sshd',
-  '//lib:servlet-api-3_1',
+    "//gerrit-common:annotations",
+    "//gerrit-common:server",
+    "//gerrit-extension-api:api",
+    "//gerrit-httpd:httpd",
+    "//gerrit-lucene:lucene",
+    "//gerrit-pgm:init",
+    "//gerrit-reviewdb:server",
+    "//gerrit-server:server",
+    "//lib:gson",
+    "//lib:jsch",
+    "//lib/jgit/org.eclipse.jgit:jgit",
+    "//lib/mina:sshd",
+    "//lib:servlet-api-3_1",
 ]
 
 java_binary(
-  name = 'acceptance-framework',
-  main_class = 'Dummy',
-  runtime_deps = [':lib'],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "acceptance-framework",
+    testonly = 1,
+    main_class = "Dummy",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":lib"],
 )
 
 java_library2(
-  name = 'lib',
-  srcs = SRCS,
-  exported_deps = [
-    '//gerrit-antlr:query_exception',
-    '//gerrit-gpg:gpg',
-    '//gerrit-launcher:launcher',
-    '//gerrit-openid:openid',
-    '//gerrit-pgm:daemon',
-    '//gerrit-pgm:http-jetty',
-    '//gerrit-pgm:util-nodep',
-    '//gerrit-server/src/main/prolog:common',
-    '//gerrit-server:testutil',
-    '//lib/auto:auto-value',
-    '//lib/httpcomponents:fluent-hc',
-    '//lib/httpcomponents:httpclient',
-    '//lib/httpcomponents:httpcore',
-    '//lib/jetty:servlet',
-    '//lib/jgit/org.eclipse.jgit.junit:junit',
-    '//lib/log:impl_log4j',
-    '//lib/log:log4j',
-    '//lib:truth',
-  ],
-  deps = PROVIDED + [ # We want these deps to be exported_deps
-    '//lib/greenmail:greenmail',
-    '//lib:gwtorm',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-servlet',
-    '//lib/mail:mail',
-  ],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "lib",
+    testonly = 1,
+    srcs = SRCS,
+    exported_deps = [
+        "//gerrit-antlr:query_exception",
+        "//gerrit-gpg:gpg",
+        "//gerrit-launcher:launcher",
+        "//gerrit-openid:openid",
+        "//gerrit-pgm:daemon",
+        "//gerrit-pgm:http-jetty",
+        "//gerrit-pgm:util-nodep",
+        "//gerrit-server:testutil",
+        "//gerrit-server/src/main/prolog:common",
+        "//lib:truth",
+        "//lib/auto:auto-value",
+        "//lib/httpcomponents:fluent-hc",
+        "//lib/httpcomponents:httpclient",
+        "//lib/httpcomponents:httpcore",
+        "//lib/jetty:servlet",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/log:impl_log4j",
+        "//lib/log:log4j",
+    ],
+    visibility = ["//visibility:public"],
+    deps = PROVIDED + [
+        # We want these deps to be exported_deps
+        "//lib/greenmail:greenmail",
+        "//lib:gwtorm",
+        "//lib/guice:guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
+        "//lib/mail:mail",
+    ],
 )
 
-load('//tools/bzl:javadoc.bzl', 'java_doc')
+load("//tools/bzl:javadoc.bzl", "java_doc")
 
 java_doc(
-  name = 'acceptance-framework-javadoc',
-  title = 'Gerrit Acceptance Test Framework Documentation',
-  libs = [':lib'],
-  pkgs = ['com.google.gerrit.acceptance'],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "acceptance-framework-javadoc",
+    testonly = 1,
+    libs = [":lib"],
+    pkgs = ["com.google.gerrit.acceptance"],
+    title = "Gerrit Acceptance Test Framework Documentation",
+    visibility = ["//visibility:public"],
 )
diff --git a/gerrit-acceptance-tests/BUILD b/gerrit-acceptance-tests/BUILD
index 71b1b45..c7b8043 100644
--- a/gerrit-acceptance-tests/BUILD
+++ b/gerrit-acceptance-tests/BUILD
@@ -1,43 +1,41 @@
-load('//tools/bzl:java.bzl', 'java_library2')
+load("//tools/bzl:java.bzl", "java_library2")
 
 java_library2(
-  name = 'lib',
-  srcs = glob(['src/test/java/com/google/gerrit/acceptance/*.java']),
-  exported_deps = [
-    '//gerrit-acceptance-framework:lib',
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-gpg:testutil',
-    '//gerrit-launcher:launcher',
-    '//gerrit-lucene:lucene',
-    '//gerrit-httpd:httpd',
-    '//gerrit-pgm:init',
-    '//gerrit-pgm:pgm',
-    '//gerrit-pgm:util',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//gerrit-server:testutil',
-    '//gerrit-server/src/main/prolog:common',
-    '//gerrit-sshd:sshd',
-
-    '//lib:args4j',
-    '//lib:gson',
-    '//lib:gwtjsonrpc',
-    '//lib:gwtorm',
-    '//lib:h2',
-    '//lib:jsch',
-    '//lib:servlet-api-3_1-without-neverlink',
-
-    '//lib/bouncycastle:bcpg',
-    '//lib/bouncycastle:bcprov',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-servlet',
-    '//lib/log:api',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/mina:sshd',
-  ],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "lib",
+    testonly = 1,
+    srcs = glob(["src/test/java/com/google/gerrit/acceptance/*.java"]),
+    exported_deps = [
+        "//gerrit-acceptance-framework:lib",
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-gpg:testutil",
+        "//gerrit-httpd:httpd",
+        "//gerrit-launcher:launcher",
+        "//gerrit-lucene:lucene",
+        "//gerrit-pgm:init",
+        "//gerrit-pgm:pgm",
+        "//gerrit-pgm:util",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//gerrit-server:testutil",
+        "//gerrit-server/src/main/prolog:common",
+        "//gerrit-sshd:sshd",
+        "//lib:args4j",
+        "//lib:gson",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
+        "//lib:h2",
+        "//lib:jsch",
+        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib/bouncycastle:bcpg",
+        "//lib/bouncycastle:bcprov",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//lib/mina:sshd",
+    ],
+    visibility = ["//visibility:public"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SandboxTest.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SandboxTest.java
index 3ff7112..7b5dfa9 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SandboxTest.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/SandboxTest.java
@@ -27,12 +27,12 @@
   }
 
   @Test
-  public void testUserNotPresent1() throws Exception {
+  public void userNotPresent1() throws Exception {
     assertThat(gApi.accounts().query("sandboxuser").get()).isEmpty();
   }
 
   @Test
-  public void testUserNotPresent2() throws Exception {
+  public void userNotPresent2() throws Exception {
     assertThat(gApi.accounts().query("sandboxuser").get()).isEmpty();
   }
 }
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/BUILD
index 6caddb6..3d62cfc 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/accounts/BUILD
@@ -1,7 +1,10 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'api_account',
-  srcs = glob(['*IT.java']),
-  labels = ['api', 'noci'],
+    srcs = glob(["*IT.java"]),
+    group = "api_account",
+    labels = [
+        "api",
+        "noci",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/BUILD
index 371b03a..3c4e219 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/BUILD
@@ -1,7 +1,10 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'api_change',
-  srcs = glob(['*IT.java']),
-  labels = ['api', 'noci'],
+    srcs = glob(["*IT.java"]),
+    group = "api_change",
+    labels = [
+        "api",
+        "noci",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
index c52989d..a6a39cd 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/change/ChangeIT.java
@@ -2238,7 +2238,7 @@
   }
 
   @Test
-  public void testCreateMergePatchSet() throws Exception {
+  public void createMergePatchSet() throws Exception {
     PushOneCommit.Result start = pushTo("refs/heads/master");
     start.assertOkStatus();
     // create a change for master
@@ -2275,7 +2275,7 @@
   }
 
   @Test
-  public void testCreateMergePatchSetInheritParent() throws Exception {
+  public void createMergePatchSetInheritParent() throws Exception {
     PushOneCommit.Result start = pushTo("refs/heads/master");
     start.assertOkStatus();
     // create a change for master
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/config/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/config/BUILD
index da8274d..6d39131 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/config/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/config/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'api_config',
-  srcs = glob(['*IT.java']),
-  labels = ['api'],
+    srcs = glob(["*IT.java"]),
+    group = "api_config",
+    labels = ["api"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD
index 1a374f0..1b907765 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/BUILD
@@ -1,23 +1,23 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'api_group',
-  srcs = glob(['*IT.java']),
-  deps = [
-    ':util',
-    '//gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account:util',
-  ],
-  labels = ['api'],
+    srcs = glob(["*IT.java"]),
+    group = "api_group",
+    labels = ["api"],
+    deps = [
+        ":util",
+        "//gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account:util",
+    ],
 )
 
 java_library(
-  name = 'util',
-  srcs = ['GroupAssert.java'],
-  deps = [
-    '//gerrit-extension-api:api',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:gwtorm',
-    '//lib:truth',
-  ],
+    name = "util",
+    srcs = ["GroupAssert.java"],
+    deps = [
+        "//gerrit-extension-api:api",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//lib:gwtorm",
+        "//lib:truth",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
index f98e588..ccef13c 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/group/GroupsIT.java
@@ -130,14 +130,14 @@
   }
 
   @Test
-  public void testCreateGroup() throws Exception {
+  public void createGroup() throws Exception {
     String newGroupName = name("newGroup");
     GroupInfo g = gApi.groups().create(newGroupName).get();
     assertGroupInfo(getFromCache(newGroupName), g);
   }
 
   @Test
-  public void testCreateDuplicateInternalGroupCaseSensitiveName_Conflict()
+  public void createDuplicateInternalGroupCaseSensitiveName_Conflict()
       throws Exception {
     String dupGroupName = name("dupGroup");
     gApi.groups().create(dupGroupName);
@@ -147,7 +147,7 @@
   }
 
   @Test
-  public void testCreateDuplicateInternalGroupCaseInsensitiveName()
+  public void createDuplicateInternalGroupCaseInsensitiveName()
       throws Exception {
     String dupGroupName = name("dupGroupA");
     String dupGroupNameLowerCase = name("dupGroupA").toLowerCase();
@@ -158,7 +158,7 @@
   }
 
   @Test
-  public void testCreateDuplicateSystemGroupCaseSensitiveName_Conflict()
+  public void createDuplicateSystemGroupCaseSensitiveName_Conflict()
       throws Exception {
     String newGroupName = "Registered Users";
     exception.expect(ResourceConflictException.class);
@@ -167,7 +167,7 @@
   }
 
   @Test
-  public void testCreateDuplicateSystemGroupCaseInsensitiveName_Conflict()
+  public void createDuplicateSystemGroupCaseInsensitiveName_Conflict()
       throws Exception {
     String newGroupName = "registered users";
     exception.expect(ResourceConflictException.class);
@@ -176,7 +176,7 @@
   }
 
   @Test
-  public void testCreateGroupWithProperties() throws Exception {
+  public void createGroupWithProperties() throws Exception {
     GroupInput in = new GroupInput();
     in.name = name("newGroup");
     in.description = "Test description";
@@ -189,14 +189,14 @@
   }
 
   @Test
-  public void testCreateGroupWithoutCapability_Forbidden() throws Exception {
+  public void createGroupWithoutCapability_Forbidden() throws Exception {
     setApiUser(user);
     exception.expect(AuthException.class);
     gApi.groups().create(name("newGroup"));
   }
 
   @Test
-  public void testGetGroup() throws Exception {
+  public void getGroup() throws Exception {
     AccountGroup adminGroup = groupCache.get(new AccountGroup.NameKey("Administrators"));
     testGetGroup(adminGroup.getGroupUUID().get(), adminGroup);
     testGetGroup(adminGroup.getName(), adminGroup);
@@ -210,7 +210,7 @@
   }
 
   @Test
-  public void testGroupName() throws Exception {
+  public void groupName() throws Exception {
     String name = name("group");
     gApi.groups().create(name);
 
@@ -229,7 +229,7 @@
   }
 
   @Test
-  public void testGroupRename() throws Exception {
+  public void groupRename() throws Exception {
     String name = name("group");
     gApi.groups().create(name);
 
@@ -244,7 +244,7 @@
   }
 
   @Test
-  public void testGroupDescription() throws Exception {
+  public void groupDescription() throws Exception {
     String name = name("group");
     gApi.groups().create(name);
 
@@ -266,7 +266,7 @@
   }
 
   @Test
-  public void testGroupOptions() throws Exception {
+  public void groupOptions() throws Exception {
     String name = name("group");
     gApi.groups().create(name);
 
@@ -281,7 +281,7 @@
   }
 
   @Test
-  public void testGroupOwner() throws Exception {
+  public void groupOwner() throws Exception {
     String name = name("group");
     GroupInfo info = gApi.groups().create(name).get();
     String adminUUID = getFromCache("Administrators").getGroupUUID().get();
@@ -395,7 +395,7 @@
   }
 
   @Test
-  public void testListAllGroups() throws Exception {
+  public void listAllGroups() throws Exception {
     List<String> expectedGroups = groupCache.all().stream()
           .map(a -> a.getName())
           .sorted()
@@ -406,7 +406,7 @@
   }
 
   @Test
-  public void testOnlyVisibleGroupsReturned() throws Exception {
+  public void onlyVisibleGroupsReturned() throws Exception {
     String newGroupName = name("newGroup");
     GroupInput in = new GroupInput();
     in.name = newGroupName;
@@ -427,14 +427,14 @@
   }
 
   @Test
-  public void testSuggestGroup() throws Exception {
+  public void suggestGroup() throws Exception {
     Map<String, GroupInfo> groups = gApi.groups().list().withSuggest("adm").getAsMap();
     assertThat(groups).containsKey("Administrators");
     assertThat(groups).hasSize(1);
   }
 
   @Test
-  public void testAllGroupInfoFieldsSetCorrectly() throws Exception {
+  public void allGroupInfoFieldsSetCorrectly() throws Exception {
     AccountGroup adminGroup = getFromCache("Administrators");
     Map<String, GroupInfo> groups =
         gApi.groups().list().addGroup(adminGroup.getName()).getAsMap();
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/BUILD
index 4fb65ff..8be3101 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/project/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'api_project',
-  srcs = glob(['*IT.java']),
-  labels = ['api'],
+    srcs = glob(["*IT.java"]),
+    group = "api_project",
+    labels = ["api"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/BUILD
index e527b9d..4f15ec0 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'api_revision',
-  srcs = glob(['*IT.java']),
-  labels = ['api'],
+    srcs = glob(["*IT.java"]),
+    group = "api_revision",
+    labels = ["api"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java
index 145caa3..9bba97d 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/api/revision/RobotCommentsIT.java
@@ -26,6 +26,7 @@
 import com.google.gerrit.extensions.common.RobotCommentInfo;
 import com.google.gerrit.extensions.restapi.MethodNotAllowedException;
 
+import org.junit.Before;
 import org.junit.Test;
 
 import java.util.Collections;
@@ -34,73 +35,95 @@
 import java.util.Map;
 
 public class RobotCommentsIT extends AbstractDaemonTest {
+  private String changeId;
+
+  @Before
+  public void setUp() throws Exception {
+    PushOneCommit.Result changeResult = createChange();
+    changeId = changeResult.getChangeId();
+  }
+
   @Test
-  public void comments() throws Exception {
+  public void retrievingRobotCommentsBeforeAddingAnyDoesNotRaiseAnException()
+      throws Exception {
     assume().that(notesMigration.enabled()).isTrue();
 
-    PushOneCommit.Result r = createChange();
-
-    Map<String, List<RobotCommentInfo>> out = gApi.changes()
-        .id(r.getChangeId())
-        .revision(r.getCommit().name())
+    Map<String, List<RobotCommentInfo>> robotComments = gApi.changes()
+        .id(changeId)
+        .current()
         .robotComments();
-    assertThat(out).isEmpty();
+
+    assertThat(robotComments).isNotNull();
+    assertThat(robotComments).isEmpty();
+  }
+
+  @Test
+  public void addedRobotCommentsCanBeRetrieved() throws Exception {
+    assume().that(notesMigration.enabled()).isTrue();
 
     RobotCommentInput in = createRobotCommentInput();
-    ReviewInput reviewInput = new ReviewInput();
-    Map<String, List<RobotCommentInput>> robotComments = new HashMap<>();
-    robotComments.put(in.path, Collections.singletonList(in));
-    reviewInput.robotComments = robotComments;
-    reviewInput.message = "comment test";
-    gApi.changes()
-       .id(r.getChangeId())
-       .current()
-       .review(reviewInput);
-
-    out = gApi.changes()
-        .id(r.getChangeId())
-        .revision(r.getCommit().name())
-        .robotComments();
-    assertThat(out).hasSize(1);
-    RobotCommentInfo comment = Iterables.getOnlyElement(out.get(in.path));
-    assertRobotComment(comment, in, false);
-
-    List<RobotCommentInfo> list = gApi.changes()
-        .id(r.getChangeId())
-        .revision(r.getCommit().name())
-        .robotCommentsAsList();
-    assertThat(list).hasSize(1);
-
-    RobotCommentInfo comment2 = list.get(0);
-    assertRobotComment(comment2, in);
-
-    RobotCommentInfo comment3 = gApi.changes()
-        .id(r.getChangeId())
-        .revision(r.getCommit().name())
-        .robotComment(comment.id)
-        .get();
-    assertRobotComment(comment3, in);
-  }
-
-  @Test
-  public void noOptionalFields() throws Exception {
-    assume().that(notesMigration.enabled()).isTrue();
-
-    PushOneCommit.Result r = createChange();
-    RobotCommentInput in = createRobotCommentInputWithMandatoryFields();
-    ReviewInput reviewInput = new ReviewInput();
-    Map<String, List<RobotCommentInput>> robotComments = new HashMap<>();
-    robotComments.put(in.path, Collections.singletonList(in));
-    reviewInput.robotComments = robotComments;
-    reviewInput.message = "comment test";
-    gApi.changes()
-       .id(r.getChangeId())
-       .current()
-       .review(reviewInput);
+    addRobotComment(changeId, in);
 
     Map<String, List<RobotCommentInfo>> out = gApi.changes()
-        .id(r.getChangeId())
-        .revision(r.getCommit().name())
+        .id(changeId)
+        .current()
+        .robotComments();
+
+    assertThat(out).hasSize(1);
+    RobotCommentInfo comment = Iterables.getOnlyElement(out.get(in.path));
+    assertRobotComment(comment, in, false);
+  }
+
+  @Test
+  public void robotCommentsCanBeRetrievedAsList() throws Exception {
+    assume().that(notesMigration.enabled()).isTrue();
+
+    RobotCommentInput robotCommentInput = createRobotCommentInput();
+    addRobotComment(changeId, robotCommentInput);
+
+    List<RobotCommentInfo> robotCommentInfos = gApi.changes()
+        .id(changeId)
+        .current()
+        .robotCommentsAsList();
+
+    assertThat(robotCommentInfos).hasSize(1);
+    RobotCommentInfo robotCommentInfo =
+        Iterables.getOnlyElement(robotCommentInfos);
+    assertRobotComment(robotCommentInfo, robotCommentInput);
+  }
+
+  @Test
+  public void specificRobotCommentCanBeRetrieved() throws Exception {
+    assume().that(notesMigration.enabled()).isTrue();
+
+    RobotCommentInput robotCommentInput = createRobotCommentInput();
+    addRobotComment(changeId, robotCommentInput);
+
+    List<RobotCommentInfo> robotCommentInfos = gApi.changes()
+        .id(changeId)
+        .current()
+        .robotCommentsAsList();
+    RobotCommentInfo robotCommentInfo =
+        Iterables.getOnlyElement(robotCommentInfos);
+
+    RobotCommentInfo specificRobotCommentInfo = gApi.changes()
+        .id(changeId)
+        .current()
+        .robotComment(robotCommentInfo.id)
+        .get();
+    assertRobotComment(specificRobotCommentInfo, robotCommentInput);
+  }
+
+  @Test
+  public void robotCommentWithoutOptionalFieldsCanBeAdded() throws Exception {
+    assume().that(notesMigration.enabled()).isTrue();
+
+    RobotCommentInput in = createRobotCommentInputWithMandatoryFields();
+    addRobotComment(changeId, in);
+
+    Map<String, List<RobotCommentInfo>> out = gApi.changes()
+        .id(changeId)
+        .current()
         .robotComments();
     assertThat(out).hasSize(1);
     RobotCommentInfo comment = Iterables.getOnlyElement(out.get(in.path));
@@ -108,10 +131,9 @@
   }
 
   @Test
-  public void robotCommentsNotSupported() throws Exception {
+  public void robotCommentsNotSupportedWithoutNoteDb() throws Exception {
     assume().that(notesMigration.enabled()).isFalse();
 
-    PushOneCommit.Result r = createChange();
     RobotCommentInput in = createRobotCommentInput();
     ReviewInput reviewInput = new ReviewInput();
     Map<String, List<RobotCommentInput>> robotComments = new HashMap<>();
@@ -122,7 +144,7 @@
     exception.expect(MethodNotAllowedException.class);
     exception.expectMessage("robot comments not supported");
     gApi.changes()
-       .id(r.getChangeId())
+       .id(changeId)
        .current()
        .review(reviewInput);
   }
@@ -146,6 +168,18 @@
     return in;
   }
 
+  private void addRobotComment(String targetChangeId,
+      RobotCommentInput robotCommentInput) throws Exception {
+    ReviewInput reviewInput = new ReviewInput();
+    reviewInput.robotComments = Collections.singletonMap(robotCommentInput.path,
+        Collections.singletonList(robotCommentInput));
+    reviewInput.message = "robot comment test";
+    gApi.changes()
+        .id(targetChangeId)
+        .current()
+        .review(reviewInput);
+  }
+
   private void assertRobotComment(RobotCommentInfo c,
       RobotCommentInput expected) {
     assertRobotComment(c, expected, true);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUCK b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUCK
index c3274db..313144a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUCK
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUCK
@@ -4,7 +4,6 @@
   group = 'edit',
   srcs = ['ChangeEditIT.java'],
   deps = [
-    '//lib/commons:codec',
     '//lib/joda:joda-time',
   ],
   labels = ['edit'],
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUILD
index 3fcf2d8..990bad6 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/BUILD
@@ -1,11 +1,10 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'edit',
-  srcs = ['ChangeEditIT.java'],
-  deps = [
-    '//lib/commons:codec',
-    '//lib/joda:joda-time',
-  ],
-  labels = ['edit'],
+    srcs = ["ChangeEditIT.java"],
+    group = "edit",
+    labels = ["edit"],
+    deps = [
+        "//lib/joda:joda-time",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
index 7830b17e..b549814 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/edit/ChangeEditIT.java
@@ -65,7 +65,6 @@
 import com.google.gwtorm.server.SchemaFactory;
 import com.google.inject.Inject;
 
-import org.apache.commons.codec.binary.StringUtils;
 import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
 import org.eclipse.jgit.junit.TestRepository;
 import org.eclipse.jgit.lib.ObjectId;
@@ -646,16 +645,15 @@
     Optional<ChangeEdit> edit = editUtil.byChange(change);
     assertThat(modifier.modifyFile(edit.get(), FILE_NAME, RawInputUtil.create(CONTENT_NEW2)))
         .isEqualTo(RefUpdate.Result.FORCED);
-    edit = editUtil.byChange(change);
     RestResponse r = adminRestSession.getJsonAccept(urlEditFile());
     r.assertOK();
     assertThat(readContentFromJson(r)).isEqualTo(
-        StringUtils.newStringUtf8(CONTENT_NEW2));
+        new String(CONTENT_NEW2, UTF_8));
 
     r = adminRestSession.getJsonAccept(urlEditFile(true));
     r.assertOK();
     assertThat(readContentFromJson(r)).isEqualTo(
-        StringUtils.newStringUtf8(CONTENT_OLD));
+        new String(CONTENT_OLD, UTF_8));
   }
 
   @Test
@@ -742,7 +740,7 @@
   }
 
   @Test
-  public void testHasEditPredicate() throws Exception {
+  public void hasEditPredicate() throws Exception {
     assertThat(modifier.createEdit(change, ps)).isEqualTo(RefUpdate.Result.NEW);
     assertThat(queryEdits()).hasSize(1);
 
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD
index 3b7d2f2..43ec5bc 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/BUILD
@@ -1,28 +1,28 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'git',
-  srcs = glob(['*IT.java']),
-  deps = [
-    ':submodule_util',
-    ':push_for_review',
-  ],
-  labels = ['git'],
+    srcs = glob(["*IT.java"]),
+    group = "git",
+    labels = ["git"],
+    deps = [
+        ":push_for_review",
+        ":submodule_util",
+    ],
 )
 
 java_library(
-  name = 'push_for_review',
-  srcs = ['AbstractPushForReview.java'],
-  deps = [
-    '//gerrit-acceptance-tests:lib',
-    '//lib/joda:joda-time',
-  ],
-  testonly = 1,
+    name = "push_for_review",
+    testonly = 1,
+    srcs = ["AbstractPushForReview.java"],
+    deps = [
+        "//gerrit-acceptance-tests:lib",
+        "//lib/joda:joda-time",
+    ],
 )
 
 java_library(
-  name = 'submodule_util',
-  srcs = ['AbstractSubmoduleSubscription.java'],
-  deps = ['//gerrit-acceptance-tests:lib'],
-  testonly = 1,
+    name = "submodule_util",
+    testonly = 1,
+    srcs = ["AbstractSubmoduleSubscription.java"],
+    deps = ["//gerrit-acceptance-tests:lib"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java
index 41f47a2..ac5477c 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/DraftChangeBlockedIT.java
@@ -33,14 +33,14 @@
   }
 
   @Test
-  public void testPushDraftChange_Blocked() throws Exception {
+  public void pushDraftChange_Blocked() throws Exception {
     // create draft by pushing to 'refs/drafts/'
     PushOneCommit.Result r = pushTo("refs/drafts/master");
     r.assertErrorStatus("cannot upload drafts");
   }
 
   @Test
-  public void testPushDraftChangeMagic_Blocked() throws Exception {
+  public void pushDraftChangeMagic_Blocked() throws Exception {
     // create draft by using 'draft' option
     PushOneCommit.Result r = pushTo("refs/for/master%draft");
     r.assertErrorStatus("cannot upload drafts");
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSectionParserIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSectionParserIT.java
index 09e498f..9fe1e71 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSectionParserIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSectionParserIT.java
@@ -32,7 +32,7 @@
   private static final String THIS_SERVER = "http://localhost/";
 
   @Test
-  public void testFollowMasterBranch() throws Exception {
+  public void followMasterBranch() throws Exception {
     Project.NameKey p = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -54,7 +54,7 @@
   }
 
   @Test
-  public void testFollowMatchingBranch() throws Exception {
+  public void followMatchingBranch() throws Exception {
     Project.NameKey p = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -89,7 +89,7 @@
   }
 
   @Test
-  public void testFollowAnotherBranch() throws Exception {
+  public void followAnotherBranch() throws Exception {
     Project.NameKey p = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -112,7 +112,7 @@
   }
 
   @Test
-  public void testWithAnotherURI() throws Exception {
+  public void withAnotherURI() throws Exception {
     Project.NameKey p = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -135,7 +135,7 @@
   }
 
   @Test
-  public void testWithSlashesInProjectName() throws Exception {
+  public void withSlashesInProjectName() throws Exception {
     Project.NameKey p = createProject("project/with/slashes/a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -158,7 +158,7 @@
   }
 
   @Test
-  public void testWithSlashesInPath() throws Exception {
+  public void withSlashesInPath() throws Exception {
     Project.NameKey p = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -181,7 +181,7 @@
   }
 
   @Test
-  public void testWithMoreSections() throws Exception {
+  public void withMoreSections() throws Exception {
     Project.NameKey p1 = createProject("a");
     Project.NameKey p2 = createProject("b");
     Config cfg = new Config();
@@ -211,7 +211,7 @@
   }
 
   @Test
-  public void testWithSubProjectFound() throws Exception {
+  public void withSubProjectFound() throws Exception {
     Project.NameKey p1 = createProject("a/b");
     Project.NameKey p2 = createProject("b");
     Config cfg = new Config();
@@ -241,7 +241,7 @@
   }
 
   @Test
-  public void testWithAnInvalidSection() throws Exception {
+  public void withAnInvalidSection() throws Exception {
     Project.NameKey p1 = createProject("a");
     Project.NameKey p2 = createProject("b");
     Project.NameKey p3 = createProject("d");
@@ -285,7 +285,7 @@
   }
 
   @Test
-  public void testWithSectionOfNonexistingProject() throws Exception {
+  public void withSectionOfNonexistingProject() throws Exception {
     Config cfg = new Config();
     cfg.fromText("\n"
         + "[submodule \"a\"]\n"
@@ -304,7 +304,7 @@
   }
 
   @Test
-  public void testWithSectionToOtherServer() throws Exception {
+  public void withSectionToOtherServer() throws Exception {
     Project.NameKey p1 = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -323,7 +323,7 @@
   }
 
   @Test
-  public void testWithRelativeURI() throws Exception {
+  public void withRelativeURI() throws Exception {
     Project.NameKey p1 = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -346,7 +346,7 @@
   }
 
   @Test
-  public void testWithDeepRelativeURI() throws Exception {
+  public void withDeepRelativeURI() throws Exception {
     Project.NameKey p1 = createProject("a");
     Config cfg = new Config();
     cfg.fromText(""
@@ -369,7 +369,7 @@
   }
 
   @Test
-  public void testWithOverlyDeepRelativeURI() throws Exception {
+  public void withOverlyDeepRelativeURI() throws Exception {
     Project.NameKey p1 = createProject("nested/a");
     Config cfg = new Config();
     cfg.fromText(""
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java
index 6684e85..3b4aa22 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsIT.java
@@ -55,7 +55,7 @@
   }
 
   @Test
-  public void testSubscriptionWithoutSpecificSubscription() throws Exception {
+  public void subscriptionWithoutSpecificSubscription() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
 
@@ -67,7 +67,7 @@
   }
 
   @Test
-  public void testSubscriptionToEmptyRepo() throws Exception {
+  public void subscriptionToEmptyRepo() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -84,7 +84,7 @@
   }
 
   @Test
-  public void testSubscriptionToExistingRepo() throws Exception {
+  public void subscriptionToExistingRepo() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -101,7 +101,7 @@
   }
 
   @Test
-  public void testSubscriptionWildcardACLForSingleBranch() throws Exception {
+  public void subscriptionWildcardACLForSingleBranch() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     // master is allowed to be subscribed to master branch only:
@@ -125,7 +125,7 @@
   }
 
   @Test
-  public void testSubscriptionWildcardACLForMissingProject() throws Exception {
+  public void subscriptionWildcardACLForMissingProject() throws Exception {
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/*",
         "not-existing-super-project", "refs/heads/*");
@@ -133,7 +133,7 @@
   }
 
   @Test
-  public void testSubscriptionWildcardACLForMissingBranch() throws Exception {
+  public void subscriptionWildcardACLForMissingBranch() throws Exception {
     createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/*",
@@ -142,7 +142,7 @@
   }
 
   @Test
-  public void testSubscriptionWildcardACLForMissingGitmodules() throws Exception {
+  public void subscriptionWildcardACLForMissingGitmodules() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/*",
@@ -152,7 +152,7 @@
   }
 
   @Test
-  public void testSubscriptionWildcardACLOneOnOneMapping() throws Exception {
+  public void subscriptionWildcardACLOneOnOneMapping() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     // any branch is allowed to be subscribed to the same superprojects branch:
@@ -189,7 +189,7 @@
   }
 
   @Test
-  public void testSubscriptionWildcardACLForManyBranches() throws Exception {
+  public void subscriptionWildcardACLForManyBranches() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
 
@@ -206,7 +206,7 @@
   }
 
   @Test
-  public void testSubscriptionWildcardACLOneToManyBranches() throws Exception {
+  public void subscriptionWildcardACLOneToManyBranches() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
 
@@ -286,7 +286,7 @@
   }
 
   @Test
-  public void testSubmoduleCommitMessage() throws Exception {
+  public void submoduleCommitMessage() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -314,7 +314,7 @@
   }
 
   @Test
-  public void testSubscriptionUnsubscribe() throws Exception {
+  public void subscriptionUnsubscribe() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -340,7 +340,7 @@
   }
 
   @Test
-  public void testSubscriptionUnsubscribeByDeletingGitModules()
+  public void subscriptionUnsubscribeByDeletingGitModules()
       throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
@@ -367,7 +367,7 @@
   }
 
   @Test
-  public void testSubscriptionToDifferentBranches() throws Exception {
+  public void subscriptionToDifferentBranches() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/foo",
@@ -383,7 +383,7 @@
   }
 
   @Test
-  public void testBranchCircularSubscription() throws Exception {
+  public void branchCircularSubscription() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -407,7 +407,7 @@
   }
 
   @Test
-  public void testProjectCircularSubscription() throws Exception {
+  public void projectCircularSubscription() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
 
@@ -439,7 +439,7 @@
   }
 
   @Test
-  public void testSubscriptionFailOnMissingACL() throws Exception {
+  public void subscriptionFailOnMissingACL() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
 
@@ -452,7 +452,7 @@
   }
 
   @Test
-  public void testSubscriptionFailOnWrongProjectACL() throws Exception {
+  public void subscriptionFailOnWrongProjectACL() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -467,7 +467,7 @@
   }
 
   @Test
-  public void testSubscriptionFailOnWrongBranchACL() throws Exception {
+  public void subscriptionFailOnWrongBranchACL() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -482,7 +482,7 @@
   }
 
   @Test
-  public void testSubscriptionInheritACL() throws Exception {
+  public void subscriptionInheritACL() throws Exception {
     createProjectWithPush("config-repo");
     createProjectWithPush("config-repo2",
         new Project.NameKey(name("config-repo")));
@@ -501,7 +501,7 @@
   }
 
   @Test
-  public void testAllowedButNotSubscribed() throws Exception {
+  public void allowedButNotSubscribed() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -526,7 +526,7 @@
   }
 
   @Test
-  public void testSubscriptionDeepRelative() throws Exception {
+  public void subscriptionDeepRelative() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush(
         "nested/subscribed-to-project");
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
index 8283dba..045ed07 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/git/SubmoduleSubscriptionsWholeTopicMergeIT.java
@@ -67,7 +67,7 @@
   }
 
   @Test
-  public void testSubscriptionUpdateOfManyChanges() throws Exception {
+  public void subscriptionUpdateOfManyChanges() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
     allowMatchingSubmoduleSubscription("subscribed-to-project", "refs/heads/master",
@@ -149,7 +149,7 @@
   }
 
   @Test
-  public void testSubscriptionUpdateIncludingChangeInSuperproject()
+  public void subscriptionUpdateIncludingChangeInSuperproject()
       throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
@@ -216,7 +216,7 @@
   }
 
   @Test
-  public void testUpdateManySubmodules() throws Exception {
+  public void updateManySubmodules() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> sub1 = createProjectWithPush("sub1");
     TestRepository<?> sub2 = createProjectWithPush("sub2");
@@ -264,7 +264,7 @@
   }
 
   @Test
-  public void testDoNotUseFastForward() throws Exception {
+  public void doNotUseFastForward() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project", false);
     TestRepository<?> sub = createProjectWithPush("sub", false);
 
@@ -292,7 +292,7 @@
   }
 
   @Test
-  public void testUseFastForwardWhenNoSubmodule() throws Exception {
+  public void useFastForwardWhenNoSubmodule() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project", false);
     TestRepository<?> sub = createProjectWithPush("sub", false);
 
@@ -314,7 +314,7 @@
   }
 
   @Test
-  public void testSameProjectSameBranchDifferentPaths() throws Exception {
+  public void sameProjectSameBranchDifferentPaths() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> sub = createProjectWithPush("sub");
 
@@ -347,7 +347,7 @@
   }
 
   @Test
-  public void testSameProjectDifferentBranchDifferentPaths() throws Exception {
+  public void sameProjectDifferentBranchDifferentPaths() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> sub = createProjectWithPush("sub");
 
@@ -391,7 +391,7 @@
   }
 
   @Test
-  public void testNonSubmoduleInSameTopic() throws Exception {
+  public void nonSubmoduleInSameTopic() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> sub = createProjectWithPush("sub");
     TestRepository<?> standAlone = createProjectWithPush("standalone");
@@ -431,7 +431,7 @@
   }
 
   @Test
-  public void testRecursiveSubmodules() throws Exception {
+  public void recursiveSubmodules() throws Exception {
     TestRepository<?> topRepo = createProjectWithPush("top-project");
     TestRepository<?> midRepo = createProjectWithPush("mid-project");
     TestRepository<?> bottomRepo = createProjectWithPush("bottom-project");
@@ -465,7 +465,7 @@
   }
 
   @Test
-  public void testTriangleSubmodules() throws Exception {
+  public void triangleSubmodules() throws Exception {
     TestRepository<?> topRepo = createProjectWithPush("top-project");
     TestRepository<?> midRepo = createProjectWithPush("mid-project");
     TestRepository<?> bottomRepo = createProjectWithPush("bottom-project");
@@ -535,19 +535,19 @@
   }
 
   @Test
-  public void testBranchCircularSubscription() throws Exception {
+  public void branchCircularSubscription() throws Exception {
     String changeId = prepareBranchCircularSubscription();
     gApi.changes().id(changeId).current().submit();
   }
 
   @Test
-  public void testBranchCircularSubscriptionPreview() throws Exception {
+  public void branchCircularSubscriptionPreview() throws Exception {
     String changeId = prepareBranchCircularSubscription();
     gApi.changes().id(changeId).current().submitPreview();
   }
 
   @Test
-  public void testProjectCircularSubscriptionWholeTopic() throws Exception {
+  public void projectCircularSubscriptionWholeTopic() throws Exception {
     TestRepository<?> superRepo = createProjectWithPush("super-project");
     TestRepository<?> subRepo = createProjectWithPush("subscribed-to-project");
 
@@ -585,7 +585,7 @@
   }
 
   @Test
-  public void testProjectNoSubscriptionWholeTopic() throws Exception {
+  public void projectNoSubscriptionWholeTopic() throws Exception {
     TestRepository<?> repoA = createProjectWithPush("project-a");
     TestRepository<?> repoB = createProjectWithPush("project-b");
     // bootstrap the dev branch
@@ -637,7 +637,7 @@
   }
 
   @Test
-  public void testTwoProjectsMultipleBranchesWholeTopic() throws Exception {
+  public void twoProjectsMultipleBranchesWholeTopic() throws Exception {
     TestRepository<?> repoA = createProjectWithPush("project-a");
     TestRepository<?> repoB = createProjectWithPush("project-b");
     // bootstrap the dev branch
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD
index 56cecb8..f405e19 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/pgm/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'pgm',
-  srcs = glob(['*IT.java']),
-  labels = ['pgm'],
+    srcs = glob(["*IT.java"]),
+    group = "pgm",
+    labels = ["pgm"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD
index d0339df..ea59d61 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/BUILD
@@ -1,24 +1,24 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'rest_account',
-  srcs = glob(['*IT.java']),
-  deps = [':util'],
-  labels = ['rest']
+    srcs = glob(["*IT.java"]),
+    group = "rest_account",
+    labels = ["rest"],
+    deps = [":util"],
 )
 
 java_library(
-  name = 'util',
-  srcs = [
-    'AccountAssert.java',
-    'CapabilityInfo.java',
-  ],
-  deps = [
-    '//gerrit-acceptance-tests:lib',
-    '//gerrit-reviewdb:server',
-    '//lib:gwtorm',
-    '//lib:junit',
-  ],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "util",
+    testonly = 1,
+    srcs = [
+        "AccountAssert.java",
+        "CapabilityInfo.java",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-acceptance-tests:lib",
+        "//gerrit-reviewdb:server",
+        "//lib:gwtorm",
+        "//lib:junit",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java
index 116a3ac..329bf88 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/account/CapabilitiesIT.java
@@ -38,7 +38,7 @@
 public class CapabilitiesIT extends AbstractDaemonTest {
 
   @Test
-  public void testCapabilitiesUser() throws Exception {
+  public void capabilitiesUser() throws Exception {
     Iterable<String> all = Iterables.filter(
         GlobalCapability.getAllNames(),
         c -> !ADMINISTRATE_SERVER.equals(c) && !PRIORITY.equals(c));
@@ -72,7 +72,7 @@
   }
 
   @Test
-  public void testCapabilitiesAdmin() throws Exception {
+  public void capabilitiesAdmin() throws Exception {
     RestResponse r =
         adminRestSession.get("/accounts/self/capabilities");
     r.assertOK();
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AssigneeIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AssigneeIT.java
index 822e48b..af64a32 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AssigneeIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/AssigneeIT.java
@@ -49,13 +49,13 @@
   }
 
   @Test
-  public void testGetNoAssignee() throws Exception {
+  public void getNoAssignee() throws Exception {
     PushOneCommit.Result r = createChange();
     assertThat(getAssignee(r)).isNull();
   }
 
   @Test
-  public void testAddGetAssignee() throws Exception {
+  public void addGetAssignee() throws Exception {
     PushOneCommit.Result r = createChange();
     assertThat(setAssignee(r, user.email)._accountId)
         .isEqualTo(user.getId().get());
@@ -67,7 +67,7 @@
   }
 
   @Test
-  public void testSetNewAssigneeWhenExists() throws Exception {
+  public void setNewAssigneeWhenExists() throws Exception {
     PushOneCommit.Result r = createChange();
     setAssignee(r, user.email);
     assertThat(setAssignee(r, user.email)._accountId)
@@ -75,7 +75,7 @@
   }
 
   @Test
-  public void testGetPastAssignees() throws Exception {
+  public void getPastAssignees() throws Exception {
     assume().that(notesMigration.readChanges()).isTrue();
     PushOneCommit.Result r = createChange();
     setAssignee(r, user.email);
@@ -88,7 +88,7 @@
   }
 
   @Test
-  public void testAssigneeAddedAsReviewer() throws Exception {
+  public void assigneeAddedAsReviewer() throws Exception {
     ReviewerState state;
     // Assignee is added as CC, if back-end is reviewDb (that does not support
     // CC) CC is stored as REVIEWER
@@ -109,7 +109,7 @@
   }
 
   @Test
-  public void testSetAlreadyExistingAssignee() throws Exception {
+  public void setAlreadyExistingAssignee() throws Exception {
     PushOneCommit.Result r = createChange();
     setAssignee(r, user.email);
     assertThat(setAssignee(r, user.email)._accountId)
@@ -117,7 +117,7 @@
   }
 
   @Test
-  public void testDeleteAssignee() throws Exception {
+  public void deleteAssignee() throws Exception {
     PushOneCommit.Result r = createChange();
     assertThat(setAssignee(r, user.email)._accountId)
         .isEqualTo(user.getId().get());
@@ -126,7 +126,7 @@
   }
 
   @Test
-  public void testDeleteAssigneeWhenNoAssignee() throws Exception {
+  public void deleteAssigneeWhenNoAssignee() throws Exception {
     PushOneCommit.Result r = createChange();
     assertThat(deleteAssignee(r)).isNull();
   }
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD
index d4d54b6..b7ed2e8 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/BUILD
@@ -1,33 +1,38 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
-SUBMIT_UTIL_SRCS = glob(['AbstractSubmit*.java'])
-SUBMIT_TESTS = glob(['Submit*IT.java'])
-OTHER_TESTS = glob(['*IT.java'], exclude = SUBMIT_TESTS)
+SUBMIT_UTIL_SRCS = glob(["AbstractSubmit*.java"])
 
-acceptance_tests(
-  group = 'rest_change_other',
-  srcs = OTHER_TESTS,
-  deps = [
-    ':submit_util',
-    '//lib/joda:joda-time',
-  ],
-  labels = ['rest'],
+SUBMIT_TESTS = glob(["Submit*IT.java"])
+
+OTHER_TESTS = glob(
+    ["*IT.java"],
+    exclude = SUBMIT_TESTS,
 )
 
 acceptance_tests(
-  group = 'rest_change_submit',
-  srcs = SUBMIT_TESTS,
-  deps = [
-    ':submit_util',
-  ],
-  labels = ['rest'],
+    srcs = OTHER_TESTS,
+    group = "rest_change_other",
+    labels = ["rest"],
+    deps = [
+        ":submit_util",
+        "//lib/joda:joda-time",
+    ],
+)
+
+acceptance_tests(
+    srcs = SUBMIT_TESTS,
+    group = "rest_change_submit",
+    labels = ["rest"],
+    deps = [
+        ":submit_util",
+    ],
 )
 
 java_library(
-  name = 'submit_util',
-  srcs = SUBMIT_UTIL_SRCS,
-  deps = [
-    '//gerrit-acceptance-tests:lib',
-  ],
-  testonly = 1,
+    name = "submit_util",
+    testonly = 1,
+    srcs = SUBMIT_UTIL_SRCS,
+    deps = [
+        "//gerrit-acceptance-tests:lib",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
index 0c53658..9997ee6 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/HashtagsIT.java
@@ -52,14 +52,14 @@
   }
 
   @Test
-  public void testGetNoHashtags() throws Exception {
+  public void getNoHashtags() throws Exception {
     // Get on a change with no hashtags returns an empty list.
     PushOneCommit.Result r = createChange();
     assertThatGet(r).isEmpty();
   }
 
   @Test
-  public void testAddSingleHashtag() throws Exception {
+  public void addSingleHashtag() throws Exception {
     PushOneCommit.Result r = createChange();
 
     // Adding a single hashtag returns a single hashtag.
@@ -75,7 +75,7 @@
   }
 
   @Test
-  public void testAddMultipleHashtags() throws Exception {
+  public void addMultipleHashtags() throws Exception {
     PushOneCommit.Result r = createChange();
 
     // Adding multiple hashtags returns a sorted list of hashtags.
@@ -91,7 +91,7 @@
   }
 
   @Test
-  public void testAddAlreadyExistingHashtag() throws Exception {
+  public void addAlreadyExistingHashtag() throws Exception {
     // Adding a hashtag that already exists on the change returns a sorted list
     // of hashtags without duplicates.
     PushOneCommit.Result r = createChange();
@@ -110,7 +110,7 @@
   }
 
   @Test
-  public void testHashtagsWithPrefix() throws Exception {
+  public void hashtagsWithPrefix() throws Exception {
     PushOneCommit.Result r = createChange();
 
     // Leading # is stripped from added tag.
@@ -150,7 +150,7 @@
   }
 
   @Test
-  public void testRemoveSingleHashtag() throws Exception {
+  public void removeSingleHashtag() throws Exception {
     // Removing a single tag from a change that only has that tag returns an
     // empty list.
     PushOneCommit.Result r = createChange();
@@ -169,7 +169,7 @@
   }
 
   @Test
-  public void testRemoveMultipleHashtags() throws Exception {
+  public void removeMultipleHashtags() throws Exception {
     // Removing multiple tags from a change that only has those tags returns an
     // empty list.
     PushOneCommit.Result r = createChange();
@@ -189,7 +189,7 @@
   }
 
   @Test
-  public void testRemoveNotExistingHashtag() throws Exception {
+  public void removeNotExistingHashtag() throws Exception {
     // Removing a single hashtag from change that has no hashtags returns an
     // empty list.
     PushOneCommit.Result r = createChange();
@@ -216,7 +216,7 @@
   }
 
   @Test
-  public void testAddAndRemove() throws Exception {
+  public void addAndRemove() throws Exception {
     // Adding and remove hashtags in a single request performs correctly.
     PushOneCommit.Result r = createChange();
     addHashtags(r, "tag1", "tag2");
@@ -238,7 +238,7 @@
   }
 
   @Test
-  public void testHashtagWithMixedCase() throws Exception {
+  public void hashtagWithMixedCase() throws Exception {
     PushOneCommit.Result r = createChange();
     addHashtags(r, "MyHashtag");
     assertThatGet(r).containsExactly("MyHashtag");
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
index e160374..440cd01 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/change/SubmitByMergeIfNecessaryIT.java
@@ -401,7 +401,7 @@
   }
 
   @Test
-  public void testGerritWorkflow() throws Exception {
+  public void gerritWorkflow() throws Exception {
     RevCommit initialHead = getRemoteHead();
 
     // We'll setup a master and a stable branch.
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/BUILD
index b9d3ffb..6becf0f 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/config/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'rest_config',
-  srcs = glob(['*IT.java']),
-  labels = ['rest']
+    srcs = glob(["*IT.java"]),
+    group = "rest_config",
+    labels = ["rest"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/BUILD
index d9a400c..b3672ee 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/group/BUILD
@@ -1,8 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'rest_group',
-  srcs = glob(['*IT.java']),
-  labels = ['rest']
+    srcs = glob(["*IT.java"]),
+    group = "rest_group",
+    labels = ["rest"],
 )
-
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD
index fbb6bde..3266be8 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/BUILD
@@ -1,37 +1,37 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'rest_project',
-  srcs = glob(['*IT.java']),
-  deps = [
-    ':project',
-    ':refassert',
-  ],
-  labels = ['rest'],
+    srcs = glob(["*IT.java"]),
+    group = "rest_project",
+    labels = ["rest"],
+    deps = [
+        ":project",
+        ":refassert",
+    ],
 )
 
 java_library(
-  name = 'refassert',
-  srcs = [
-    'RefAssert.java',
-  ],
-  deps = [
-    '//lib:truth',
-    '//gerrit-extension-api:api',
-    '//gerrit-server:server',
-  ],
+    name = "refassert",
+    srcs = [
+        "RefAssert.java",
+    ],
+    deps = [
+        "//gerrit-extension-api:api",
+        "//gerrit-server:server",
+        "//lib:truth",
+    ],
 )
 
 java_library(
-  name = 'project',
-  srcs = [
-    'ProjectAssert.java',
-  ],
-  deps = [
-    '//gerrit-extension-api:api',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:gwtorm',
-    '//lib:truth',
-  ],
+    name = "project",
+    srcs = [
+        "ProjectAssert.java",
+    ],
+    deps = [
+        "//gerrit-extension-api:api",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//lib:gwtorm",
+        "//lib:truth",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java
index b8a0e4b..767207a 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/CreateProjectIT.java
@@ -52,7 +52,7 @@
 
 public class CreateProjectIT extends AbstractDaemonTest {
   @Test
-  public void testCreateProjectHttp() throws Exception {
+  public void createProjectHttp() throws Exception {
     String newProjectName = name("newProject");
     RestResponse r = adminRestSession.put("/projects/" + newProjectName);
     r.assertCreated();
@@ -65,7 +65,7 @@
   }
 
   @Test
-  public void testCreateProjectHttpWhenProjectAlreadyExists_Conflict()
+  public void createProjectHttpWhenProjectAlreadyExists_Conflict()
       throws Exception {
     adminRestSession
         .put("/projects/" + allProjects.get())
@@ -73,7 +73,7 @@
   }
 
   @Test
-  public void testCreateProjectHttpWhenProjectAlreadyExists_PreconditionFailed()
+  public void createProjectHttpWhenProjectAlreadyExists_PreconditionFailed()
       throws Exception {
     adminRestSession
         .putWithHeader("/projects/" + allProjects.get(),
@@ -91,7 +91,7 @@
   }
 
   @Test
-  public void testCreateProjectHttpWithNameMismatch_BadRequest() throws Exception {
+  public void createProjectHttpWithNameMismatch_BadRequest() throws Exception {
     ProjectInput in = new ProjectInput();
     in.name = name("otherName");
     adminRestSession
@@ -100,7 +100,7 @@
   }
 
   @Test
-  public void testCreateProjectHttpWithInvalidRefName_BadRequest()
+  public void createProjectHttpWithInvalidRefName_BadRequest()
       throws Exception {
     ProjectInput in = new ProjectInput();
     in.branches = Collections.singletonList(name("invalid ref name"));
@@ -110,7 +110,7 @@
   }
 
   @Test
-  public void testCreateProject() throws Exception {
+  public void createProject() throws Exception {
     String newProjectName = name("newProject");
     ProjectInfo p = gApi.projects().create(newProjectName).get();
     assertThat(p.name).isEqualTo(newProjectName);
@@ -121,7 +121,7 @@
   }
 
   @Test
-  public void testCreateProjectWithGitSuffix() throws Exception {
+  public void createProjectWithGitSuffix() throws Exception {
     String newProjectName = name("newProject");
     ProjectInfo p = gApi.projects().create(newProjectName + ".git").get();
     assertThat(p.name).isEqualTo(newProjectName);
@@ -132,7 +132,7 @@
   }
 
   @Test
-  public void testCreateProjectWithProperties() throws Exception {
+  public void createProjectWithProperties() throws Exception {
     String newProjectName = name("newProject");
     ProjectInput in = new ProjectInput();
     in.name = newProjectName;
@@ -155,7 +155,7 @@
   }
 
   @Test
-  public void testCreateChildProject() throws Exception {
+  public void createChildProject() throws Exception {
     String parentName = name("parent");
     ProjectInput in = new ProjectInput();
     in.name = parentName;
@@ -171,7 +171,7 @@
   }
 
   @Test
-  public void testCreateChildProjectUnderNonExistingParent_UnprocessableEntity()
+  public void createChildProjectUnderNonExistingParent_UnprocessableEntity()
       throws Exception {
     ProjectInput in = new ProjectInput();
     in.name = name("newProjectName");
@@ -180,7 +180,7 @@
   }
 
   @Test
-  public void testCreateProjectWithOwner() throws Exception {
+  public void createProjectWithOwner() throws Exception {
     String newProjectName = name("newProject");
     ProjectInput in = new ProjectInput();
     in.name = newProjectName;
@@ -199,7 +199,7 @@
   }
 
   @Test
-  public void testCreateProjectWithNonExistingOwner_UnprocessableEntity()
+  public void createProjectWithNonExistingOwner_UnprocessableEntity()
       throws Exception {
     ProjectInput in = new ProjectInput();
     in.name = name("newProjectName");
@@ -208,7 +208,7 @@
   }
 
   @Test
-  public void testCreatePermissionOnlyProject() throws Exception {
+  public void createPermissionOnlyProject() throws Exception {
     String newProjectName = name("newProject");
     ProjectInput in = new ProjectInput();
     in.name = newProjectName;
@@ -218,7 +218,7 @@
   }
 
   @Test
-  public void testCreateProjectWithEmptyCommit() throws Exception {
+  public void createProjectWithEmptyCommit() throws Exception {
     String newProjectName = name("newProject");
     ProjectInput in = new ProjectInput();
     in.name = newProjectName;
@@ -228,7 +228,7 @@
   }
 
   @Test
-  public void testCreateProjectWithBranches() throws Exception {
+  public void createProjectWithBranches() throws Exception {
     String newProjectName = name("newProject");
     ProjectInput in = new ProjectInput();
     in.name = newProjectName;
@@ -244,7 +244,7 @@
   }
 
   @Test
-  public void testCreateProjectWithoutCapability_Forbidden() throws Exception {
+  public void createProjectWithoutCapability_Forbidden() throws Exception {
     setApiUser(user);
     ProjectInput in = new ProjectInput();
     in.name = name("newProject");
@@ -252,7 +252,7 @@
   }
 
   @Test
-  public void testCreateProjectWhenProjectAlreadyExists_Conflict()
+  public void createProjectWhenProjectAlreadyExists_Conflict()
       throws Exception {
     ProjectInput in = new ProjectInput();
     in.name = allProjects.get();
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java
index 8522a4d..4667cc6 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/rest/project/GarbageCollectionIT.java
@@ -37,12 +37,12 @@
   }
 
   @Test
-  public void testGcNonExistingProject_NotFound() throws Exception {
+  public void gcNonExistingProject_NotFound() throws Exception {
     POST("/projects/non-existing/gc").assertNotFound();
   }
 
   @Test
-  public void testGcNotAllowed_Forbidden() throws Exception {
+  public void gcNotAllowed_Forbidden() throws Exception {
     userRestSession
         .post("/projects/" + allProjects.get() + "/gc")
         .assertForbidden();
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/BUILD
index a5e6d36..ac32b02 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'server_change',
-  srcs = glob(['*IT.java']),
-  labels = ['server'],
+    srcs = glob(["*IT.java"]),
+    group = "server_change",
+    labels = ["server"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/SubmittedTogetherIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/SubmittedTogetherIT.java
index b843721..257b92f 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/SubmittedTogetherIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/change/SubmittedTogetherIT.java
@@ -300,7 +300,7 @@
   }
 
   @Test
-  public void testTopicChaining() throws Exception {
+  public void topicChaining() throws Exception {
     RevCommit initialHead = getRemoteHead();
     // Create two independent commits and push.
     RevCommit c1_1 = commitBuilder()
@@ -337,7 +337,7 @@
   }
 
   @Test
-  public void testNewBranchTwoChangesTogether() throws Exception {
+  public void newBranchTwoChangesTogether() throws Exception {
     Project.NameKey p1 = createProject("a-new-project", null, false);
     TestRepository<?> repo1 = cloneProject(p1);
 
@@ -379,7 +379,7 @@
   }
 
   @Test
-  public void testSubmissionIdSavedOnMergeInOneProject() throws Exception {
+  public void submissionIdSavedOnMergeInOneProject() throws Exception {
     // Create two commits and push.
     RevCommit c1_1 = commitBuilder()
         .add("a.txt", "1")
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/event/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/event/BUILD
index ff0c51b..3804bea 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/event/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/event/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'server_event',
-  srcs = glob(['*IT.java']),
-  labels = ['server'],
+    srcs = glob(["*IT.java"]),
+    group = "server_event",
+    labels = ["server"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java
index a5f38dc..e84af74 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/mail/MailIT.java
@@ -78,7 +78,7 @@
   }
 
   @Test
-  public void testDelete() throws Exception {
+  public void delete() throws Exception {
     GreenMailUser user = mockPop3Server.setUser(USERNAME, USERNAME, PASSWORD);
     user.deliver(createSimpleMessage());
     assertThat(mockPop3Server.getReceivedMessages().length).isEqualTo(1);
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/BUILD
index 17c4cdc..d314f16 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/notedb/BUILD
@@ -1,7 +1,10 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'server_notedb',
-  srcs = glob(['*IT.java']),
-  labels = ['notedb', 'server'],
+    srcs = glob(["*IT.java"]),
+    group = "server_notedb",
+    labels = [
+        "notedb",
+        "server",
+    ],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/BUILD
index 458b5eb..622caf7 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/server/project/BUILD
@@ -1,7 +1,7 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'server_project',
-  srcs = glob(['*IT.java']),
-  labels = ['server'],
+    srcs = glob(["*IT.java"]),
+    group = "server_project",
+    labels = ["server"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD
index 3c91aa1..91d8d71 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/BUILD
@@ -1,8 +1,8 @@
-load('//gerrit-acceptance-tests:tests.bzl', 'acceptance_tests')
+load("//gerrit-acceptance-tests:tests.bzl", "acceptance_tests")
 
 acceptance_tests(
-  group = 'ssh',
-  srcs = glob(['*IT.java']),
-  deps = ['//lib/commons:compress'],
-  labels = ['ssh'],
+    srcs = glob(["*IT.java"]),
+    group = "ssh",
+    labels = ["ssh"],
+    deps = ["//lib/commons:compress"],
 )
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java
index 7176254..7864cf6 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/GarbageCollectionIT.java
@@ -78,7 +78,7 @@
   }
 
   @Test
-  public void testGcWithoutCapability_Error() throws Exception {
+  public void gcWithoutCapability_Error() throws Exception {
     userSshSession.exec("gerrit gc --all");
     assertThat(userSshSession.hasError()).isTrue();
     String error = userSshSession.getError();
diff --git a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java
index 2865ff87..5c8d166 100644
--- a/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java
+++ b/gerrit-acceptance-tests/src/test/java/com/google/gerrit/acceptance/ssh/QueryIT.java
@@ -41,7 +41,7 @@
   private static Gson gson = new Gson();
 
   @Test
-  public void testBasicQueryJSON() throws Exception {
+  public void basicQueryJSON() throws Exception {
     String changeId1 = createChange().getChangeId();
     String changeId2 = createChange().getChangeId();
 
@@ -68,7 +68,7 @@
   }
 
   @Test
-  public void testAllApprovalsOptionJSON() throws Exception {
+  public void allApprovalsOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     gApi.changes().id(changeId).current().review(ReviewInput.approve());
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
@@ -83,7 +83,7 @@
   }
 
   @Test
-  public void testAllReviewersOptionJSON() throws Exception {
+  public void allReviewersOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     AddReviewerInput in = new AddReviewerInput();
     in.reviewer = user.email;
@@ -100,7 +100,7 @@
   }
 
   @Test
-  public void testCommitMessageOptionJSON() throws Exception {
+  public void commitMessageOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     List<ChangeAttribute> changes =
         executeSuccessfulQuery("--commit-message " + changeId);
@@ -110,7 +110,7 @@
   }
 
   @Test
-  public void testCurrentPatchSetOptionJSON() throws Exception {
+  public void currentPatchSetOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     amendChange(changeId);
 
@@ -133,7 +133,7 @@
   }
 
   @Test
-  public void testPatchSetsOptionJSON() throws Exception {
+  public void patchSetsOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     amendChange(changeId);
     amendChange(changeId);
@@ -159,7 +159,7 @@
   }
 
   @Test
-  public void testFileOptionJSON() throws Exception {
+  public void fileOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
 
     List<ChangeAttribute> changes =
@@ -185,7 +185,7 @@
   }
 
   @Test
-  public void testCommentOptionJSON() throws Exception {
+  public void commentOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
 
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
@@ -199,7 +199,7 @@
   }
 
   @Test
-  public void testCommentOptionsInCurrentPatchSetJSON() throws Exception {
+  public void commentOptionsInCurrentPatchSetJSON() throws Exception {
     String changeId = createChange().getChangeId();
 
     ReviewInput review = new ReviewInput();
@@ -224,7 +224,7 @@
   }
 
   @Test
-  public void testCommentOptionInPatchSetsJSON() throws Exception {
+  public void commentOptionInPatchSetsJSON() throws Exception {
     String changeId = createChange().getChangeId();
 
     ReviewInput review = new ReviewInput();
@@ -268,7 +268,7 @@
   }
 
   @Test
-  public void testDependenciesOptionJSON() throws Exception {
+  public void dependenciesOptionJSON() throws Exception {
     String changeId1 = createChange().getChangeId();
     String changeId2 = createChange().getChangeId();
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId1);
@@ -290,7 +290,7 @@
   }
 
   @Test
-  public void testSubmitRecordsOptionJSON() throws Exception {
+  public void submitRecordsOptionJSON() throws Exception {
     String changeId = createChange().getChangeId();
     List<ChangeAttribute> changes = executeSuccessfulQuery(changeId);
     assertThat(changes.size()).isEqualTo(1);
@@ -303,7 +303,7 @@
   }
 
   @Test
-  public void testQueryWithNonVisibleCurrentPatchSet() throws Exception {
+  public void queryWithNonVisibleCurrentPatchSet() throws Exception {
     String changeId = createChange().getChangeId();
     amendChangeAsDraft(changeId);
     String query = "--current-patch-set --patch-sets " + changeId;
diff --git a/gerrit-antlr/BUILD b/gerrit-antlr/BUILD
index 6eedccf..8337152 100644
--- a/gerrit-antlr/BUILD
+++ b/gerrit-antlr/BUILD
@@ -1,32 +1,32 @@
-load('//tools/bzl:genrule2.bzl', 'genrule2')
+load("//tools/bzl:genrule2.bzl", "genrule2")
 
 java_library(
-  name = 'query_exception',
-  srcs = ['src/main/java/com/google/gerrit/server/query/QueryParseException.java'],
-  visibility = ['//visibility:public'],
+    name = "query_exception",
+    srcs = ["src/main/java/com/google/gerrit/server/query/QueryParseException.java"],
+    visibility = ["//visibility:public"],
 )
 
 genrule2(
-  name = 'query_antlr',
-  srcs = ['src/main/antlr3/com/google/gerrit/server/query/Query.g'],
-  cmd = ' && '.join([
-    '$(location //lib/antlr:antlr-tool) -o $$TMP $<',
-    'cd $$TMP',
-    '$$ROOT/$(location @bazel_tools//tools/zip:zipper) cC $$ROOT/$@ $$(find .)'
-  ]),
-  tools = [
-    '@bazel_tools//tools/zip:zipper',
-    '//lib/antlr:antlr-tool',
-  ],
-  outs = [ 'query_antlr.srcjar' ],
+    name = "query_antlr",
+    srcs = ["src/main/antlr3/com/google/gerrit/server/query/Query.g"],
+    outs = ["query_antlr.srcjar"],
+    cmd = " && ".join([
+        "$(location //lib/antlr:antlr-tool) -o $$TMP $<",
+        "cd $$TMP",
+        "$$ROOT/$(location @bazel_tools//tools/zip:zipper) cC $$ROOT/$@ $$(find .)",
+    ]),
+    tools = [
+        "//lib/antlr:antlr-tool",
+        "@bazel_tools//tools/zip:zipper",
+    ],
 )
 
 java_library(
-  name = 'query_parser',
-  srcs = [':query_antlr'],
-  deps = [
-    ':query_exception',
-    '//lib/antlr:java_runtime',
-  ],
-  visibility = ['//visibility:public'],
+    name = "query_parser",
+    srcs = [":query_antlr"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":query_exception",
+        "//lib/antlr:java_runtime",
+    ],
 )
diff --git a/gerrit-cache-h2/BUILD b/gerrit-cache-h2/BUILD
index a70393d..45cf416 100644
--- a/gerrit-cache-h2/BUILD
+++ b/gerrit-cache-h2/BUILD
@@ -1,30 +1,30 @@
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 java_library(
-  name = 'cache-h2',
-  srcs = glob(['src/main/java/**/*.java']),
-  deps = [
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-server:server',
-    '//lib:guava',
-    '//lib:h2',
-    '//lib/guice:guice',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/log:api',
-  ],
-  visibility = ['//visibility:public'],
+    name = "cache-h2",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-server:server",
+        "//lib:guava",
+        "//lib:h2",
+        "//lib/guice",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+    ],
 )
 
 junit_tests(
-  name = 'tests',
-  srcs = glob(['src/test/java/**/*.java']),
-  deps = [
-    ':cache-h2',
-    '//gerrit-server:server',
-    '//lib:guava',
-    '//lib:h2',
-    '//lib/guice:guice',
-    '//lib:junit',
-  ],
+    name = "tests",
+    srcs = glob(["src/test/java/**/*.java"]),
+    deps = [
+        ":cache-h2",
+        "//gerrit-server:server",
+        "//lib:guava",
+        "//lib:h2",
+        "//lib:junit",
+        "//lib/guice",
+    ],
 )
diff --git a/gerrit-common/BUILD b/gerrit-common/BUILD
index 9add6e7..4389080 100644
--- a/gerrit-common/BUILD
+++ b/gerrit-common/BUILD
@@ -1,78 +1,86 @@
-load('//tools/bzl:gwt.bzl', 'gwt_module')
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:gwt.bzl", "gwt_module")
+load("//tools/bzl:junit.bzl", "junit_tests")
 
-SRC = 'src/main/java/com/google/gerrit/'
+SRC = "src/main/java/com/google/gerrit/"
 
 ANNOTATIONS = [
-  SRC + x for x in [
-    'common/Nullable.java',
-    'common/audit/Audit.java',
-    'common/auth/SignInRequired.java',
-  ]
+    SRC + x
+    for x in [
+        "common/Nullable.java",
+        "common/audit/Audit.java",
+        "common/auth/SignInRequired.java",
+    ]
 ]
 
 java_library(
-  name = 'annotations',
-  srcs = ANNOTATIONS,
-  visibility = ['//visibility:public'],
+    name = "annotations",
+    srcs = ANNOTATIONS,
+    visibility = ["//visibility:public"],
 )
 
 gwt_module(
-  name = 'client',
-  srcs = glob([SRC + 'common/**/*.java']),
-  gwt_xml = SRC + 'Common.gwt.xml',
-  exported_deps = [
-    '//gerrit-extension-api:api',
-    '//gerrit-prettify:client',
-    '//lib:guava',
-    '//lib:gwtorm_client',
-    '//lib:servlet-api-3_1',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/joda:joda-time',
-    '//lib/log:api',
-  ],
-  visibility = ['//visibility:public'],
+    name = "client",
+    srcs = glob([SRC + "common/**/*.java"]),
+    exported_deps = [
+        "//gerrit-extension-api:api",
+        "//gerrit-prettify:client",
+        "//lib:guava",
+        "//lib:gwtorm_client",
+        "//lib:servlet-api-3_1",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/joda:joda-time",
+        "//lib/log:api",
+    ],
+    gwt_xml = SRC + "Common.gwt.xml",
+    visibility = ["//visibility:public"],
 )
 
 java_library(
-  name = 'server',
-  srcs = glob([SRC + 'common/**/*.java'], exclude = ANNOTATIONS),
-  deps = [
-    ':annotations',
-    '//gerrit-extension-api:api',
-    '//gerrit-patch-jgit:server',
-    '//gerrit-prettify:server',
-    '//gerrit-reviewdb:server',
-    '//lib:guava',
-    '//lib:gwtjsonrpc',
-    '//lib:gwtorm',
-    '//lib:servlet-api-3_1',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/joda:joda-time',
-    '//lib/log:api',
-  ],
-  visibility = ['//visibility:public'],
+    name = "server",
+    srcs = glob(
+        [SRC + "common/**/*.java"],
+        exclude = ANNOTATIONS,
+    ),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":annotations",
+        "//gerrit-extension-api:api",
+        "//gerrit-patch-jgit:server",
+        "//gerrit-prettify:server",
+        "//gerrit-reviewdb:server",
+        "//lib:guava",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
+        "//lib:servlet-api-3_1",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/joda:joda-time",
+        "//lib/log:api",
+    ],
 )
 
-TEST = 'src/test/java/com/google/gerrit/common/'
-AUTO_VALUE_TEST_SRCS = [TEST + 'AutoValueTest.java']
+TEST = "src/test/java/com/google/gerrit/common/"
+
+AUTO_VALUE_TEST_SRCS = [TEST + "AutoValueTest.java"]
 
 junit_tests(
-  name = 'client_tests',
-  srcs = glob(['src/test/java/**/*.java'], exclude = AUTO_VALUE_TEST_SRCS),
-  deps = [
-    ':client',
-    '//lib:guava',
-    '//lib:junit',
-    '//lib:truth',
-  ],
+    name = "client_tests",
+    srcs = glob(
+        ["src/test/java/**/*.java"],
+        exclude = AUTO_VALUE_TEST_SRCS,
+    ),
+    deps = [
+        ":client",
+        "//lib:guava",
+        "//lib:junit",
+        "//lib:truth",
+    ],
 )
 
 junit_tests(
-  name = 'auto_value_tests',
-  srcs = AUTO_VALUE_TEST_SRCS,
-  deps = [
-    '//lib:truth',
-    '//lib/auto:auto-value',
-  ],
+    name = "auto_value_tests",
+    srcs = AUTO_VALUE_TEST_SRCS,
+    deps = [
+        "//lib:truth",
+        "//lib/auto:auto-value",
+    ],
 )
diff --git a/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java b/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java
index ea3721e..9c78390 100644
--- a/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java
+++ b/gerrit-common/src/test/java/com/google/gerrit/common/data/EncodePathSeparatorTest.java
@@ -20,12 +20,12 @@
 
 public class EncodePathSeparatorTest {
   @Test
-  public void testDefaultBehaviour() {
+  public void defaultBehaviour() {
     assertEquals("a/b", new GitwebType().replacePathSeparator("a/b"));
   }
 
   @Test
-  public void testExclamationMark() {
+  public void exclamationMark() {
     GitwebType gitwebType = new GitwebType();
     gitwebType.setPathSeparator('!');
     assertEquals("a!b", gitwebType.replacePathSeparator("a/b"));
diff --git a/gerrit-common/src/test/java/com/google/gerrit/common/data/ParameterizedStringTest.java b/gerrit-common/src/test/java/com/google/gerrit/common/data/ParameterizedStringTest.java
index b350a27..b7fb17f 100644
--- a/gerrit-common/src/test/java/com/google/gerrit/common/data/ParameterizedStringTest.java
+++ b/gerrit-common/src/test/java/com/google/gerrit/common/data/ParameterizedStringTest.java
@@ -27,7 +27,7 @@
 
 public class ParameterizedStringTest {
   @Test
-  public void testEmptyString() {
+  public void emptyString() {
     final ParameterizedString p = new ParameterizedString("");
     assertEquals("", p.getPattern());
     assertEquals("", p.getRawPattern());
@@ -40,7 +40,7 @@
   }
 
   @Test
-  public void testAsis1() {
+  public void asis1() {
     final ParameterizedString p = ParameterizedString.asis("${bar}c");
     assertEquals("${bar}c", p.getPattern());
     assertEquals("${bar}c", p.getRawPattern());
@@ -54,7 +54,7 @@
   }
 
   @Test
-  public void testReplace1() {
+  public void replace1() {
     final ParameterizedString p = new ParameterizedString("${bar}c");
     assertEquals("${bar}c", p.getPattern());
     assertEquals("{0}c", p.getRawPattern());
@@ -70,7 +70,7 @@
   }
 
   @Test
-  public void testReplace2() {
+  public void replace2() {
     final ParameterizedString p = new ParameterizedString("a${bar}c");
     assertEquals("a${bar}c", p.getPattern());
     assertEquals("a{0}c", p.getRawPattern());
@@ -86,7 +86,7 @@
   }
 
   @Test
-  public void testReplace3() {
+  public void replace3() {
     final ParameterizedString p = new ParameterizedString("a${bar}");
     assertEquals("a${bar}", p.getPattern());
     assertEquals("a{0}", p.getRawPattern());
@@ -102,7 +102,7 @@
   }
 
   @Test
-  public void testReplace4() {
+  public void replace4() {
     final ParameterizedString p = new ParameterizedString("a${bar}c");
     assertEquals("a${bar}c", p.getPattern());
     assertEquals("a{0}c", p.getRawPattern());
@@ -117,7 +117,7 @@
   }
 
   @Test
-  public void testReplaceToLowerCase() {
+  public void replaceToLowerCase() {
     final ParameterizedString p = new ParameterizedString("${a.toLowerCase}");
     assertEquals(1, p.getParameterNames().size());
     assertTrue(p.getParameterNames().contains("a"));
@@ -138,7 +138,7 @@
   }
 
   @Test
-  public void testReplaceToUpperCase() {
+  public void replaceToUpperCase() {
     final ParameterizedString p = new ParameterizedString("${a.toUpperCase}");
     assertEquals(1, p.getParameterNames().size());
     assertTrue(p.getParameterNames().contains("a"));
@@ -159,7 +159,7 @@
   }
 
   @Test
-  public void testReplaceLocalName() {
+  public void replaceLocalName() {
     final ParameterizedString p = new ParameterizedString("${a.localPart}");
     assertEquals(1, p.getParameterNames().size());
     assertTrue(p.getParameterNames().contains("a"));
@@ -180,7 +180,7 @@
   }
 
   @Test
-  public void testUndefinedFunctionName() {
+  public void undefinedFunctionName() {
     ParameterizedString p =
         new ParameterizedString(
             "hi, ${userName.toUpperCase},your eamil address is '${email.toLowerCase.localPart}'.right?");
@@ -200,7 +200,7 @@
   }
 
   @Test
-  public void testReplaceToUpperCaseToLowerCase() {
+  public void replaceToUpperCaseToLowerCase() {
     final ParameterizedString p =
         new ParameterizedString("${a.toUpperCase.toLowerCase}");
     assertEquals(1, p.getParameterNames().size());
@@ -222,7 +222,7 @@
   }
 
   @Test
-  public void testReplaceToUpperCaseLocalName() {
+  public void replaceToUpperCaseLocalName() {
     final ParameterizedString p =
         new ParameterizedString("${a.toUpperCase.localPart}");
     assertEquals(1, p.getParameterNames().size());
@@ -244,7 +244,7 @@
   }
 
   @Test
-  public void testReplaceToUpperCaseAnUndefinedMethod() {
+  public void replaceToUpperCaseAnUndefinedMethod() {
     final ParameterizedString p =
         new ParameterizedString("${a.toUpperCase.anUndefinedMethod}");
     assertEquals(1, p.getParameterNames().size());
@@ -266,7 +266,7 @@
   }
 
   @Test
-  public void testReplaceLocalNameToUpperCase() {
+  public void replaceLocalNameToUpperCase() {
     final ParameterizedString p =
         new ParameterizedString("${a.localPart.toUpperCase}");
     assertEquals(1, p.getParameterNames().size());
@@ -288,7 +288,7 @@
   }
 
   @Test
-  public void testReplaceLocalNameToLowerCase() {
+  public void replaceLocalNameToLowerCase() {
     final ParameterizedString p =
         new ParameterizedString("${a.localPart.toLowerCase}");
     assertEquals(1, p.getParameterNames().size());
@@ -310,7 +310,7 @@
   }
 
   @Test
-  public void testReplaceLocalNameAnUndefinedMethod() {
+  public void replaceLocalNameAnUndefinedMethod() {
     final ParameterizedString p =
         new ParameterizedString("${a.localPart.anUndefinedMethod}");
     assertEquals(1, p.getParameterNames().size());
@@ -332,7 +332,7 @@
   }
 
   @Test
-  public void testReplaceToLowerCaseToUpperCase() {
+  public void replaceToLowerCaseToUpperCase() {
     final ParameterizedString p =
         new ParameterizedString("${a.toLowerCase.toUpperCase}");
     assertEquals(1, p.getParameterNames().size());
@@ -354,7 +354,7 @@
   }
 
   @Test
-  public void testReplaceToLowerCaseLocalName() {
+  public void replaceToLowerCaseLocalName() {
     final ParameterizedString p =
         new ParameterizedString("${a.toLowerCase.localPart}");
     assertEquals(1, p.getParameterNames().size());
@@ -376,7 +376,7 @@
   }
 
   @Test
-  public void testReplaceToLowerCaseAnUndefinedMethod() {
+  public void replaceToLowerCaseAnUndefinedMethod() {
     final ParameterizedString p =
         new ParameterizedString("${a.toLowerCase.anUndefinedMethod}");
     assertEquals(1, p.getParameterNames().size());
@@ -398,7 +398,7 @@
   }
 
   @Test
-  public void testReplaceSubmitTooltipWithVariables() {
+  public void replaceSubmitTooltipWithVariables() {
     ParameterizedString p = new ParameterizedString(
         "Submit patch set ${patchSet} into ${branch}");
     assertEquals(2, p.getParameterNames().size());
@@ -415,7 +415,7 @@
   }
 
   @Test
-  public void testReplaceSubmitTooltipWithoutVariables() {
+  public void replaceSubmitTooltipWithoutVariables() {
     ParameterizedString p = new ParameterizedString(
             "Submit patch set 40 into master");
     Map<String, String> params = ImmutableMap.of(
diff --git a/gerrit-elasticsearch/BUILD b/gerrit-elasticsearch/BUILD
index 3510747..62ea830 100644
--- a/gerrit-elasticsearch/BUILD
+++ b/gerrit-elasticsearch/BUILD
@@ -1,65 +1,68 @@
 java_library(
-  name = 'elasticsearch',
-  srcs = glob(['src/main/java/**/*.java']),
-  deps = [
-    '//gerrit-antlr:query_exception',
-    '//gerrit-extension-api:api',
-    '//gerrit-reviewdb:client',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:gson',
-    '//lib:guava',
-    '//lib:gwtorm',
-    '//lib:protobuf',
-    '//lib/commons:codec',
-    '//lib/commons:lang',
-    '//lib/elasticsearch:elasticsearch',
-    '//lib/elasticsearch:jest',
-    '//lib/elasticsearch:jest-common',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/joda:joda-time',
-    '//lib/log:api',
-    '//lib/lucene:lucene-analyzers-common',
-    '//lib/lucene:lucene-core',
-  ],
-  visibility = ['//visibility:public'],
+    name = "elasticsearch",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-antlr:query_exception",
+        "//gerrit-extension-api:api",
+        "//gerrit-reviewdb:client",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:protobuf",
+        "//lib/commons:codec",
+        "//lib/commons:lang",
+        "//lib/elasticsearch",
+        "//lib/elasticsearch:jest",
+        "//lib/elasticsearch:jest-common",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/joda:joda-time",
+        "//lib/log:api",
+        "//lib/lucene:lucene-analyzers-common",
+        "//lib/lucene:lucene-core",
+    ],
 )
 
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 java_library(
-  name = 'elasticsearch_test_utils',
-  srcs = glob(['src/test/java/**/ElasticTestUtils.java']),
-  deps = [
-    '//gerrit-extension-api:api',
-    '//gerrit-server:server',
-    '//lib:gson',
-    '//lib:guava',
-    '//lib:junit',
-    '//lib:truth',
-    '//lib/elasticsearch:elasticsearch',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/jgit/org.eclipse.jgit.junit:junit',
-  ],
-  testonly = 1,
+    name = "elasticsearch_test_utils",
+    testonly = 1,
+    srcs = glob(["src/test/java/**/ElasticTestUtils.java"]),
+    deps = [
+        "//gerrit-extension-api:api",
+        "//gerrit-server:server",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:junit",
+        "//lib:truth",
+        "//lib/elasticsearch",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+    ],
 )
 
 junit_tests(
-  name = 'elasticsearch_tests',
-  tags = ['elastic', 'flaky'],
-  srcs = glob(['src/test/java/**/*Test.java']),
-  size = "large",
-  deps = [
-    ':elasticsearch_test_utils',
-    ':elasticsearch',
-    '//gerrit-server:query_tests_code',
-    '//gerrit-server:server',
-    '//gerrit-server:testutil',
-    '//lib/guice:guice',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/jgit/org.eclipse.jgit.junit:junit',
-  ],
-  flaky = 1,
+    name = "elasticsearch_tests",
+    size = "large",
+    srcs = glob(["src/test/java/**/*Test.java"]),
+    flaky = 1,
+    tags = [
+        "elastic",
+        "flaky",
+    ],
+    deps = [
+        ":elasticsearch",
+        ":elasticsearch_test_utils",
+        "//gerrit-server:query_tests_code",
+        "//gerrit-server:server",
+        "//gerrit-server:testutil",
+        "//lib/guice",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+    ],
 )
diff --git a/gerrit-extension-api/BUILD b/gerrit-extension-api/BUILD
index 6f4df01..824fc9a 100644
--- a/gerrit-extension-api/BUILD
+++ b/gerrit-extension-api/BUILD
@@ -1,59 +1,63 @@
-load('//lib:guava.bzl', 'GUAVA_DOC_URL')
-load('//lib/jgit:jgit.bzl', 'JGIT_DOC_URL')
-load('//tools/bzl:gwt.bzl', 'gwt_module')
+load("//lib:guava.bzl", "GUAVA_DOC_URL")
+load("//lib/jgit:jgit.bzl", "JGIT_DOC_URL")
+load("//tools/bzl:gwt.bzl", "gwt_module")
 
-SRC = 'src/main/java/com/google/gerrit/extensions/'
-SRCS = glob([SRC + '**/*.java'])
+SRC = "src/main/java/com/google/gerrit/extensions/"
 
-EXT_API_SRCS = glob([SRC + 'client/*.java'])
+SRCS = glob([SRC + "**/*.java"])
+
+EXT_API_SRCS = glob([SRC + "client/*.java"])
 
 gwt_module(
-  name = 'client',
-  srcs = EXT_API_SRCS,
-  gwt_xml = SRC + 'Extensions.gwt.xml',
-  visibility = ['//visibility:public'],
+    name = "client",
+    srcs = EXT_API_SRCS,
+    gwt_xml = SRC + "Extensions.gwt.xml",
+    visibility = ["//visibility:public"],
 )
 
 java_binary(
-  name = 'extension-api',
-  main_class = 'Dummy',
-  runtime_deps = [':lib'],
-  visibility = ['//visibility:public'],
+    name = "extension-api",
+    main_class = "Dummy",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":lib"],
 )
 
 java_library(
-  name = 'lib',
-  exports = [
-    ':api',
-    '//lib:guava',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-servlet',
-    '//lib:servlet-api-3_1',
-  ],
-  visibility = ['//visibility:public'],
+    name = "lib",
+    visibility = ["//visibility:public"],
+    exports = [
+        ":api",
+        "//lib:guava",
+        "//lib:servlet-api-3_1",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
+    ],
 )
 
 #TODO(davido): There is no provided_deps argument to java_library rule
 java_library(
-  name = 'api',
-  srcs = glob([SRC + '**/*.java']),
-  deps = [
-    '//gerrit-common:annotations',
-    '//lib:guava',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-  ],
-  visibility = ['//visibility:public'],
+    name = "api",
+    srcs = glob([SRC + "**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-common:annotations",
+        "//lib:guava",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+    ],
 )
 
-load('//tools/bzl:javadoc.bzl', 'java_doc')
+load("//tools/bzl:javadoc.bzl", "java_doc")
 
 java_doc(
-  name = 'extension-api-javadoc',
-  title = 'Gerrit Review Extension API Documentation',
-  libs = [':api'],
-  pkgs = ['com.google.gerrit.extensions'],
-  external_docs = [JGIT_DOC_URL, GUAVA_DOC_URL],
-  visibility = ['//visibility:public'],
+    name = "extension-api-javadoc",
+    external_docs = [
+        JGIT_DOC_URL,
+        GUAVA_DOC_URL,
+    ],
+    libs = [":api"],
+    pkgs = ["com.google.gerrit.extensions"],
+    title = "Gerrit Review Extension API Documentation",
+    visibility = ["//visibility:public"],
 )
diff --git a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java b/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java
index 299b9b0..f18cdf3 100644
--- a/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java
+++ b/gerrit-extension-api/src/test/java/com/google/gerrit/extensions/registration/DynamicSetTest.java
@@ -33,13 +33,13 @@
   // {@code assertThat(ds.contains(...)).isFalse() @} instead.
 
   @Test
-  public void testContainsWithEmpty() throws Exception {
+  public void containsWithEmpty() throws Exception {
     DynamicSet<Integer> ds = new DynamicSet<>();
     assertThat(ds.contains(2)).isFalse(); //See above comment about ds.contains
   }
 
   @Test
-  public void testContainsTrueWithSingleElement() throws Exception {
+  public void containsTrueWithSingleElement() throws Exception {
     DynamicSet<Integer> ds = new DynamicSet<>();
     ds.add(2);
 
@@ -47,7 +47,7 @@
   }
 
   @Test
-  public void testContainsFalseWithSingleElement() throws Exception {
+  public void containsFalseWithSingleElement() throws Exception {
     DynamicSet<Integer> ds = new DynamicSet<>();
     ds.add(2);
 
@@ -55,7 +55,7 @@
   }
 
   @Test
-  public void testContainsTrueWithTwoElements() throws Exception {
+  public void containsTrueWithTwoElements() throws Exception {
     DynamicSet<Integer> ds = new DynamicSet<>();
     ds.add(2);
     ds.add(4);
@@ -64,7 +64,7 @@
   }
 
   @Test
-  public void testContainsFalseWithTwoElements() throws Exception {
+  public void containsFalseWithTwoElements() throws Exception {
     DynamicSet<Integer> ds = new DynamicSet<>();
     ds.add(2);
     ds.add(4);
@@ -73,7 +73,7 @@
   }
 
   @Test
-  public void testContainsDynamic() throws Exception {
+  public void containsDynamic() throws Exception {
     DynamicSet<Integer> ds = new DynamicSet<>();
     ds.add(2);
 
diff --git a/gerrit-gpg/BUILD b/gerrit-gpg/BUILD
index 8cab45c..dcaf442 100644
--- a/gerrit-gpg/BUILD
+++ b/gerrit-gpg/BUILD
@@ -1,59 +1,59 @@
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 DEPS = [
-  '//gerrit-common:server',
-  '//gerrit-extension-api:api',
-  '//gerrit-reviewdb:server',
-  '//gerrit-server:server',
-  '//lib:guava',
-  '//lib:gwtorm',
-  '//lib/guice:guice',
-  '//lib/guice:guice-assistedinject',
-  '//lib/guice:guice-servlet',
-  '//lib/jgit/org.eclipse.jgit:jgit',
-  '//lib/log:api',
+    "//gerrit-common:server",
+    "//gerrit-extension-api:api",
+    "//gerrit-reviewdb:server",
+    "//gerrit-server:server",
+    "//lib:guava",
+    "//lib:gwtorm",
+    "//lib/guice:guice",
+    "//lib/guice:guice-assistedinject",
+    "//lib/guice:guice-servlet",
+    "//lib/jgit/org.eclipse.jgit:jgit",
+    "//lib/log:api",
 ]
 
 java_library(
-  name = 'gpg',
-  srcs = glob(['src/main/java/**/*.java']),
-  deps = DEPS + [
-    '//lib/bouncycastle:bcpg',
-    '//lib/bouncycastle:bcprov',
-  ],
-  visibility = ['//visibility:public'],
+    name = "gpg",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = DEPS + [
+        "//lib/bouncycastle:bcpg",
+        "//lib/bouncycastle:bcprov",
+    ],
 )
 
-TESTUTIL_SRCS = glob(['src/test/**/testutil/**/*.java'])
+TESTUTIL_SRCS = glob(["src/test/**/testutil/**/*.java"])
 
 java_library(
-  name = 'testutil',
-  srcs = TESTUTIL_SRCS,
-  deps = DEPS + [
-    ':gpg',
-    '//lib/bouncycastle:bcpg-without-neverlink',
-    '//lib/bouncycastle:bcprov-without-neverlink',
-  ],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "testutil",
+    testonly = 1,
+    srcs = TESTUTIL_SRCS,
+    visibility = ["//visibility:public"],
+    deps = DEPS + [
+        ":gpg",
+        "//lib/bouncycastle:bcpg-without-neverlink",
+        "//lib/bouncycastle:bcprov-without-neverlink",
+    ],
 )
 
 junit_tests(
-  name = 'gpg_tests',
-  srcs = glob(
-    ['src/test/java/**/*.java'],
-    exclude = TESTUTIL_SRCS,
-  ),
-  deps = DEPS + [
-    ':gpg',
-    ':testutil',
-    '//gerrit-cache-h2:cache-h2',
-    '//gerrit-lucene:lucene',
-    '//gerrit-server:testutil',
-    '//lib:truth',
-    '//lib/jgit/org.eclipse.jgit.junit:junit',
-    '//lib/bouncycastle:bcpg-without-neverlink',
-    '//lib/bouncycastle:bcprov-without-neverlink',
-  ],
-  visibility = ['//visibility:public'],
+    name = "gpg_tests",
+    srcs = glob(
+        ["src/test/java/**/*.java"],
+        exclude = TESTUTIL_SRCS,
+    ),
+    visibility = ["//visibility:public"],
+    deps = DEPS + [
+        ":gpg",
+        ":testutil",
+        "//gerrit-cache-h2:cache-h2",
+        "//gerrit-lucene:lucene",
+        "//gerrit-server:testutil",
+        "//lib:truth",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/bouncycastle:bcpg-without-neverlink",
+        "//lib/bouncycastle:bcprov-without-neverlink",
+    ],
 )
diff --git a/gerrit-gpg/src/test/java/com/google/gerrit/gpg/PublicKeyStoreTest.java b/gerrit-gpg/src/test/java/com/google/gerrit/gpg/PublicKeyStoreTest.java
index 11e9768..3df1154 100644
--- a/gerrit-gpg/src/test/java/com/google/gerrit/gpg/PublicKeyStoreTest.java
+++ b/gerrit-gpg/src/test/java/com/google/gerrit/gpg/PublicKeyStoreTest.java
@@ -85,7 +85,7 @@
   }
 
   @Test
-  public void testGet() throws Exception {
+  public void get() throws Exception {
     TestKey key1 = validKeyWithoutExpiration();
     tr.branch(REFS_GPG_KEYS)
         .commit()
@@ -104,7 +104,7 @@
   }
 
   @Test
-  public void testGetMultiple() throws Exception {
+  public void getMultiple() throws Exception {
     TestKey key1 = validKeyWithoutExpiration();
     TestKey key2 = validKeyWithExpiration();
     tr.branch(REFS_GPG_KEYS)
diff --git a/gerrit-gwtdebug/BUILD b/gerrit-gwtdebug/BUILD
index a1a04b0..115c6b9 100644
--- a/gerrit-gwtdebug/BUILD
+++ b/gerrit-gwtdebug/BUILD
@@ -1,17 +1,17 @@
 java_library(
-  name = 'gwtdebug',
-  srcs = glob(['src/main/java/**/*.java']),
-  deps = [
-    '//gerrit-pgm:daemon',
-    '//gerrit-pgm:pgm',
-    '//gerrit-pgm:util',
-    '//gerrit-util-cli:cli',
-    '//lib/gwt:dev',
-    '//lib/jetty:server',
-    '//lib/jetty:servlet',
-    '//lib/jetty:servlets',
-    '//lib/log:api',
-    '//lib/log:log4j',
-  ],
-  visibility = ['//visibility:public'],
+    name = "gwtdebug",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-pgm:daemon",
+        "//gerrit-pgm:pgm",
+        "//gerrit-pgm:util",
+        "//gerrit-util-cli:cli",
+        "//lib/gwt:dev",
+        "//lib/jetty:server",
+        "//lib/jetty:servlet",
+        "//lib/jetty:servlets",
+        "//lib/log:api",
+        "//lib/log:log4j",
+    ],
 )
diff --git a/gerrit-gwtexpui/BUILD b/gerrit-gwtexpui/BUILD
index 610a10b..a9a2e48 100644
--- a/gerrit-gwtexpui/BUILD
+++ b/gerrit-gwtexpui/BUILD
@@ -1,118 +1,118 @@
-load('//tools/bzl:gwt.bzl', 'gwt_module')
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:gwt.bzl", "gwt_module")
+load("//tools/bzl:junit.bzl", "junit_tests")
 
-SRC = 'src/main/java/com/google/gwtexpui/'
+SRC = "src/main/java/com/google/gwtexpui/"
 
 gwt_module(
-  name = 'Clippy',
-  srcs = glob([SRC + 'clippy/client/*.java']),
-  gwt_xml = SRC + 'clippy/Clippy.gwt.xml',
-  resources = [
-    SRC + 'clippy/client/clippy.css',
-    SRC + 'clippy/client/clippy.swf',
-    SRC + 'clippy/client/page_white_copy.png',
-    SRC + 'clippy/client/CopyableLabelText.properties',
-  ],
-  deps = [
-    ':SafeHtml',
-    ':UserAgent',
-    '//lib/gwt:user-neverlink',
-  ],
-  visibility = ['//visibility:public'],
-  data = [
-    '//lib:LICENSE-clippy',
-    '//lib:LICENSE-silk_icons',
-  ],
+    name = "Clippy",
+    srcs = glob([SRC + "clippy/client/*.java"]),
+    data = [
+        "//lib:LICENSE-clippy",
+        "//lib:LICENSE-silk_icons",
+    ],
+    gwt_xml = SRC + "clippy/Clippy.gwt.xml",
+    resources = [
+        SRC + "clippy/client/clippy.css",
+        SRC + "clippy/client/clippy.swf",
+        SRC + "clippy/client/page_white_copy.png",
+        SRC + "clippy/client/CopyableLabelText.properties",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":SafeHtml",
+        ":UserAgent",
+        "//lib/gwt:user-neverlink",
+    ],
 )
 
 java_library(
-  name = 'CSS',
-  srcs = glob([SRC + 'css/rebind/*.java']),
-  resources = [SRC + 'css/CSS.gwt.xml'],
-  deps = ['//lib/gwt:dev'],
-  visibility = ['//visibility:public'],
+    name = "CSS",
+    srcs = glob([SRC + "css/rebind/*.java"]),
+    resources = [SRC + "css/CSS.gwt.xml"],
+    visibility = ["//visibility:public"],
+    deps = ["//lib/gwt:dev"],
 )
 
 gwt_module(
-  name = 'GlobalKey',
-  srcs = glob([SRC + 'globalkey/client/*.java']),
-  gwt_xml = SRC + 'globalkey/GlobalKey.gwt.xml',
-  resources = [
-    SRC + 'globalkey/client/KeyConstants.properties',
-    SRC + 'globalkey/client/key.css',
-  ],
-  deps = [
-    ':SafeHtml',
-    ':UserAgent',
-    '//lib/gwt:user',
-  ],
-  visibility = ['//visibility:public'],
+    name = "GlobalKey",
+    srcs = glob([SRC + "globalkey/client/*.java"]),
+    gwt_xml = SRC + "globalkey/GlobalKey.gwt.xml",
+    resources = [
+        SRC + "globalkey/client/KeyConstants.properties",
+        SRC + "globalkey/client/key.css",
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":SafeHtml",
+        ":UserAgent",
+        "//lib/gwt:user",
+    ],
 )
 
 java_library(
-  name = 'linker_server',
-  srcs = glob([SRC + 'linker/server/*.java']),
-  deps = ['//lib:servlet-api-3_1'],
-  visibility = ['//visibility:public'],
+    name = "linker_server",
+    srcs = glob([SRC + "linker/server/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = ["//lib:servlet-api-3_1"],
 )
 
 gwt_module(
-  name = 'Progress',
-  srcs = glob([SRC + 'progress/client/*.java']),
-  gwt_xml = SRC + 'progress/Progress.gwt.xml',
-  resources = [SRC + 'progress/client/progress.css'],
-  deps = ['//lib/gwt:user'],
-  visibility = ['//visibility:public'],
+    name = "Progress",
+    srcs = glob([SRC + "progress/client/*.java"]),
+    gwt_xml = SRC + "progress/Progress.gwt.xml",
+    resources = [SRC + "progress/client/progress.css"],
+    visibility = ["//visibility:public"],
+    deps = ["//lib/gwt:user"],
 )
 
 gwt_module(
-  name = 'SafeHtml',
-  srcs = glob([SRC + 'safehtml/client/*.java']),
-  gwt_xml = SRC + 'safehtml/SafeHtml.gwt.xml',
-  resources = [SRC + 'safehtml/client/safehtml.css'],
-  deps = ['//lib/gwt:user'],
-  visibility = ['//visibility:public'],
+    name = "SafeHtml",
+    srcs = glob([SRC + "safehtml/client/*.java"]),
+    gwt_xml = SRC + "safehtml/SafeHtml.gwt.xml",
+    resources = [SRC + "safehtml/client/safehtml.css"],
+    visibility = ["//visibility:public"],
+    deps = ["//lib/gwt:user"],
 )
 
 junit_tests(
-  name = 'SafeHtml_tests',
-  srcs = glob([
-    'src/test/java/com/google/gwtexpui/safehtml/client/**/*.java',
-  ]),
-  deps = [
-    ':SafeHtml',
-    '//lib:truth',
-    '//lib/gwt:user',
-    '//lib/gwt:dev',
-  ],
+    name = "SafeHtml_tests",
+    srcs = glob([
+        "src/test/java/com/google/gwtexpui/safehtml/client/**/*.java",
+    ]),
+    deps = [
+        ":SafeHtml",
+        "//lib:truth",
+        "//lib/gwt:dev",
+        "//lib/gwt:user",
+    ],
 )
 
 gwt_module(
-  name = 'UserAgent',
-  srcs = glob([SRC + 'user/client/*.java']),
-  gwt_xml = SRC + 'user/User.gwt.xml',
-  resources = [SRC + 'user/client/tooltip.css'],
-  deps = ['//lib/gwt:user'],
-  visibility = ['//visibility:public'],
+    name = "UserAgent",
+    srcs = glob([SRC + "user/client/*.java"]),
+    gwt_xml = SRC + "user/User.gwt.xml",
+    resources = [SRC + "user/client/tooltip.css"],
+    visibility = ["//visibility:public"],
+    deps = ["//lib/gwt:user"],
 )
 
 java_library(
-  name = 'server',
-  srcs = glob([SRC + 'server/*.java']),
-  deps = ['//lib:servlet-api-3_1'],
-  visibility = ['//visibility:public'],
+    name = "server",
+    srcs = glob([SRC + "server/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = ["//lib:servlet-api-3_1"],
 )
 
 java_library(
-  name = 'client-src-lib',
-  srcs = [],
-  resources = glob(
-    [SRC + n for n in [
-      'clippy/**/*',
-      'globalkey/**/*',
-      'safehtml/**/*',
-      'user/**/*',
-    ]]
-  ),
-  visibility = ['//visibility:public'],
+    name = "client-src-lib",
+    srcs = [],
+    resources = glob(
+        [SRC + n for n in [
+            "clippy/**/*",
+            "globalkey/**/*",
+            "safehtml/**/*",
+            "user/**/*",
+        ]],
+    ),
+    visibility = ["//visibility:public"],
 )
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/LinkFindReplaceTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/LinkFindReplaceTest.java
index 554315e..3c36e82 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/LinkFindReplaceTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/LinkFindReplaceTest.java
@@ -15,7 +15,8 @@
 package com.google.gwtexpui.safehtml.client;
 
 import static com.google.common.truth.Truth.assertThat;
-import static com.google.gwtexpui.safehtml.client.LinkFindReplace.hasValidScheme;
+
+import com.google.gwtexpui.safehtml.client.LinkFindReplace;
 
 import org.junit.Rule;
 import org.junit.Test;
@@ -26,7 +27,7 @@
   public ExpectedException exception = ExpectedException.none();
 
   @Test
-  public void testNoEscaping() {
+  public void noEscaping() {
     String find = "find";
     String link = "link";
     LinkFindReplace a = new LinkFindReplace(find, link);
@@ -36,7 +37,7 @@
   }
 
   @Test
-  public void testBackreference() {
+  public void backreference() {
     LinkFindReplace l = new LinkFindReplace(
         "(bug|issue)\\s*([0-9]+)", "/bug?id=$2");
     assertThat(l.replace("issue 123"))
@@ -44,39 +45,39 @@
   }
 
   @Test
-  public void testHasValidScheme() {
-    assertThat(hasValidScheme("/absolute/path")).isTrue();
-    assertThat(hasValidScheme("relative/path")).isTrue();
-    assertThat(hasValidScheme("http://url/")).isTrue();
-    assertThat(hasValidScheme("HTTP://url/")).isTrue();
-    assertThat(hasValidScheme("https://url/")).isTrue();
-    assertThat(hasValidScheme("mailto://url/")).isTrue();
-    assertThat(hasValidScheme("ftp://url/")).isFalse();
-    assertThat(hasValidScheme("data:evil")).isFalse();
-    assertThat(hasValidScheme("javascript:alert(1)")).isFalse();
+  public void hasValidScheme() {
+    assertThat(LinkFindReplace.hasValidScheme("/absolute/path")).isTrue();
+    assertThat(LinkFindReplace.hasValidScheme("relative/path")).isTrue();
+    assertThat(LinkFindReplace.hasValidScheme("http://url/")).isTrue();
+    assertThat(LinkFindReplace.hasValidScheme("HTTP://url/")).isTrue();
+    assertThat(LinkFindReplace.hasValidScheme("https://url/")).isTrue();
+    assertThat(LinkFindReplace.hasValidScheme("mailto://url/")).isTrue();
+    assertThat(LinkFindReplace.hasValidScheme("ftp://url/")).isFalse();
+    assertThat(LinkFindReplace.hasValidScheme("data:evil")).isFalse();
+    assertThat(LinkFindReplace.hasValidScheme("javascript:alert(1)")).isFalse();
   }
 
   @Test
-  public void testInvalidSchemeInReplace() {
+  public void invalidSchemeInReplace() {
     exception.expect(IllegalArgumentException.class);
     new LinkFindReplace("find", "javascript:alert(1)").replace("find");
   }
 
   @Test
-  public void testInvalidSchemeWithBackreference() {
+  public void invalidSchemeWithBackreference() {
     exception.expect(IllegalArgumentException.class);
     new LinkFindReplace(".*(script:[^;]*)", "java$1")
         .replace("Look at this script: alert(1);");
   }
 
   @Test
-  public void testReplaceEscaping() {
+  public void replaceEscaping() {
     assertThat(new LinkFindReplace("find", "a\"&'<>b").replace("find"))
       .isEqualTo("<a href=\"a&quot;&amp;&#39;&lt;&gt;b\">find</a>");
   }
 
   @Test
-  public void testHtmlInFind() {
+  public void htmlInFind() {
     String rawFind = "<b>&quot;bold&quot;</b>";
     LinkFindReplace a = new LinkFindReplace(rawFind, "/bold");
     assertThat(a.pattern().getSource()).isEqualTo(rawFind);
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java
index 0f124c0..3b5e769 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/RawFindReplaceTest.java
@@ -20,7 +20,7 @@
 
 public class RawFindReplaceTest {
   @Test
-  public void testFindReplace() {
+  public void findReplace() {
     final String find = "find";
     final String replace = "replace";
     final RawFindReplace a = new RawFindReplace(find, replace);
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java
index 0862711..ff34a3f 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtmlBuilderTest.java
@@ -25,7 +25,7 @@
   public ExpectedException exception = ExpectedException.none();
 
   @Test
-  public void testEmpty() {
+  public void empty() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b.isEmpty()).isTrue();
     assertThat(b.hasContent()).isFalse();
@@ -37,7 +37,7 @@
   }
 
   @Test
-  public void testToSafeHtml() {
+  public void toSafeHtml() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     b.append(1);
 
@@ -49,7 +49,7 @@
   }
 
   @Test
-  public void testAppend_boolean() {
+  public void append_boolean() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append(true));
     assertThat(b).isSameAs(b.append(false));
@@ -57,7 +57,7 @@
   }
 
   @Test
-  public void testAppend_char() {
+  public void append_char() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append('a'));
     assertThat(b).isSameAs(b.append('b'));
@@ -65,7 +65,7 @@
   }
 
   @Test
-  public void testAppend_int() {
+  public void append_int() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append(4));
     assertThat(b).isSameAs(b.append(2));
@@ -74,7 +74,7 @@
   }
 
   @Test
-  public void testAppend_long() {
+  public void append_long() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append(4L));
     assertThat(b).isSameAs(b.append(2L));
@@ -82,21 +82,21 @@
   }
 
   @Test
-  public void testAppend_float() {
+  public void append_float() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append(0.0f));
     assertThat(b.asString()).isEqualTo("0.0");
   }
 
   @Test
-  public void testAppend_double() {
+  public void append_double() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append(0.0));
     assertThat(b.asString()).isEqualTo("0.0");
   }
 
   @Test
-  public void testAppend_String() {
+  public void append_String() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append((String) null));
     assertThat(b.asString()).isEmpty();
@@ -106,7 +106,7 @@
   }
 
   @Test
-  public void testAppend_StringBuilder() {
+  public void append_StringBuilder() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append((StringBuilder) null));
     assertThat(b.asString()).isEmpty();
@@ -116,7 +116,7 @@
   }
 
   @Test
-  public void testAppend_StringBuffer() {
+  public void append_StringBuffer() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append((StringBuffer) null));
     assertThat(b.asString()).isEmpty();
@@ -126,7 +126,7 @@
   }
 
   @Test
-  public void testAppend_Object() {
+  public void append_Object() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append((Object) null));
     assertThat(b.asString()).isEmpty();
@@ -140,7 +140,7 @@
   }
 
   @Test
-  public void testAppend_CharSequence() {
+  public void append_CharSequence() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append((CharSequence) null));
     assertThat(b.asString()).isEmpty();
@@ -150,7 +150,7 @@
   }
 
   @Test
-  public void testAppend_SafeHtml() {
+  public void append_SafeHtml() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.append((SafeHtml) null));
     assertThat(b.asString()).isEmpty();
@@ -160,7 +160,7 @@
   }
 
   @Test
-  public void testHtmlSpecialCharacters() {
+  public void htmlSpecialCharacters() {
     assertThat(escape("&")).isEqualTo("&amp;");
     assertThat(escape("<")).isEqualTo("&lt;");
     assertThat(escape(">")).isEqualTo("&gt;");
@@ -178,21 +178,21 @@
   }
 
   @Test
-  public void testEntityNbsp() {
+  public void entityNbsp() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.nbsp());
     assertThat(b.asString()).isEqualTo("&nbsp;");
   }
 
   @Test
-  public void testTagBr() {
+  public void tagBr() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.br());
     assertThat(b.asString()).isEqualTo("<br />");
   }
 
   @Test
-  public void testTagTableTrTd() {
+  public void tagTableTrTd() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.openElement("table"));
     assertThat(b).isSameAs(b.openTr());
@@ -205,7 +205,7 @@
   }
 
   @Test
-  public void testTagDiv() {
+  public void tagDiv() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.openDiv());
     assertThat(b).isSameAs(b.append("d<a>ta"));
@@ -214,7 +214,7 @@
   }
 
   @Test
-  public void testTagAnchor() {
+  public void tagAnchor() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.openAnchor());
 
@@ -234,7 +234,7 @@
   }
 
   @Test
-  public void testTagHeightWidth() {
+  public void tagHeightWidth() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.openElement("img"));
     assertThat(b).isSameAs(b.setHeight(100));
@@ -244,7 +244,7 @@
   }
 
   @Test
-  public void testStyleName() {
+  public void styleName() {
     final SafeHtmlBuilder b = new SafeHtmlBuilder();
     assertThat(b).isSameAs(b.openSpan());
     assertThat(b).isSameAs(b.setStyleName("foo"));
@@ -255,7 +255,7 @@
   }
 
   @Test
-  public void testRejectJavaScript_AnchorHref() {
+  public void rejectJavaScript_AnchorHref() {
     final String href = "javascript:window.close();";
     exception.expect(RuntimeException.class);
     exception.expectMessage("javascript unsafe in href: " + href);
@@ -263,7 +263,7 @@
   }
 
   @Test
-  public void testRejectJavaScript_ImgSrc() {
+  public void rejectJavaScript_ImgSrc() {
     final String href = "javascript:window.close();";
     exception.expect(RuntimeException.class);
     exception.expectMessage("javascript unsafe in href: " + href);
@@ -271,7 +271,7 @@
   }
 
   @Test
-  public void testRejectJavaScript_FormAction() {
+  public void rejectJavaScript_FormAction() {
     final String href = "javascript:window.close();";
     exception.expect(RuntimeException.class);
     exception.expectMessage("javascript unsafe in href: " + href);
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java
index 8fe743e..9d310c6 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_LinkifyTest.java
@@ -20,7 +20,7 @@
 
 public class SafeHtml_LinkifyTest {
   @Test
-  public void testLinkify_SimpleHttp1() {
+  public void linkify_SimpleHttp1() {
     final SafeHtml o = html("A http://go.here/ B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -30,7 +30,7 @@
   }
 
   @Test
-  public void testLinkify_SimpleHttps2() {
+  public void linkify_SimpleHttps2() {
     final SafeHtml o = html("A https://go.here/ B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -40,7 +40,7 @@
   }
 
   @Test
-  public void testLinkify_Parens1() {
+  public void linkify_Parens1() {
     final SafeHtml o = html("A (http://go.here/) B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -50,7 +50,7 @@
   }
 
   @Test
-  public void testLinkify_Parens() {
+  public void linkify_Parens() {
     final SafeHtml o = html("A http://go.here/#m() B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -60,7 +60,7 @@
   }
 
   @Test
-  public void testLinkify_AngleBrackets1() {
+  public void linkify_AngleBrackets1() {
     final SafeHtml o = html("A <http://go.here/> B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -70,7 +70,7 @@
   }
 
   @Test
-  public void testLinkify_TrailingPlainLetter() {
+  public void linkify_TrailingPlainLetter() {
     final SafeHtml o = html("A http://go.here/foo B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -80,7 +80,7 @@
   }
 
   @Test
-  public void testLinkify_TrailingDot() {
+  public void linkify_TrailingDot() {
     final SafeHtml o = html("A http://go.here/. B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -90,7 +90,7 @@
   }
 
   @Test
-  public void testLinkify_TrailingComma() {
+  public void linkify_TrailingComma() {
     final SafeHtml o = html("A http://go.here/, B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
@@ -100,7 +100,7 @@
   }
 
   @Test
-  public void testLinkify_TrailingDotDot() {
+  public void linkify_TrailingDotDot() {
     final SafeHtml o = html("A http://go.here/.. B");
     final SafeHtml n = o.linkify();
     assertThat(o).isNotSameAs(n);
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java
index 0401c9e..65a13a7 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_ReplaceTest.java
@@ -24,14 +24,14 @@
 
 public class SafeHtml_ReplaceTest {
   @Test
-  public void testReplaceEmpty() {
+  public void replaceEmpty() {
     SafeHtml o = html("A\nissue42\nB");
     assertThat(o.replaceAll(null)).isSameAs(o);
     assertThat(o.replaceAll(Collections.<FindReplace> emptyList())).isSameAs(o);
   }
 
   @Test
-  public void testReplaceOneLink() {
+  public void replaceOneLink() {
     SafeHtml o = html("A\nissue 42\nB");
     SafeHtml n = o.replaceAll(repls(
         new RawFindReplace("(issue\\s(\\d+))", "<a href=\"?$2\">$1</a>")));
@@ -41,7 +41,7 @@
   }
 
   @Test
-  public void testReplaceNoLeadingOrTrailingText() {
+  public void replaceNoLeadingOrTrailingText() {
     SafeHtml o = html("issue 42");
     SafeHtml n = o.replaceAll(repls(
         new RawFindReplace("(issue\\s(\\d+))", "<a href=\"?$2\">$1</a>")));
@@ -51,7 +51,7 @@
   }
 
   @Test
-  public void testReplaceTwoLinks() {
+  public void replaceTwoLinks() {
     SafeHtml o = html("A\nissue 42\nissue 9918\nB");
     SafeHtml n = o.replaceAll(repls(
         new RawFindReplace("(issue\\s(\\d+))", "<a href=\"?$2\">$1</a>")));
@@ -64,7 +64,7 @@
   }
 
   @Test
-  public void testReplaceInOrder() {
+  public void replaceInOrder() {
     SafeHtml o = html("A\nissue 42\nReally GWTEXPUI-9918 is better\nB");
     SafeHtml n = o.replaceAll(repls(
         new RawFindReplace("(GWTEXPUI-(\\d+))",
@@ -80,7 +80,7 @@
   }
 
   @Test
-  public void testReplaceOverlappingAfterFirstChar() {
+  public void replaceOverlappingAfterFirstChar() {
     SafeHtml o = html("abcd");
     RawFindReplace ab = new RawFindReplace("ab", "AB");
     RawFindReplace bc = new RawFindReplace("bc", "23");
@@ -92,7 +92,7 @@
   }
 
   @Test
-  public void testReplaceOverlappingAtFirstCharLongestMatch() {
+  public void replaceOverlappingAtFirstCharLongestMatch() {
     SafeHtml o = html("abcd");
     RawFindReplace ab = new RawFindReplace("ab", "AB");
     RawFindReplace abc = new RawFindReplace("[^d][^d][^d]", "234");
@@ -102,7 +102,7 @@
   }
 
   @Test
-  public void testReplaceOverlappingAtFirstCharFirstMatch() {
+  public void replaceOverlappingAtFirstCharFirstMatch() {
     SafeHtml o = html("abcd");
     RawFindReplace ab1 = new RawFindReplace("ab", "AB");
     RawFindReplace ab2 = new RawFindReplace("[^cd][^cd]", "12");
@@ -112,7 +112,7 @@
   }
 
   @Test
-  public void testFailedSanitization() {
+  public void failedSanitization() {
     SafeHtml o = html("abcd");
     LinkFindReplace evil = new LinkFindReplace("(b)", "javascript:alert('$1')");
     LinkFindReplace ok = new LinkFindReplace("(b)", "/$1");
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java
index 9a7108d..eb7d038 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyListTest.java
@@ -27,7 +27,7 @@
   }
 
   @Test
-  public void testBulletList1() {
+  public void bulletList1() {
     final SafeHtml o = html("A\n\n* line 1\n* 2nd line");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -40,7 +40,7 @@
   }
 
   @Test
-  public void testBulletList2() {
+  public void bulletList2() {
     final SafeHtml o = html("A\n\n* line 1\n* 2nd line\n\nB");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -54,7 +54,7 @@
   }
 
   @Test
-  public void testBulletList3() {
+  public void bulletList3() {
     final SafeHtml o = html("* line 1\n* 2nd line\n\nB");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -67,7 +67,7 @@
   }
 
   @Test
-  public void testBulletList4() {
+  public void bulletList4() {
     final SafeHtml o = html("To see this bug, you have to:\n" //
         + "* Be on IMAP or EAS (not on POP)\n"//
         + "* Be very unlucky\n");
@@ -82,7 +82,7 @@
   }
 
   @Test
-  public void testBulletList5() {
+  public void bulletList5() {
     final SafeHtml o = html("To see this bug,\n" //
         + "you have to:\n" //
         + "* Be on IMAP or EAS (not on POP)\n"//
@@ -98,7 +98,7 @@
   }
 
   @Test
-  public void testDashList1() {
+  public void dashList1() {
     final SafeHtml o = html("A\n\n- line 1\n- 2nd line");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -111,7 +111,7 @@
   }
 
   @Test
-  public void testDashList2() {
+  public void dashList2() {
     final SafeHtml o = html("A\n\n- line 1\n- 2nd line\n\nB");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -125,7 +125,7 @@
   }
 
   @Test
-  public void testDashList3() {
+  public void dashList3() {
     final SafeHtml o = html("- line 1\n- 2nd line\n\nB");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java
index 8085cac..897cf40 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyPreformatTest.java
@@ -27,7 +27,7 @@
   }
 
   @Test
-  public void testPreformat1() {
+  public void preformat1() {
     final SafeHtml o = html("A\n\n  This is pre\n  formatted");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -40,7 +40,7 @@
   }
 
   @Test
-  public void testPreformat2() {
+  public void preformat2() {
     final SafeHtml o = html("A\n\n  This is pre\n  formatted\n\nbut this is not");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -54,7 +54,7 @@
   }
 
   @Test
-  public void testPreformat3() {
+  public void preformat3() {
     final SafeHtml o = html("A\n\n  Q\n    <R>\n  S\n\nB");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -69,7 +69,7 @@
   }
 
   @Test
-  public void testPreformat4() {
+  public void preformat4() {
     final SafeHtml o = html("  Q\n    <R>\n  S\n\nB");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java
index 766760f..d0c3ad2 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyQuoteTest.java
@@ -27,7 +27,7 @@
   }
 
   @Test
-  public void testQuote1() {
+  public void quote1() {
     final SafeHtml o = html("> I'm happy\n > with quotes!\n\nSee above.");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -37,7 +37,7 @@
   }
 
   @Test
-  public void testQuote2() {
+  public void quote2() {
     final SafeHtml o = html("See this said:\n\n > a quoted\n > string block\n\nOK?");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -48,7 +48,7 @@
   }
 
   @Test
-  public void testNestedQuotes1() {
+  public void nestedQuotes1() {
     final SafeHtml o = html(" > > prior\n > \n > next\n");
     final SafeHtml n = o.wikify();
     assertThat(n.asString()).isEqualTo(quote(quote("prior") + "next\n"));
diff --git a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java
index 8f6ff8d..c8341f4 100644
--- a/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java
+++ b/gerrit-gwtexpui/src/test/java/com/google/gwtexpui/safehtml/client/SafeHtml_WikifyTest.java
@@ -20,7 +20,7 @@
 
 public class SafeHtml_WikifyTest {
   @Test
-  public void testWikify_OneLine1() {
+  public void wikify_OneLine1() {
     final SafeHtml o = html("A  B");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -28,7 +28,7 @@
   }
 
   @Test
-  public void testWikify_OneLine2() {
+  public void wikify_OneLine2() {
     final SafeHtml o = html("A  B\n");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -36,7 +36,7 @@
   }
 
   @Test
-  public void testWikify_OneParagraph1() {
+  public void wikify_OneParagraph1() {
     final SafeHtml o = html("A\nB");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -44,7 +44,7 @@
   }
 
   @Test
-  public void testWikify_OneParagraph2() {
+  public void wikify_OneParagraph2() {
     final SafeHtml o = html("A\nB\n");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -52,7 +52,7 @@
   }
 
   @Test
-  public void testWikify_TwoParagraphs() {
+  public void wikify_TwoParagraphs() {
     final SafeHtml o = html("A\nB\n\nC\nD");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -60,7 +60,7 @@
   }
 
   @Test
-  public void testLinkify_SimpleHttp1() {
+  public void linkify_SimpleHttp1() {
     final SafeHtml o = html("A http://go.here/ B");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -70,7 +70,7 @@
   }
 
   @Test
-  public void testLinkify_SimpleHttps2() {
+  public void linkify_SimpleHttps2() {
     final SafeHtml o = html("A https://go.here/ B");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -80,7 +80,7 @@
   }
 
   @Test
-  public void testLinkify_Parens1() {
+  public void linkify_Parens1() {
     final SafeHtml o = html("A (http://go.here/) B");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -90,7 +90,7 @@
   }
 
   @Test
-  public void testLinkify_Parens() {
+  public void linkify_Parens() {
     final SafeHtml o = html("A http://go.here/#m() B");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
@@ -100,7 +100,7 @@
   }
 
   @Test
-  public void testLinkify_AngleBrackets1() {
+  public void linkify_AngleBrackets1() {
     final SafeHtml o = html("A <http://go.here/> B");
     final SafeHtml n = o.wikify();
     assertThat(o).isNotSameAs(n);
diff --git a/gerrit-gwtui-common/BUILD b/gerrit-gwtui-common/BUILD
index ac31856..46262d6 100644
--- a/gerrit-gwtui-common/BUILD
+++ b/gerrit-gwtui-common/BUILD
@@ -1,59 +1,62 @@
-load('//tools/bzl:java.bzl', 'java_library2')
-load('//tools/bzl:junit.bzl', 'junit_tests')
-load('//tools/bzl:gwt.bzl', 'gwt_module')
+load("//tools/bzl:java.bzl", "java_library2")
+load("//tools/bzl:junit.bzl", "junit_tests")
+load("//tools/bzl:gwt.bzl", "gwt_module")
 
 EXPORTED_DEPS = [
-  '//gerrit-common:client',
-  '//gerrit-gwtexpui:Clippy',
-  '//gerrit-gwtexpui:GlobalKey',
-  '//gerrit-gwtexpui:Progress',
-  '//gerrit-gwtexpui:SafeHtml',
-  '//gerrit-gwtexpui:UserAgent',
+    "//gerrit-common:client",
+    "//gerrit-gwtexpui:Clippy",
+    "//gerrit-gwtexpui:GlobalKey",
+    "//gerrit-gwtexpui:Progress",
+    "//gerrit-gwtexpui:SafeHtml",
+    "//gerrit-gwtexpui:UserAgent",
 ]
-DEPS = ['//lib/gwt:user-neverlink']
-SRC = 'src/main/java/com/google/gerrit/'
+
+DEPS = ["//lib/gwt:user-neverlink"]
+
+SRC = "src/main/java/com/google/gerrit/"
 
 gwt_module(
-  name = 'client',
-  srcs = glob(['src/main/**/*.java']),
-  gwt_xml = SRC + 'GerritGwtUICommon.gwt.xml',
-  resources = glob(
-      ['src/main/**/*'],
-      exclude = [SRC + 'client/**/*.java'] +
-      [SRC + 'GerritGwtUICommon.gwt.xml']
-  ),
-  exported_deps = EXPORTED_DEPS,
-  deps = DEPS,
-  visibility = ['//visibility:public'],
+    name = "client",
+    srcs = glob(["src/main/**/*.java"]),
+    exported_deps = EXPORTED_DEPS,
+    gwt_xml = SRC + "GerritGwtUICommon.gwt.xml",
+    resources = glob(
+        ["src/main/**/*"],
+        exclude = [SRC + "client/**/*.java"] + [
+            SRC + "GerritGwtUICommon.gwt.xml",
+        ],
+    ),
+    visibility = ["//visibility:public"],
+    deps = DEPS,
 )
 
 java_library2(
-  name = 'client-lib',
-  srcs = glob(['src/main/**/*.java']),
-  resources = glob(['src/main/**/*']),
-  exported_deps = EXPORTED_DEPS,
-  deps = DEPS,
-  visibility = ['//visibility:public'],
+    name = "client-lib",
+    srcs = glob(["src/main/**/*.java"]),
+    exported_deps = EXPORTED_DEPS,
+    resources = glob(["src/main/**/*"]),
+    visibility = ["//visibility:public"],
+    deps = DEPS,
 )
 
 java_library(
-  name = 'diffy_logo',
-  resources = glob(['src/main/resources/com/google/gerrit/client/diffy*.png']),
-  data = [
-    '//lib:LICENSE-diffy',
-    '//lib:LICENSE-CC-BY3.0-unported',
-  ],
-  visibility = ['//visibility:public'],
+    name = "diffy_logo",
+    data = [
+        "//lib:LICENSE-CC-BY3.0-unported",
+        "//lib:LICENSE-diffy",
+    ],
+    resources = glob(["src/main/resources/com/google/gerrit/client/diffy*.png"]),
+    visibility = ["//visibility:public"],
 )
 
 junit_tests(
-  name = 'client_tests',
-  srcs = glob(['src/test/java/**/*.java']),
-  deps = [
-    ':client',
-    '//lib:junit',
-    '//lib/gwt:dev',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-  ],
-  visibility = ['//visibility:public'],
+    name = "client_tests",
+    srcs = glob(["src/test/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":client",
+        "//lib:junit",
+        "//lib/gwt:dev",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
 )
diff --git a/gerrit-gwtui-common/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java b/gerrit-gwtui-common/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java
index 6705e51..23183f2 100644
--- a/gerrit-gwtui-common/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java
+++ b/gerrit-gwtui-common/src/test/java/com/google/gerrit/client/RelativeDateFormatterTest.java
@@ -36,19 +36,19 @@
   }
 
   @Test
-  public void testFuture() {
+  public void future() {
     assertFormat(-100, YEAR_IN_MILLIS, "in the future");
     assertFormat(-1, SECOND_IN_MILLIS, "in the future");
   }
 
   @Test
-  public void testFormatSeconds() {
+  public void formatSeconds() {
     assertFormat(1, SECOND_IN_MILLIS, "1 seconds ago");
     assertFormat(89, SECOND_IN_MILLIS, "89 seconds ago");
   }
 
   @Test
-  public void testFormatMinutes() {
+  public void formatMinutes() {
     assertFormat(90, SECOND_IN_MILLIS, "2 minutes ago");
     assertFormat(3, MINUTE_IN_MILLIS, "3 minutes ago");
     assertFormat(60, MINUTE_IN_MILLIS, "60 minutes ago");
@@ -56,33 +56,33 @@
   }
 
   @Test
-  public void testFormatHours() {
+  public void formatHours() {
     assertFormat(90, MINUTE_IN_MILLIS, "2 hours ago");
     assertFormat(149, MINUTE_IN_MILLIS, "2 hours ago");
     assertFormat(35, HOUR_IN_MILLIS, "35 hours ago");
   }
 
   @Test
-  public void testFormatDays() {
+  public void formatDays() {
     assertFormat(36, HOUR_IN_MILLIS, "2 days ago");
     assertFormat(13, DAY_IN_MILLIS, "13 days ago");
   }
 
   @Test
-  public void testFormatWeeks() {
+  public void formatWeeks() {
     assertFormat(14, DAY_IN_MILLIS, "2 weeks ago");
     assertFormat(69, DAY_IN_MILLIS, "10 weeks ago");
   }
 
   @Test
-  public void testFormatMonths() {
+  public void formatMonths() {
     assertFormat(70, DAY_IN_MILLIS, "2 months ago");
     assertFormat(75, DAY_IN_MILLIS, "3 months ago");
     assertFormat(364, DAY_IN_MILLIS, "12 months ago");
   }
 
   @Test
-  public void testFormatYearsMonths() {
+  public void formatYearsMonths() {
     assertFormat(366, DAY_IN_MILLIS, "1 year ago");
     assertFormat(380, DAY_IN_MILLIS, "1 year, 1 month ago");
     assertFormat(410, DAY_IN_MILLIS, "1 year, 2 months ago");
@@ -91,7 +91,7 @@
   }
 
   @Test
-  public void testFormatYears() {
+  public void formatYears() {
     assertFormat(5, YEAR_IN_MILLIS, "5 years ago");
     assertFormat(60, YEAR_IN_MILLIS, "60 years ago");
   }
diff --git a/gerrit-gwtui/BUILD b/gerrit-gwtui/BUILD
index 9e04609..721b646 100644
--- a/gerrit-gwtui/BUILD
+++ b/gerrit-gwtui/BUILD
@@ -1,31 +1,40 @@
-load('//tools/bzl:gwt.bzl', 'gwt_genrule', 'gen_ui_module',
-     'gwt_user_agent_permutations')
-load('//tools/bzl:license.bzl', 'license_test')
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load(
+    "//tools/bzl:gwt.bzl",
+    "gwt_genrule",
+    "gen_ui_module",
+    "gwt_user_agent_permutations",
+)
+load("//tools/bzl:license.bzl", "license_test")
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 gwt_genrule()
-gwt_genrule('_r')
 
-gen_ui_module(name = 'ui_module')
-gen_ui_module(name = 'ui_module', suffix = '_r')
+gwt_genrule("_r")
+
+gen_ui_module(name = "ui_module")
+
+gen_ui_module(
+    name = "ui_module",
+    suffix = "_r",
+)
 
 gwt_user_agent_permutations()
 
 license_test(
-  name = "ui_module_license_test",
-  target = ":ui_module",
+    name = "ui_module_license_test",
+    target = ":ui_module",
 )
 
 junit_tests(
-  name = 'ui_tests',
-  srcs = glob(['src/test/java/**/*.java']),
-  deps = [
-    ':ui_module',
-    '//gerrit-common:client',
-    '//gerrit-extension-api:client',
-    '//lib:junit',
-    '//lib/gwt:dev',
-    '//lib/gwt:user',
-  ],
-  visibility = ['//visibility:public'],
+    name = "ui_tests",
+    srcs = glob(["src/test/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":ui_module",
+        "//gerrit-common:client",
+        "//gerrit-extension-api:client",
+        "//lib:junit",
+        "//lib/gwt:dev",
+        "//lib/gwt:user",
+    ],
 )
diff --git a/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java b/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java
index 25c8270..8e59b10 100644
--- a/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java
+++ b/gerrit-gwtui/src/test/java/com/google/gerrit/client/diff/LineMapperTest.java
@@ -24,7 +24,7 @@
 public class LineMapperTest {
 
   @Test
-  public void testAppendCommon() {
+  public void appendCommon() {
     LineMapper mapper = new LineMapper();
     mapper.appendCommon(10);
     assertEquals(10, mapper.getLineA());
@@ -32,7 +32,7 @@
   }
 
   @Test
-  public void testAppendInsert() {
+  public void appendInsert() {
     LineMapper mapper = new LineMapper();
     mapper.appendInsert(10);
     assertEquals(0, mapper.getLineA());
@@ -40,7 +40,7 @@
   }
 
   @Test
-  public void testAppendDelete() {
+  public void appendDelete() {
     LineMapper mapper = new LineMapper();
     mapper.appendDelete(10);
     assertEquals(10, mapper.getLineA());
@@ -48,7 +48,7 @@
   }
 
   @Test
-  public void testFindInCommon() {
+  public void findInCommon() {
     LineMapper mapper = new LineMapper();
     mapper.appendCommon(10);
     assertEquals(new LineOnOtherInfo(9, true),
@@ -58,7 +58,7 @@
   }
 
   @Test
-  public void testFindAfterCommon() {
+  public void findAfterCommon() {
     LineMapper mapper = new LineMapper();
     mapper.appendCommon(10);
     assertEquals(new LineOnOtherInfo(10, true),
@@ -68,7 +68,7 @@
   }
 
   @Test
-  public void testFindInInsertGap() {
+  public void findInInsertGap() {
     LineMapper mapper = new LineMapper();
     mapper.appendInsert(10);
     assertEquals(new LineOnOtherInfo(-1, false),
@@ -76,7 +76,7 @@
   }
 
   @Test
-  public void testFindAfterInsertGap() {
+  public void findAfterInsertGap() {
     LineMapper mapper = new LineMapper();
     mapper.appendInsert(10);
     assertEquals(new LineOnOtherInfo(0, true),
@@ -86,7 +86,7 @@
   }
 
   @Test
-  public void testFindInDeleteGap() {
+  public void findInDeleteGap() {
     LineMapper mapper = new LineMapper();
     mapper.appendDelete(10);
     assertEquals(new LineOnOtherInfo(-1, false),
@@ -94,7 +94,7 @@
   }
 
   @Test
-  public void testFindAfterDeleteGap() {
+  public void findAfterDeleteGap() {
     LineMapper mapper = new LineMapper();
     mapper.appendDelete(10);
     assertEquals(new LineOnOtherInfo(0, true),
@@ -104,7 +104,7 @@
   }
 
   @Test
-  public void testReplaceWithInsertInB() {
+  public void replaceWithInsertInB() {
     // 0 c c
     // 1 a b
     // 2 a b
diff --git a/gerrit-httpd/BUILD b/gerrit-httpd/BUILD
index 7b20e70..6244b5b 100644
--- a/gerrit-httpd/BUILD
+++ b/gerrit-httpd/BUILD
@@ -1,76 +1,77 @@
 package(
-  default_visibility=["//visibility:public"]
+    default_visibility = ["//visibility:public"],
 )
 
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 SRCS = glob(
-  ['src/main/java/**/*.java'],
+    ["src/main/java/**/*.java"],
 )
-RESOURCES = glob(['src/main/resources/**/*'])
+
+RESOURCES = glob(["src/main/resources/**/*"])
 
 java_library(
-  name = 'httpd',
-  srcs = SRCS,
-  resources = RESOURCES,
-  deps = [
-    '//gerrit-antlr:query_exception',
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-gwtexpui:linker_server',
-    '//gerrit-gwtexpui:server',
-    '//gerrit-launcher:launcher',
-    '//gerrit-patch-jgit:server',
-    '//gerrit-prettify:server',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//gerrit-util-cli:cli',
-    '//gerrit-util-http:http',
-    '//lib:args4j',
-    '//lib:gson',
-    '//lib:guava',
-    '//lib:gwtjsonrpc',
-    '//lib:gwtorm',
-    '//lib:jsch',
-    '//lib:mime-util',
-    '//lib:servlet-api-3_1',
-    '//lib/auto:auto-value',
-    '//lib/commons:codec',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-servlet',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet',
-    '//lib/log:api',
-    '//lib/lucene:lucene-core-and-backward-codecs',
-  ],
-  visibility = ['//visibility:public'],
+    name = "httpd",
+    srcs = SRCS,
+    resources = RESOURCES,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-antlr:query_exception",
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-gwtexpui:linker_server",
+        "//gerrit-gwtexpui:server",
+        "//gerrit-launcher:launcher",
+        "//gerrit-patch-jgit:server",
+        "//gerrit-prettify:server",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//gerrit-util-cli:cli",
+        "//gerrit-util-http:http",
+        "//lib:args4j",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
+        "//lib:jsch",
+        "//lib:mime-util",
+        "//lib:servlet-api-3_1",
+        "//lib/auto:auto-value",
+        "//lib/commons:codec",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//lib/lucene:lucene-core-and-backward-codecs",
+    ],
 )
 
 junit_tests(
-  name = 'httpd_tests',
-  srcs = glob(['src/test/java/**/*.java']),
-  deps = [
-    ':httpd',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//gerrit-util-http:http',
-    '//gerrit-util-http:testutil',
-    '//lib:jimfs',
-    '//lib:junit',
-    '//lib:gson',
-    '//lib:gwtorm',
-    '//lib:guava',
-    '//lib:servlet-api-3_1-without-neverlink',
-    '//lib:truth',
-    '//lib/easymock:easymock',
-    '//lib/guice:guice',
-    '//lib/guice:guice-servlet',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/jgit/org.eclipse.jgit.junit:junit',
-    '//lib/joda:joda-time',
-  ],
+    name = "httpd_tests",
+    srcs = glob(["src/test/java/**/*.java"]),
+    deps = [
+        ":httpd",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//gerrit-util-http:http",
+        "//gerrit-util-http:testutil",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:jimfs",
+        "//lib:junit",
+        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib:truth",
+        "//lib/easymock",
+        "//lib/guice",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+        "//lib/joda:joda-time",
+    ],
 )
diff --git a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
index 6ccfc38..f19d1d8 100644
--- a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
+++ b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/AllRequestFilterFilterProxyTest.java
@@ -85,7 +85,7 @@
   }
 
   @Test
-  public void testNoFilters() throws Exception {
+  public void noFilters() throws Exception {
     EasyMockSupport ems = new EasyMockSupport();
 
     FilterConfig config = ems.createMock(FilterConfig.class);
@@ -107,7 +107,7 @@
   }
 
   @Test
-  public void testSingleFilterNoBubbling() throws Exception {
+  public void singleFilterNoBubbling() throws Exception {
     EasyMockSupport ems = new EasyMockSupport();
 
     FilterConfig config = ems.createMock("config", FilterConfig.class);
@@ -134,7 +134,7 @@
   }
 
   @Test
-  public void testSingleFilterBubbling() throws Exception {
+  public void singleFilterBubbling() throws Exception {
     EasyMockSupport ems = new EasyMockSupport();
 
     FilterConfig config = ems.createMock(FilterConfig.class);
@@ -166,7 +166,7 @@
   }
 
   @Test
-  public void testTwoFiltersNoBubbling() throws Exception {
+  public void twoFiltersNoBubbling() throws Exception {
     EasyMockSupport ems = new EasyMockSupport();
 
     FilterConfig config = ems.createMock(FilterConfig.class);
@@ -199,7 +199,7 @@
   }
 
   @Test
-  public void testTwoFiltersBubbling() throws Exception {
+  public void twoFiltersBubbling() throws Exception {
     EasyMockSupport ems = new EasyMockSupport();
 
     FilterConfig config = ems.createMock(FilterConfig.class);
@@ -239,7 +239,7 @@
   }
 
   @Test
-  public void testPostponedLoading() throws Exception {
+  public void postponedLoading() throws Exception {
     EasyMockSupport ems = new EasyMockSupport();
 
     FilterConfig config = ems.createMock(FilterConfig.class);
@@ -291,7 +291,7 @@
   }
 
   @Test
-  public void testDynamicUnloading() throws Exception {
+  public void dynamicUnloading() throws Exception {
     EasyMockSupport ems = new EasyMockSupport();
 
     FilterConfig config = ems.createMock(FilterConfig.class);
diff --git a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/plugins/ContextMapperTest.java b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/plugins/ContextMapperTest.java
index 9559e13..dbf9904 100644
--- a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/plugins/ContextMapperTest.java
+++ b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/plugins/ContextMapperTest.java
@@ -29,7 +29,7 @@
   private static final String RESOURCE = "my-resource";
 
   @Test
-  public void testUnauthorized() throws Exception {
+  public void unauthorized() throws Exception {
     ContextMapper classUnderTest = new ContextMapper(CONTEXT);
 
     HttpServletRequest originalRequest =
@@ -47,7 +47,7 @@
   }
 
   @Test
-  public void testAuthorized() throws Exception {
+  public void authorized() throws Exception {
     ContextMapper classUnderTest = new ContextMapper(CONTEXT);
 
     HttpServletRequest originalRequest =
diff --git a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java
index af90585..29f982e 100644
--- a/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java
+++ b/gerrit-httpd/src/test/java/com/google/gerrit/httpd/restapi/ParameterParserTest.java
@@ -27,7 +27,7 @@
 
 public class ParameterParserTest {
   @Test
-  public void testConvertFormToJson() throws BadRequestException {
+  public void convertFormToJson() throws BadRequestException {
     JsonObject obj = ParameterParser.formToJson(
         ImmutableMap.of(
             "message", new String[]{"this.is.text"},
diff --git a/gerrit-launcher/BUILD b/gerrit-launcher/BUILD
index cf1e788..33b779e 100644
--- a/gerrit-launcher/BUILD
+++ b/gerrit-launcher/BUILD
@@ -1,19 +1,19 @@
 # NOTE: GerritLauncher must be a single, self-contained class. Do not add any
 # additional srcs or deps to this rule.
 java_library(
-  name = 'launcher',
-  srcs = ['src/main/java/com/google/gerrit/launcher/GerritLauncher.java'],
-  resources = [':workspace-root.txt'],
-  visibility = ['//visibility:public'],
+    name = "launcher",
+    srcs = ["src/main/java/com/google/gerrit/launcher/GerritLauncher.java"],
+    resources = [":workspace-root.txt"],
+    visibility = ["//visibility:public"],
 )
 
 # The root of the workspace is non-hermetic, but we need it for
 # on-the-fly GWT recompiles and PolyGerrit updates.
 genrule(
-  name = 'gen_root',
-  stamp = 1,
-  cmd = ("cat bazel-out/stable-status.txt | " +
-    "grep STABLE_WORKSPACE_ROOT | cut -d ' ' -f 2 > $@"),
-  outs = ['workspace-root.txt'],
-  visibility = ['//visibility:public'],
+    name = "gen_root",
+    outs = ["workspace-root.txt"],
+    cmd = ("cat bazel-out/stable-status.txt | " +
+           "grep STABLE_WORKSPACE_ROOT | cut -d ' ' -f 2 > $@"),
+    stamp = 1,
+    visibility = ["//visibility:public"],
 )
diff --git a/gerrit-lucene/BUILD b/gerrit-lucene/BUILD
index 2f1cba7..5f87b4e 100644
--- a/gerrit-lucene/BUILD
+++ b/gerrit-lucene/BUILD
@@ -1,41 +1,44 @@
 QUERY_BUILDER = [
-  'src/main/java/com/google/gerrit/lucene/QueryBuilder.java',
+    "src/main/java/com/google/gerrit/lucene/QueryBuilder.java",
 ]
 
 java_library(
-  name = 'query_builder',
-  srcs = QUERY_BUILDER,
-  deps = [
-    '//gerrit-antlr:query_exception',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:gwtorm',
-    '//lib:guava',
-    '//lib/lucene:lucene-core-and-backward-codecs',
-  ],
-  visibility = ['//visibility:public'],
+    name = "query_builder",
+    srcs = QUERY_BUILDER,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-antlr:query_exception",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib/lucene:lucene-core-and-backward-codecs",
+    ],
 )
 
 java_library(
-  name = 'lucene',
-  srcs = glob(['src/main/java/**/*.java'], exclude = QUERY_BUILDER),
-  deps = [
-    ':query_builder',
-    '//gerrit-antlr:query_exception',
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:guava',
-    '//lib:gwtorm',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/log:api',
-    '//lib/lucene:lucene-analyzers-common',
-    '//lib/lucene:lucene-core-and-backward-codecs',
-    '//lib/lucene:lucene-misc',
-  ],
-  visibility = ['//visibility:public'],
+    name = "lucene",
+    srcs = glob(
+        ["src/main/java/**/*.java"],
+        exclude = QUERY_BUILDER,
+    ),
+    visibility = ["//visibility:public"],
+    deps = [
+        ":query_builder",
+        "//gerrit-antlr:query_exception",
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//lib/lucene:lucene-analyzers-common",
+        "//lib/lucene:lucene-core-and-backward-codecs",
+        "//lib/lucene:lucene-misc",
+    ],
 )
diff --git a/gerrit-main/BUILD b/gerrit-main/BUILD
index 67863c5..243a70b 100644
--- a/gerrit-main/BUILD
+++ b/gerrit-main/BUILD
@@ -1,13 +1,13 @@
 java_binary(
-  name = 'main_bin',
-  main_class = 'Main',
-  runtime_deps = [':main_lib'],
-  visibility = ['//visibility:public'],
+    name = "main_bin",
+    main_class = "Main",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":main_lib"],
 )
 
 java_library(
-  name = 'main_lib',
-  srcs = ['src/main/java/Main.java'],
-  deps = ['//gerrit-launcher:launcher'],
-  visibility = ['//visibility:public'],
+    name = "main_lib",
+    srcs = ["src/main/java/Main.java"],
+    visibility = ["//visibility:public"],
+    deps = ["//gerrit-launcher:launcher"],
 )
diff --git a/gerrit-oauth/BUILD b/gerrit-oauth/BUILD
index b2cf17b..b459c70 100644
--- a/gerrit-oauth/BUILD
+++ b/gerrit-oauth/BUILD
@@ -1,26 +1,27 @@
 SRCS = glob(
-  ['src/main/java/**/*.java'],
+    ["src/main/java/**/*.java"],
 )
-RESOURCES = glob(['src/main/resources/**/*'])
+
+RESOURCES = glob(["src/main/resources/**/*"])
 
 java_library(
-  name = 'oauth',
-  srcs = SRCS,
-  resources = RESOURCES,
-  deps = [
-    '//gerrit-common:annotations',
-    '//gerrit-extension-api:api',
-    '//gerrit-httpd:httpd',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:gson',
-    '//lib:guava',
-    '//lib:gwtorm',
-    '//lib/commons:codec',
-    '//lib/guice:guice',
-    '//lib/guice:guice-servlet',
-    '//lib/log:api',
-    '//lib:servlet-api-3_1',
-  ],
-  visibility = ['//visibility:public'],
+    name = "oauth",
+    srcs = SRCS,
+    resources = RESOURCES,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-common:annotations",
+        "//gerrit-extension-api:api",
+        "//gerrit-httpd:httpd",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:servlet-api-3_1",
+        "//lib/commons:codec",
+        "//lib/guice",
+        "//lib/guice:guice-servlet",
+        "//lib/log:api",
+    ],
 )
diff --git a/gerrit-openid/BUILD b/gerrit-openid/BUILD
index b5ae049..7b0d2b1 100644
--- a/gerrit-openid/BUILD
+++ b/gerrit-openid/BUILD
@@ -1,24 +1,25 @@
 java_library(
-  name = 'openid',
-  srcs = glob(['src/main/java/**/*.java']),
-  resources = glob(['src/main/resources/**/*']),
-  deps = [ # We want all these deps to be provided_deps
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-gwtexpui:server',
-    '//gerrit-httpd:httpd',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//lib:guava',
-    '//lib:gwtorm',
-    '//lib:servlet-api-3_1',
-    '//lib/commons:codec',
-    '//lib/guice:guice',
-    '//lib/guice:guice-servlet',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/log:api',
-    '//lib/openid:consumer',
-  ],
-  visibility = ['//visibility:public'],
+    name = "openid",
+    srcs = glob(["src/main/java/**/*.java"]),
+    resources = glob(["src/main/resources/**/*"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        # We want all these deps to be provided_deps
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-gwtexpui:server",
+        "//gerrit-httpd:httpd",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:servlet-api-3_1",
+        "//lib/commons:codec",
+        "//lib/guice",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//lib/openid:consumer",
+    ],
 )
diff --git a/gerrit-patch-commonsnet/BUILD b/gerrit-patch-commonsnet/BUILD
index c5e541d..7524bfe 100644
--- a/gerrit-patch-commonsnet/BUILD
+++ b/gerrit-patch-commonsnet/BUILD
@@ -1,11 +1,11 @@
 java_library(
-  name = 'commons-net',
-  srcs = glob(['src/main/java/org/apache/commons/net/**/*.java']),
-  deps = [
-    '//gerrit-util-ssl:ssl',
-    '//lib/commons:codec',
-    '//lib/commons:net',
-    '//lib/log:api',
-  ],
-  visibility = ['//visibility:public'],
+    name = "commons-net",
+    srcs = glob(["src/main/java/org/apache/commons/net/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-util-ssl:ssl",
+        "//lib/commons:codec",
+        "//lib/commons:net",
+        "//lib/log:api",
+    ],
 )
diff --git a/gerrit-patch-jgit/BUILD b/gerrit-patch-jgit/BUILD
index f908d83..e3d3cbd 100644
--- a/gerrit-patch-jgit/BUILD
+++ b/gerrit-patch-jgit/BUILD
@@ -1,66 +1,67 @@
-load('//tools/bzl:genrule2.bzl', 'genrule2')
-load('//tools/bzl:gwt.bzl', 'gwt_module')
+load("//tools/bzl:genrule2.bzl", "genrule2")
+load("//tools/bzl:gwt.bzl", "gwt_module")
 
-SRC = 'src/main/java/org/eclipse/jgit/'
+SRC = "src/main/java/org/eclipse/jgit/"
 
 gwt_module(
-  name = 'client',
-  srcs = [
-    SRC + 'diff/Edit_JsonSerializer.java',
-    SRC + 'diff/ReplaceEdit.java',
-  ],
-  gwt_xml = SRC + 'JGit.gwt.xml',
-  deps = [
-    ':Edit',
-    '//lib/gwt:user',
-    '//lib:gwtjsonrpc',
-  ],
-  visibility = ['//visibility:public'],
+    name = "client",
+    srcs = [
+        SRC + "diff/Edit_JsonSerializer.java",
+        SRC + "diff/ReplaceEdit.java",
+    ],
+    gwt_xml = SRC + "JGit.gwt.xml",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":Edit",
+        "//lib:gwtjsonrpc",
+        "//lib/gwt:user",
+    ],
 )
 
 gwt_module(
-  name = 'Edit',
-  srcs = [':jgit_edit_src'],
-  visibility = ['//visibility:public'],
+    name = "Edit",
+    srcs = [":jgit_edit_src"],
+    visibility = ["//visibility:public"],
 )
 
 genrule2(
-  name = 'jgit_edit_src',
-  cmd = ' && '.join([
-    'unzip -qd $$TMP $(location @jgit//jar:src) ' +
-      'org/eclipse/jgit/diff/Edit.java',
-    'cd $$TMP',
-    'zip -Dq $$ROOT/$@ org/eclipse/jgit/diff/Edit.java',
-  ]),
-  tools = ['@jgit//jar:src'],
-  outs = [ 'edit.srcjar' ],
+    name = "jgit_edit_src",
+    outs = ["edit.srcjar"],
+    cmd = " && ".join([
+        "unzip -qd $$TMP $(location @jgit//jar:src) " +
+        "org/eclipse/jgit/diff/Edit.java",
+        "cd $$TMP",
+        "zip -Dq $$ROOT/$@ org/eclipse/jgit/diff/Edit.java",
+    ]),
+    tools = ["@jgit//jar:src"],
 )
 
 java_library(
-  name = 'server',
-  srcs = [
-    SRC + x for x in [
-      'diff/EditDeserializer.java',
-      'diff/ReplaceEdit.java',
-      'internal/storage/file/WindowCacheStatAccessor.java',
-      'lib/ObjectIdSerialization.java',
-    ]
-  ],
-  deps = [
-    '//lib:gson',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-  ],
-  visibility = ['//visibility:public'],
+    name = "server",
+    srcs = [
+        SRC + x
+        for x in [
+            "diff/EditDeserializer.java",
+            "diff/ReplaceEdit.java",
+            "internal/storage/file/WindowCacheStatAccessor.java",
+            "lib/ObjectIdSerialization.java",
+        ]
+    ],
+    visibility = ["//visibility:public"],
+    deps = [
+        "//lib:gson",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
 )
 
 java_test(
-  name = 'jgit_patch_tests',
-  test_class = 'org.eclipse.jgit.diff.EditDeserializerTest',
-  srcs = glob(['src/test/java/**/*.java']),
-  deps = [
-    ':server',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib:junit',
-  ],
-  visibility = ['//visibility:public'],
+    name = "jgit_patch_tests",
+    srcs = glob(["src/test/java/**/*.java"]),
+    test_class = "org.eclipse.jgit.diff.EditDeserializerTest",
+    visibility = ["//visibility:public"],
+    deps = [
+        ":server",
+        "//lib:junit",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
 )
diff --git a/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java b/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java
index a2c3dae..c431715 100644
--- a/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java
+++ b/gerrit-patch-jgit/src/test/java/org/eclipse/jgit/diff/EditDeserializerTest.java
@@ -20,7 +20,7 @@
 
 public class EditDeserializerTest {
   @Test
-  public void testDiffDeserializer() {
+  public void diffDeserializer() {
     assertNotNull("edit deserializer", new EditDeserializer());
   }
 }
diff --git a/gerrit-pgm/BUILD b/gerrit-pgm/BUILD
index eef7dcb..a382fbf 100644
--- a/gerrit-pgm/BUILD
+++ b/gerrit-pgm/BUILD
@@ -1,169 +1,175 @@
-load('//tools/bzl:java.bzl', 'java_library2')
-load('//tools/bzl:junit.bzl', 'junit_tests')
-load('//tools/bzl:license.bzl', 'license_test')
+load("//tools/bzl:java.bzl", "java_library2")
+load("//tools/bzl:junit.bzl", "junit_tests")
+load("//tools/bzl:license.bzl", "license_test")
 
-SRCS = 'src/main/java/com/google/gerrit/pgm/'
-RSRCS = 'src/main/resources/com/google/gerrit/pgm/'
+SRCS = "src/main/java/com/google/gerrit/pgm/"
 
-INIT_API_SRCS = glob([SRCS + 'init/api/*.java'])
+RSRCS = "src/main/resources/com/google/gerrit/pgm/"
+
+INIT_API_SRCS = glob([SRCS + "init/api/*.java"])
 
 BASE_JETTY_DEPS = [
-  '//gerrit-common:server',
-  '//gerrit-extension-api:api',
-  '//gerrit-gwtexpui:linker_server',
-  '//gerrit-gwtexpui:server',
-  '//gerrit-httpd:httpd',
-  '//gerrit-server:server',
-  '//gerrit-sshd:sshd',
-  '//lib:guava',
-  '//lib/guice:guice',
-  '//lib/guice:guice-assistedinject',
-  '//lib/guice:guice-servlet',
-  '//lib/jgit/org.eclipse.jgit:jgit',
-  '//lib/joda:joda-time',
-  '//lib/log:api',
-  '//lib/log:log4j',
+    "//gerrit-common:server",
+    "//gerrit-extension-api:api",
+    "//gerrit-gwtexpui:linker_server",
+    "//gerrit-gwtexpui:server",
+    "//gerrit-httpd:httpd",
+    "//gerrit-server:server",
+    "//gerrit-sshd:sshd",
+    "//lib:guava",
+    "//lib/guice:guice",
+    "//lib/guice:guice-assistedinject",
+    "//lib/guice:guice-servlet",
+    "//lib/jgit/org.eclipse.jgit:jgit",
+    "//lib/joda:joda-time",
+    "//lib/log:api",
+    "//lib/log:log4j",
 ]
 
 DEPS = BASE_JETTY_DEPS + [
-  '//gerrit-reviewdb:server',
-  '//lib/log:jsonevent-layout',
+    "//gerrit-reviewdb:server",
+    "//lib/log:jsonevent-layout",
 ]
 
 java_library(
-  name = 'init-api',
-  srcs = INIT_API_SRCS,
-  deps = DEPS + ['//gerrit-common:annotations'],
-  visibility = ['//visibility:public'],
+    name = "init-api",
+    srcs = INIT_API_SRCS,
+    visibility = ["//visibility:public"],
+    deps = DEPS + ["//gerrit-common:annotations"],
 )
 
 java_library(
-  name = 'init',
-  srcs = glob([SRCS + 'init/*.java']),
-  resources = glob([RSRCS + 'init/*']),
-  deps = DEPS + [
-    ':init-api',
-    ':util',
-    '//gerrit-common:annotations',
-    '//gerrit-launcher:launcher', # We want this dep to be provided_deps
-    '//gerrit-lucene:lucene',
-    '//lib:args4j',
-    '//lib:derby',
-    '//lib:gwtjsonrpc',
-    '//lib:gwtorm',
-    '//lib:h2',
-    '//lib/commons:validator',
-    '//lib/mina:sshd',
-  ],
-  visibility = ['//visibility:public'],
+    name = "init",
+    srcs = glob([SRCS + "init/*.java"]),
+    resources = glob([RSRCS + "init/*"]),
+    visibility = ["//visibility:public"],
+    deps = DEPS + [
+        ":init-api",
+        ":util",
+        "//gerrit-common:annotations",
+        "//gerrit-launcher:launcher",  # We want this dep to be provided_deps
+        "//gerrit-lucene:lucene",
+        "//lib:args4j",
+        "//lib:derby",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
+        "//lib:h2",
+        "//lib/commons:validator",
+        "//lib/mina:sshd",
+    ],
 )
 
 REST_UTIL_DEPS = [
-  '//gerrit-cache-h2:cache-h2',
-  '//gerrit-util-cli:cli',
-  '//lib:args4j',
-  '//lib:gwtorm',
-  '//lib/commons:dbcp',
+    "//gerrit-cache-h2:cache-h2",
+    "//gerrit-util-cli:cli",
+    "//lib:args4j",
+    "//lib:gwtorm",
+    "//lib/commons:dbcp",
 ]
 
 java_library(
-  name = 'util',
-  exports = [':util-nodep'],
-  runtime_deps = DEPS + REST_UTIL_DEPS,
-  visibility = ['//visibility:public'],
+    name = "util",
+    visibility = ["//visibility:public"],
+    exports = [":util-nodep"],
+    runtime_deps = DEPS + REST_UTIL_DEPS,
 )
 
 java_library(
-  name = 'util-nodep',
-  srcs = glob([SRCS + 'util/*.java']),
-  deps = DEPS + REST_UTIL_DEPS, #  We want all these deps to be provided_deps
-  visibility = ['//visibility:public'],
+    name = "util-nodep",
+    srcs = glob([SRCS + "util/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = DEPS + REST_UTIL_DEPS,  #  We want all these deps to be provided_deps
 )
 
 JETTY_DEPS = [
-  '//lib/jetty:jmx',
-  '//lib/jetty:server',
-  '//lib/jetty:servlet',
+    "//lib/jetty:jmx",
+    "//lib/jetty:server",
+    "//lib/jetty:servlet",
 ]
 
 java_library(
-  name = 'http',
-  runtime_deps = DEPS + JETTY_DEPS,
-  exports = [':http-jetty'],
-  visibility = ['//visibility:public'],
+    name = "http",
+    visibility = ["//visibility:public"],
+    exports = [":http-jetty"],
+    runtime_deps = DEPS + JETTY_DEPS,
 )
 
 java_library(
-  name = 'http-jetty',
-  srcs = glob([SRCS + 'http/jetty/*.java']),
-  deps = JETTY_DEPS + BASE_JETTY_DEPS + [ # We want all these deps to be provided_deps
-    '//gerrit-launcher:launcher',
-    '//gerrit-reviewdb:client',
-    '//lib:servlet-api-3_1',
-  ],
-  visibility = ['//visibility:public'],
+    name = "http-jetty",
+    srcs = glob([SRCS + "http/jetty/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = JETTY_DEPS + BASE_JETTY_DEPS + [
+        # We want all these deps to be provided_deps
+        "//gerrit-launcher:launcher",
+        "//gerrit-reviewdb:client",
+        "//lib:servlet-api-3_1",
+    ],
 )
 
 REST_PGM_DEPS = [
-  ':http',
-  ':init',
-  ':init-api',
-  ':util',
-  '//gerrit-cache-h2:cache-h2',
-  '//gerrit-elasticsearch:elasticsearch',
-  '//gerrit-gpg:gpg',
-  '//gerrit-lucene:lucene',
-  '//gerrit-oauth:oauth',
-  '//gerrit-openid:openid',
-  '//lib:args4j',
-  '//lib:gwtorm',
-  '//lib:protobuf',
-  '//lib:servlet-api-3_1-without-neverlink',
-  '//lib/prolog:cafeteria',
-  '//lib/prolog:compiler',
-  '//lib/prolog:runtime',
+    ":http",
+    ":init",
+    ":init-api",
+    ":util",
+    "//gerrit-cache-h2:cache-h2",
+    "//gerrit-elasticsearch:elasticsearch",
+    "//gerrit-gpg:gpg",
+    "//gerrit-lucene:lucene",
+    "//gerrit-oauth:oauth",
+    "//gerrit-openid:openid",
+    "//lib:args4j",
+    "//lib:gwtorm",
+    "//lib:protobuf",
+    "//lib:servlet-api-3_1-without-neverlink",
+    "//lib/prolog:cafeteria",
+    "//lib/prolog:compiler",
+    "//lib/prolog:runtime",
 ]
 
 java_library(
-  name = 'pgm',
-  resources = glob([RSRCS + '*']),
-  runtime_deps = DEPS + REST_PGM_DEPS + [
-    ':daemon',
-  ],
-  visibility = ['//visibility:public'],
+    name = "pgm",
+    resources = glob([RSRCS + "*"]),
+    visibility = ["//visibility:public"],
+    runtime_deps = DEPS + REST_PGM_DEPS + [
+        ":daemon",
+    ],
 )
 
 # no transitive deps, used for gerrit-acceptance-framework
 java_library(
-  name = 'daemon',
-  srcs = glob([SRCS + '*.java', SRCS + 'rules/*.java']),
-  resources = glob([RSRCS + '*']),
-  deps = DEPS + REST_PGM_DEPS + [ # We want all these deps to be provided_deps
-    '//gerrit-launcher:launcher',
-    '//lib/auto:auto-value',
-  ],
-  visibility = ['//visibility:public'],
+    name = "daemon",
+    srcs = glob([
+        SRCS + "*.java",
+        SRCS + "rules/*.java",
+    ]),
+    resources = glob([RSRCS + "*"]),
+    visibility = ["//visibility:public"],
+    deps = DEPS + REST_PGM_DEPS + [
+        # We want all these deps to be provided_deps
+        "//gerrit-launcher:launcher",
+        "//lib/auto:auto-value",
+    ],
 )
 
 junit_tests(
-  name = 'pgm_tests',
-  srcs = glob(['src/test/java/**/*.java']),
-  deps = [
-    ':init',
-    ':init-api',
-    ':pgm',
-    '//gerrit-common:server',
-    '//gerrit-server:server',
-    '//lib:guava',
-    '//lib:junit',
-    '//lib/easymock:easymock',
-    '//lib/guice:guice',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/jgit/org.eclipse.jgit.junit:junit',
-  ],
+    name = "pgm_tests",
+    srcs = glob(["src/test/java/**/*.java"]),
+    deps = [
+        ":init",
+        ":init-api",
+        ":pgm",
+        "//gerrit-common:server",
+        "//gerrit-server:server",
+        "//lib:guava",
+        "//lib:junit",
+        "//lib/easymock",
+        "//lib/guice",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+    ],
 )
 
 license_test(
-  name = "pgm_license_test",
-  target = ":pgm",
+    name = "pgm_license_test",
+    target = ":pgm",
 )
diff --git a/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java b/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java
index 48754f1..115b0fd 100644
--- a/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java
+++ b/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/LibrariesTest.java
@@ -30,7 +30,7 @@
 
 public class LibrariesTest {
   @Test
-  public void testCreate() throws Exception {
+  public void create() throws Exception {
     final SitePaths site = new SitePaths(Paths.get("."));
     final ConsoleUI ui = createStrictMock(ConsoleUI.class);
 
diff --git a/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java b/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
index 89f61cc..76a3185 100644
--- a/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
+++ b/gerrit-pgm/src/test/java/com/google/gerrit/pgm/init/UpgradeFrom2_0_xTest.java
@@ -50,7 +50,7 @@
 public class UpgradeFrom2_0_xTest extends InitTestCase {
 
   @Test
-  public void testUpgrade() throws IOException, ConfigInvalidException {
+  public void upgrade() throws IOException, ConfigInvalidException {
     final Path p = newSitePath();
     final SitePaths site = new SitePaths(p);
     assertTrue(site.isNew);
diff --git a/gerrit-plugin-api/BUILD b/gerrit-plugin-api/BUILD
index e231a02..78f065b 100644
--- a/gerrit-plugin-api/BUILD
+++ b/gerrit-plugin-api/BUILD
@@ -1,107 +1,107 @@
 SRCS = [
-  'gerrit-server/src/main/java/',
-  'gerrit-httpd/src/main/java/',
-  'gerrit-sshd/src/main/java/',
+    "gerrit-server/src/main/java/",
+    "gerrit-httpd/src/main/java/",
+    "gerrit-sshd/src/main/java/",
 ]
 
 PLUGIN_API = [
-  '//gerrit-httpd:httpd',
-  '//gerrit-pgm:init-api',
-  '//gerrit-server:server',
-  '//gerrit-sshd:sshd',
+    "//gerrit-httpd:httpd",
+    "//gerrit-pgm:init-api",
+    "//gerrit-server:server",
+    "//gerrit-sshd:sshd",
 ]
 
 EXPORTS = [
-  '//gerrit-antlr:query_exception',
-  '//gerrit-antlr:query_parser',
-  '//gerrit-common:annotations',
-  '//gerrit-common:server',
-  '//gerrit-extension-api:api',
-  '//gerrit-gwtexpui:server',
-  '//gerrit-reviewdb:server',
-  '//lib/commons:lang',
-  '//lib/dropwizard:dropwizard-core',
-  '//lib/guice:guice',
-  '//lib/guice:guice-assistedinject',
-  '//lib/guice:guice-servlet',
-  '//lib/guice:javax-inject',
-  '//lib/guice:multibindings',
-  '//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet',
-  '//lib/jgit/org.eclipse.jgit:jgit',
-  '//lib/joda:joda-time',
-  '//lib/log:api',
-  '//lib/log:log4j',
-  '//lib/mina:sshd',
-  '//lib/ow2:ow2-asm',
-  '//lib/ow2:ow2-asm-analysis',
-  '//lib/ow2:ow2-asm-commons',
-  '//lib/ow2:ow2-asm-util',
-  '//lib:args4j',
-  '//lib:blame-cache',
-  '//lib:guava',
-  '//lib:gson',
-  '//lib:gwtorm',
-  '//lib:icu4j',
-  '//lib:jsch',
-  '//lib:mime-util',
-  '//lib:protobuf',
-  '//lib:servlet-api-3_1',
-  '//lib:soy',
-  '//lib:velocity',
+    "//gerrit-antlr:query_exception",
+    "//gerrit-antlr:query_parser",
+    "//gerrit-common:annotations",
+    "//gerrit-common:server",
+    "//gerrit-extension-api:api",
+    "//gerrit-gwtexpui:server",
+    "//gerrit-reviewdb:server",
+    "//lib/commons:lang",
+    "//lib/dropwizard:dropwizard-core",
+    "//lib/guice:guice",
+    "//lib/guice:guice-assistedinject",
+    "//lib/guice:guice-servlet",
+    "//lib/guice:javax-inject",
+    "//lib/guice:multibindings",
+    "//lib/jgit/org.eclipse.jgit.http.server:jgit-servlet",
+    "//lib/jgit/org.eclipse.jgit:jgit",
+    "//lib/joda:joda-time",
+    "//lib/log:api",
+    "//lib/log:log4j",
+    "//lib/mina:sshd",
+    "//lib/ow2:ow2-asm",
+    "//lib/ow2:ow2-asm-analysis",
+    "//lib/ow2:ow2-asm-commons",
+    "//lib/ow2:ow2-asm-util",
+    "//lib:args4j",
+    "//lib:blame-cache",
+    "//lib:guava",
+    "//lib:gson",
+    "//lib:gwtorm",
+    "//lib:icu4j",
+    "//lib:jsch",
+    "//lib:mime-util",
+    "//lib:protobuf",
+    "//lib:servlet-api-3_1",
+    "//lib:soy",
+    "//lib:velocity",
 ]
 
 java_binary(
-  name = 'plugin-api',
-  main_class = 'Dummy',
-  runtime_deps = [':lib'],
-  visibility = ['//visibility:public'],
+    name = "plugin-api",
+    main_class = "Dummy",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":lib"],
 )
 
 java_library(
-  name = 'lib',
-  exports = PLUGIN_API + EXPORTS,
-  visibility = ['//visibility:public'],
+    name = "lib",
+    visibility = ["//visibility:public"],
+    exports = PLUGIN_API + EXPORTS,
 )
 
 java_library(
-  name = 'lib-neverlink',
-  neverlink = 1,
-  exports = PLUGIN_API + EXPORTS,
-  visibility = ['//visibility:public'],
+    name = "lib-neverlink",
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = PLUGIN_API + EXPORTS,
 )
 
 java_binary(
-  name = 'plugin-api-sources',
-  main_class = 'Dummy',
-  runtime_deps = [
-    '//gerrit-antlr:libquery_exception-src.jar',
-    '//gerrit-antlr:libquery_parser-src.jar',
-    '//gerrit-common:libannotations-src.jar',
-    '//gerrit-extension-api:libapi-src.jar',
-    '//gerrit-gwtexpui:libserver-src.jar',
-    '//gerrit-httpd:libhttpd-src.jar',
-    '//gerrit-pgm:libinit-api-src.jar',
-    '//gerrit-reviewdb:libserver-src.jar',
-    '//gerrit-server:libserver-src.jar',
-    '//gerrit-sshd:libsshd-src.jar',
-  ],
-  visibility = ['//visibility:public'],
+    name = "plugin-api-sources",
+    main_class = "Dummy",
+    visibility = ["//visibility:public"],
+    runtime_deps = [
+        "//gerrit-antlr:libquery_exception-src.jar",
+        "//gerrit-antlr:libquery_parser-src.jar",
+        "//gerrit-common:libannotations-src.jar",
+        "//gerrit-extension-api:libapi-src.jar",
+        "//gerrit-gwtexpui:libserver-src.jar",
+        "//gerrit-httpd:libhttpd-src.jar",
+        "//gerrit-pgm:libinit-api-src.jar",
+        "//gerrit-reviewdb:libserver-src.jar",
+        "//gerrit-server:libserver-src.jar",
+        "//gerrit-sshd:libsshd-src.jar",
+    ],
 )
 
-load('//tools/bzl:javadoc.bzl', 'java_doc')
+load("//tools/bzl:javadoc.bzl", "java_doc")
 
 java_doc(
-  name = 'plugin-api-javadoc',
-  title = 'Gerrit Review Plugin API Documentation',
-  pkgs = ['com.google.gerrit'],
-  libs = PLUGIN_API + [
-    '//gerrit-antlr:query_exception',
-    '//gerrit-antlr:query_parser',
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-gwtexpui:server',
-    '//gerrit-reviewdb:server',
-  ],
-  visibility = ['//visibility:public'],
+    name = "plugin-api-javadoc",
+    libs = PLUGIN_API + [
+        "//gerrit-antlr:query_exception",
+        "//gerrit-antlr:query_parser",
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-gwtexpui:server",
+        "//gerrit-reviewdb:server",
+    ],
+    pkgs = ["com.google.gerrit"],
+    title = "Gerrit Review Plugin API Documentation",
+    visibility = ["//visibility:public"],
 )
diff --git a/gerrit-plugin-gwtui/BUILD b/gerrit-plugin-gwtui/BUILD
index 01d9385..f896050 100644
--- a/gerrit-plugin-gwtui/BUILD
+++ b/gerrit-plugin-gwtui/BUILD
@@ -1,78 +1,80 @@
-package(default_visibility = ['//visibility:public'])
-load('//tools/bzl:java.bzl', 'java_library2')
+package(default_visibility = ["//visibility:public"])
 
-SRCS = glob(['src/main/java/com/google/gerrit/**/*.java'])
-DEPS = ['//lib/gwt:user-neverlink']
+load("//tools/bzl:java.bzl", "java_library2")
+
+SRCS = glob(["src/main/java/com/google/gerrit/**/*.java"])
+
+DEPS = ["//lib/gwt:user-neverlink"]
 
 java_binary(
-  name = 'gwtui-api',
-  main_class = 'Dummy',
-  runtime_deps = [
-    ':gwtui-api-lib',
-    '//gerrit-gwtui-common:client-lib',
-  ],
+    name = "gwtui-api",
+    main_class = "Dummy",
+    runtime_deps = [
+        ":gwtui-api-lib",
+        "//gerrit-gwtui-common:client-lib",
+    ],
 )
 
 java_library2(
-  name = 'gwtui-api-lib',
-  srcs = SRCS,
-  resources = glob(['src/main/**/*']),
-  exported_deps = ['//gerrit-gwtui-common:client-lib'],
-  deps = DEPS + [
-    '//gerrit-common:libclient-src.jar',
-    '//gerrit-extension-api:libclient-src.jar',
-    '//gerrit-gwtexpui:libClippy-src.jar',
-    '//gerrit-gwtexpui:libGlobalKey-src.jar',
-    '//gerrit-gwtexpui:libProgress-src.jar',
-    '//gerrit-gwtexpui:libSafeHtml-src.jar',
-    '//gerrit-gwtexpui:libUserAgent-src.jar',
-    '//gerrit-gwtui-common:libclient-src.jar',
-    '//gerrit-patch-jgit:libclient-src.jar',
-    '//gerrit-patch-jgit:libEdit-src.jar',
-    '//gerrit-prettify:libclient-src.jar',
-    '//gerrit-reviewdb:libclient-src.jar',
-    '//lib/gwt:dev-neverlink',
-  ],
+    name = "gwtui-api-lib",
+    srcs = SRCS,
+    exported_deps = ["//gerrit-gwtui-common:client-lib"],
+    resources = glob(["src/main/**/*"]),
+    deps = DEPS + [
+        "//gerrit-common:libclient-src.jar",
+        "//gerrit-extension-api:libclient-src.jar",
+        "//gerrit-gwtexpui:libClippy-src.jar",
+        "//gerrit-gwtexpui:libGlobalKey-src.jar",
+        "//gerrit-gwtexpui:libProgress-src.jar",
+        "//gerrit-gwtexpui:libSafeHtml-src.jar",
+        "//gerrit-gwtexpui:libUserAgent-src.jar",
+        "//gerrit-gwtui-common:libclient-src.jar",
+        "//gerrit-patch-jgit:libclient-src.jar",
+        "//gerrit-patch-jgit:libEdit-src.jar",
+        "//gerrit-prettify:libclient-src.jar",
+        "//gerrit-reviewdb:libclient-src.jar",
+        "//lib/gwt:dev-neverlink",
+    ],
 )
 
 java_library2(
-  name = 'gwtui-api-lib-neverlink',
-  srcs = SRCS,
-  resources = glob(['src/main/**/*']),
-  exported_deps = ['//gerrit-gwtui-common:client-lib'],
-  neverlink = 1, # we want this to be exported deps
-  deps = DEPS + ['//lib/gwt:dev'],
+    name = "gwtui-api-lib-neverlink",
+    srcs = SRCS,
+    exported_deps = ["//gerrit-gwtui-common:client-lib"],
+    neverlink = 1,  # we want this to be exported deps
+    resources = glob(["src/main/**/*"]),
+    deps = DEPS + ["//lib/gwt:dev"],
 )
 
 java_binary(
-  name = 'gwtui-api-source',
-  main_class = 'Dummy',
-  runtime_deps = [
-    ':libgwtui-api-lib-src.jar',
-    '//gerrit-gwtexpui:client-src-lib',
-    '//gerrit-gwtui-common:libclient-lib-src.jar',
-  ],
+    name = "gwtui-api-source",
+    main_class = "Dummy",
+    runtime_deps = [
+        ":libgwtui-api-lib-src.jar",
+        "//gerrit-gwtexpui:client-src-lib",
+        "//gerrit-gwtui-common:libclient-lib-src.jar",
+    ],
 )
 
-load('//tools/bzl:javadoc.bzl', 'java_doc')
+load("//tools/bzl:javadoc.bzl", "java_doc")
 
 java_doc(
-  name = 'gwtui-api-javadoc',
-  title = 'Gerrit Review GWT Extension API Documentation',
-  pkgs = [
-    'com.google.gerrit.plugin',
-    'com.google.gwtexpui.clippy',
-    'com.google.gwtexpui.globalkey',
-    'com.google.gwtexpui.safehtml',
-    'com.google.gwtexpui.user',
-  ],
-  libs = DEPS + [
-    ':gwtui-api-lib',
-    '//lib:gwtjsonrpc',
-    '//lib:gwtorm_client',
-    '//lib/gwt:dev',
-    '//gerrit-gwtui-common:client-lib',
-    '//gerrit-common:client',
-    '//gerrit-reviewdb:client',
-  ],
+    name = "gwtui-api-javadoc",
+    libs = DEPS + [
+        ":gwtui-api-lib",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm_client",
+        "//lib/gwt:dev",
+        "//gerrit-gwtui-common:client-lib",
+        "//gerrit-common:client",
+        "//gerrit-reviewdb:client",
+    ],
+    pkgs = [
+        "com.google.gerrit.plugin",
+        "com.google.gwtexpui.clippy",
+        "com.google.gwtexpui.globalkey",
+        "com.google.gwtexpui.safehtml",
+        "com.google.gwtexpui.user",
+    ],
+    title = "Gerrit Review GWT Extension API Documentation",
 )
diff --git a/gerrit-prettify/BUILD b/gerrit-prettify/BUILD
index c21a6f4..18180b3 100644
--- a/gerrit-prettify/BUILD
+++ b/gerrit-prettify/BUILD
@@ -1,40 +1,40 @@
-load('//tools/bzl:gwt.bzl', 'gwt_module')
+load("//tools/bzl:gwt.bzl", "gwt_module")
 
-SRC = 'src/main/java/com/google/gerrit/prettify/'
+SRC = "src/main/java/com/google/gerrit/prettify/"
 
 gwt_module(
-  name = 'client',
-  srcs = glob([
-    SRC + 'common/**/*.java',
-  ]),
-  gwt_xml = SRC + 'PrettyFormatter.gwt.xml',
-  deps = ['//lib/gwt:user-neverlink'],
-  exported_deps = [
-    '//gerrit-extension-api:client',
-    '//gerrit-gwtexpui:SafeHtml',
-    '//gerrit-patch-jgit:client',
-    '//gerrit-patch-jgit:Edit',
-    '//gerrit-reviewdb:client',
-    '//lib:gwtjsonrpc',
-    '//lib:gwtjsonrpc_src',
-  ],
-  visibility = ['//visibility:public'],
+    name = "client",
+    srcs = glob([
+        SRC + "common/**/*.java",
+    ]),
+    exported_deps = [
+        "//gerrit-extension-api:client",
+        "//gerrit-gwtexpui:SafeHtml",
+        "//gerrit-patch-jgit:Edit",
+        "//gerrit-patch-jgit:client",
+        "//gerrit-reviewdb:client",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtjsonrpc_src",
+    ],
+    gwt_xml = SRC + "PrettyFormatter.gwt.xml",
+    visibility = ["//visibility:public"],
+    deps = ["//lib/gwt:user-neverlink"],
 )
 
 java_library(
-  name = 'server',
-  srcs = glob([SRC + 'common/**/*.java']),
-  deps = [
-    '//gerrit-patch-jgit:server',
-    '//gerrit-reviewdb:server',
-    '//lib:guava',
-    '//lib:gwtjsonrpc',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-  ],
-  visibility = ['//visibility:public'],
+    name = "server",
+    srcs = glob([SRC + "common/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-patch-jgit:server",
+        "//gerrit-reviewdb:server",
+        "//lib:guava",
+        "//lib:gwtjsonrpc",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
 )
 
 exports_files([
-  'src/main/resources/com/google/gerrit/prettify/client/prettify.css',
-  'src/main/resources/com/google/gerrit/prettify/client/prettify.js',
+    "src/main/resources/com/google/gerrit/prettify/client/prettify.css",
+    "src/main/resources/com/google/gerrit/prettify/client/prettify.js",
 ])
diff --git a/gerrit-reviewdb/BUILD b/gerrit-reviewdb/BUILD
index f9a7235..98af668 100644
--- a/gerrit-reviewdb/BUILD
+++ b/gerrit-reviewdb/BUILD
@@ -1,44 +1,45 @@
 package(
-  default_visibility=["//visibility:public"]
+    default_visibility = ["//visibility:public"],
 )
 
-load('//tools/bzl:gwt.bzl', 'gwt_module')
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:gwt.bzl", "gwt_module")
+load("//tools/bzl:junit.bzl", "junit_tests")
 
-SRC = 'src/main/java/com/google/gerrit/reviewdb/'
-TESTS = 'src/test/java/com/google/gerrit/reviewdb/'
+SRC = "src/main/java/com/google/gerrit/reviewdb/"
+
+TESTS = "src/test/java/com/google/gerrit/reviewdb/"
 
 gwt_module(
-  name = 'client',
-  srcs = glob([SRC + 'client/**/*.java']),
-  gwt_xml = SRC + 'ReviewDB.gwt.xml',
-  deps = [
-    '//gerrit-extension-api:client',
-    '//lib:gwtorm_client',
-    '//lib:gwtorm_client_src'
-  ],
-  visibility = ['//visibility:public'],
+    name = "client",
+    srcs = glob([SRC + "client/**/*.java"]),
+    gwt_xml = SRC + "ReviewDB.gwt.xml",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-extension-api:client",
+        "//lib:gwtorm_client",
+        "//lib:gwtorm_client_src",
+    ],
 )
 
 java_library(
-  name = 'server',
-  srcs = glob([SRC + '**/*.java']),
-  resources = glob(['src/main/resources/**/*']),
-  deps = [
-    '//gerrit-extension-api:api',
-    '//lib:guava',
-    '//lib:gwtorm',
-  ],
-  visibility = ['//visibility:public'],
+    name = "server",
+    srcs = glob([SRC + "**/*.java"]),
+    resources = glob(["src/main/resources/**/*"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-extension-api:api",
+        "//lib:guava",
+        "//lib:gwtorm",
+    ],
 )
 
 junit_tests(
-  name = 'client_tests',
-  srcs = glob([TESTS + 'client/**/*.java']),
-  deps = [
-    ':client',
-    '//gerrit-server:testutil',
-    '//lib:gwtorm',
-    '//lib:truth',
-  ],
+    name = "client_tests",
+    srcs = glob([TESTS + "client/**/*.java"]),
+    deps = [
+        ":client",
+        "//gerrit-server:testutil",
+        "//lib:gwtorm",
+        "//lib:truth",
+    ],
 )
diff --git a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountSshKeyTest.java b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountSshKeyTest.java
index 07c00b9..727ba8e 100644
--- a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountSshKeyTest.java
+++ b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/AccountSshKeyTest.java
@@ -34,7 +34,7 @@
   private final Account.Id accountId = new Account.Id(1);
 
   @Test
-  public void testValidity() throws Exception {
+  public void validity() throws Exception {
     AccountSshKey key = new AccountSshKey(
         new AccountSshKey.Id(accountId, -1), KEY);
     assertThat(key.isValid()).isFalse();
@@ -45,7 +45,7 @@
   }
 
   @Test
-  public void testGetters() throws Exception {
+  public void getters() throws Exception {
     AccountSshKey key = new AccountSshKey(
         new AccountSshKey.Id(accountId, 1), KEY);
     assertThat(key.getSshPublicKey()).isEqualTo(KEY);
@@ -55,7 +55,7 @@
   }
 
   @Test
-  public void testKeyWithNewLines() throws Exception {
+  public void keyWithNewLines() throws Exception {
     AccountSshKey key = new AccountSshKey(
         new AccountSshKey.Id(accountId, 1), KEY_WITH_NEWLINES);
     assertThat(key.getSshPublicKey()).isEqualTo(KEY);
diff --git a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetTest.java b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetTest.java
index 0f8aba6..7a4531b 100644
--- a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetTest.java
+++ b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/PatchSetTest.java
@@ -82,7 +82,7 @@
   }
 
   @Test
-  public void testToRefName() {
+  public void toRefName() {
     assertThat(new PatchSet.Id(new Change.Id(1), 23).toRefName())
         .isEqualTo("refs/changes/01/1/23");
     assertThat(new PatchSet.Id(new Change.Id(1234), 5).toRefName())
diff --git a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java
index 57cedd5..9bbfb33 100644
--- a/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java
+++ b/gerrit-reviewdb/src/test/java/com/google/gerrit/reviewdb/client/RefNamesTest.java
@@ -92,7 +92,7 @@
   }
 
   @Test
-  public void testParseShardedRefsPart() throws Exception {
+  public void testparseShardedRefsPart() throws Exception {
     assertThat(parseShardedRefPart("01/1")).isEqualTo(1);
     assertThat(parseShardedRefPart("01/1-drafts")).isEqualTo(1);
     assertThat(parseShardedRefPart("01/1-drafts/2")).isEqualTo(1);
diff --git a/gerrit-server/BUILD b/gerrit-server/BUILD
index d410865..b390f3e 100644
--- a/gerrit-server/BUILD
+++ b/gerrit-server/BUILD
@@ -1,240 +1,242 @@
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 CONSTANTS_SRC = [
-  'src/main/java/com/google/gerrit/server/documentation/Constants.java',
+    "src/main/java/com/google/gerrit/server/documentation/Constants.java",
 ]
 
 SRCS = glob(
-  ['src/main/java/**/*.java'],
-  exclude = CONSTANTS_SRC,
+    ["src/main/java/**/*.java"],
+    exclude = CONSTANTS_SRC,
 )
-RESOURCES =  glob(['src/main/resources/**/*'])
+
+RESOURCES = glob(["src/main/resources/**/*"])
 
 java_library(
-  name = 'constants',
-  srcs = CONSTANTS_SRC,
-  visibility = ['//visibility:public'],
+    name = "constants",
+    srcs = CONSTANTS_SRC,
+    visibility = ["//visibility:public"],
 )
 
 java_library(
-  name = 'server',
-  srcs = SRCS,
-  resources = RESOURCES,
-  deps = [
-    ':constants',
-    '//gerrit-antlr:query_exception',
-    '//gerrit-antlr:query_parser',
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//gerrit-patch-commonsnet:commons-net',
-    '//gerrit-patch-jgit:server',
-    '//gerrit-prettify:server',
-    '//gerrit-reviewdb:server',
-    '//gerrit-util-cli:cli',
-    '//gerrit-util-ssl:ssl',
-    '//lib:args4j',
-    '//lib:automaton',
-    '//lib:blame-cache',
-    '//lib:grappa',
-    '//lib:gson',
-    '//lib:guava',
-    '//lib:guava-retrying',
-    '//lib:gwtjsonrpc',
-    '//lib:gwtorm',
-    '//lib:jsch',
-    '//lib:juniversalchardet',
-    '//lib:mime-util',
-    '//lib:pegdown',
-    '//lib:protobuf',
-    '//lib:servlet-api-3_1',
-    '//lib:soy',
-    '//lib:tukaani-xz',
-    '//lib:velocity',
-    '//lib/antlr:java_runtime',
-    '//lib/auto:auto-value',
-    '//lib/commons:codec',
-    '//lib/commons:compress',
-    '//lib/commons:dbcp',
-    '//lib/commons:lang',
-    '//lib/commons:net',
-    '//lib/commons:validator',
-    '//lib/dropwizard:dropwizard-core',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-servlet',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/jgit/org.eclipse.jgit.archive:jgit-archive',
-    '//lib/joda:joda-time',
-    '//lib/log:api',
-    '//lib/log:jsonevent-layout',
-    '//lib/log:log4j',
-    '//lib/lucene:lucene-analyzers-common',
-    '//lib/lucene:lucene-core-and-backward-codecs',
-    '//lib/lucene:lucene-queryparser',
-    '//lib/mime4j:core',
-    '//lib/mime4j:dom',
-    '//lib/ow2:ow2-asm',
-    '//lib/ow2:ow2-asm-tree',
-    '//lib/ow2:ow2-asm-util',
-    '//lib/prolog:runtime',
-  ],
-  visibility = ['//visibility:public'],
+    name = "server",
+    srcs = SRCS,
+    resources = RESOURCES,
+    visibility = ["//visibility:public"],
+    deps = [
+        ":constants",
+        "//gerrit-antlr:query_exception",
+        "//gerrit-antlr:query_parser",
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-patch-commonsnet:commons-net",
+        "//gerrit-patch-jgit:server",
+        "//gerrit-prettify:server",
+        "//gerrit-reviewdb:server",
+        "//gerrit-util-cli:cli",
+        "//gerrit-util-ssl:ssl",
+        "//lib:args4j",
+        "//lib:automaton",
+        "//lib:blame-cache",
+        "//lib:grappa",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:guava-retrying",
+        "//lib:gwtjsonrpc",
+        "//lib:gwtorm",
+        "//lib:jsch",
+        "//lib:juniversalchardet",
+        "//lib:mime-util",
+        "//lib:pegdown",
+        "//lib:protobuf",
+        "//lib:servlet-api-3_1",
+        "//lib:soy",
+        "//lib:tukaani-xz",
+        "//lib:velocity",
+        "//lib/antlr:java_runtime",
+        "//lib/auto:auto-value",
+        "//lib/commons:codec",
+        "//lib/commons:compress",
+        "//lib/commons:dbcp",
+        "//lib/commons:lang",
+        "//lib/commons:net",
+        "//lib/commons:validator",
+        "//lib/dropwizard:dropwizard-core",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/joda:joda-time",
+        "//lib/log:api",
+        "//lib/log:jsonevent-layout",
+        "//lib/log:log4j",
+        "//lib/lucene:lucene-analyzers-common",
+        "//lib/lucene:lucene-core-and-backward-codecs",
+        "//lib/lucene:lucene-queryparser",
+        "//lib/mime4j:core",
+        "//lib/mime4j:dom",
+        "//lib/ow2:ow2-asm",
+        "//lib/ow2:ow2-asm-tree",
+        "//lib/ow2:ow2-asm-util",
+        "//lib/prolog:runtime",
+    ],
 )
 
 TESTUTIL_DEPS = [
-  ':server',
-  '//gerrit-common:server',
-  '//gerrit-cache-h2:cache-h2',
-  '//gerrit-extension-api:api',
-  '//gerrit-gpg:gpg',
-  '//gerrit-lucene:lucene',
-  '//gerrit-reviewdb:server',
-  '//lib:gwtorm',
-  '//lib:h2',
-  '//lib:truth',
-  '//lib/guice:guice',
-  '//lib/guice:guice-servlet',
-  '//lib/jgit/org.eclipse.jgit:jgit',
-  '//lib/jgit/org.eclipse.jgit.junit:junit',
-  '//lib/joda:joda-time',
-  '//lib/log:api',
-  '//lib/log:impl_log4j',
-  '//lib/log:log4j',
+    ":server",
+    "//gerrit-common:server",
+    "//gerrit-cache-h2:cache-h2",
+    "//gerrit-extension-api:api",
+    "//gerrit-gpg:gpg",
+    "//gerrit-lucene:lucene",
+    "//gerrit-reviewdb:server",
+    "//lib:gwtorm",
+    "//lib:h2",
+    "//lib:truth",
+    "//lib/guice:guice",
+    "//lib/guice:guice-servlet",
+    "//lib/jgit/org.eclipse.jgit:jgit",
+    "//lib/jgit/org.eclipse.jgit.junit:junit",
+    "//lib/joda:joda-time",
+    "//lib/log:api",
+    "//lib/log:impl_log4j",
+    "//lib/log:log4j",
 ]
 
 TESTUTIL = glob([
-  'src/test/java/com/google/gerrit/testutil/**/*.java',
-  'src/test/java/com/google/gerrit/server/project/Util.java',
+    "src/test/java/com/google/gerrit/testutil/**/*.java",
+    "src/test/java/com/google/gerrit/server/project/Util.java",
 ])
 
 java_library(
-  name = 'testutil',
-  srcs = TESTUTIL,
-  deps = TESTUTIL_DEPS + [
-    '//lib/auto:auto-value',
-    '//lib/easymock:easymock',
-    '//lib/powermock:powermock-api-easymock',
-    '//lib/powermock:powermock-api-support',
-    '//lib/powermock:powermock-core',
-    '//lib/powermock:powermock-module-junit4',
-    '//lib/powermock:powermock-module-junit4-common',
-  ],
-  exports = [
-    '//lib/easymock:easymock',
-    '//lib/powermock:powermock-api-easymock',
-    '//lib/powermock:powermock-api-support',
-    '//lib/powermock:powermock-core',
-    '//lib/powermock:powermock-module-junit4',
-    '//lib/powermock:powermock-module-junit4-common',
-  ],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "testutil",
+    testonly = 1,
+    srcs = TESTUTIL,
+    visibility = ["//visibility:public"],
+    exports = [
+        "//lib/easymock",
+        "//lib/powermock:powermock-api-easymock",
+        "//lib/powermock:powermock-api-support",
+        "//lib/powermock:powermock-core",
+        "//lib/powermock:powermock-module-junit4",
+        "//lib/powermock:powermock-module-junit4-common",
+    ],
+    deps = TESTUTIL_DEPS + [
+        "//lib/auto:auto-value",
+        "//lib/easymock:easymock",
+        "//lib/powermock:powermock-api-easymock",
+        "//lib/powermock:powermock-api-support",
+        "//lib/powermock:powermock-core",
+        "//lib/powermock:powermock-module-junit4",
+        "//lib/powermock:powermock-module-junit4-common",
+    ],
 )
 
 PROLOG_TEST_CASE = [
-  'src/test/java/com/google/gerrit/rules/PrologTestCase.java',
+    "src/test/java/com/google/gerrit/rules/PrologTestCase.java",
 ]
+
 PROLOG_TESTS = glob(
-  ['src/test/java/com/google/gerrit/rules/**/*.java'],
-  exclude = PROLOG_TEST_CASE,
+    ["src/test/java/com/google/gerrit/rules/**/*.java"],
+    exclude = PROLOG_TEST_CASE,
 )
 
 java_library(
-  name = 'prolog_test_case',
-  srcs = PROLOG_TEST_CASE,
-  deps = [
-    ':server',
-    ':testutil',
-    '//gerrit-common:server',
-    '//gerrit-extension-api:api',
-    '//lib:guava',
-    '//lib:junit',
-    '//lib:truth',
-    '//lib/guice:guice',
-    '//lib/prolog:runtime',
-  ],
-  testonly = 1,
+    name = "prolog_test_case",
+    testonly = 1,
+    srcs = PROLOG_TEST_CASE,
+    deps = [
+        ":server",
+        ":testutil",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//lib:guava",
+        "//lib:junit",
+        "//lib:truth",
+        "//lib/guice",
+        "//lib/prolog:runtime",
+    ],
 )
 
 junit_tests(
-  name = 'prolog_tests',
-  srcs = PROLOG_TESTS,
-  resources = glob(['src/test/resources/com/google/gerrit/rules/**/*']),
-  deps = TESTUTIL_DEPS + [
-    ':prolog_test_case',
-    ':testutil',
-    '//gerrit-server/src/main/prolog:common',
-    '//lib/prolog:runtime',
-  ],
+    name = "prolog_tests",
+    srcs = PROLOG_TESTS,
+    resources = glob(["src/test/resources/com/google/gerrit/rules/**/*"]),
+    deps = TESTUTIL_DEPS + [
+        ":prolog_test_case",
+        ":testutil",
+        "//gerrit-server/src/main/prolog:common",
+        "//lib/prolog:runtime",
+    ],
 )
 
 QUERY_TESTS = glob(
-  ['src/test/java/com/google/gerrit/server/query/**/*.java'],
+    ["src/test/java/com/google/gerrit/server/query/**/*.java"],
 )
 
 java_library(
-  name = 'query_tests_code',
-  srcs = QUERY_TESTS,
-  deps = TESTUTIL_DEPS + [
-    ':testutil',
-    '//gerrit-antlr:query_exception',
-    '//gerrit-antlr:query_parser',
-    '//gerrit-common:annotations',
-    '//gerrit-server/src/main/prolog:common',
-    '//lib/antlr:java_runtime',
-  ],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "query_tests_code",
+    testonly = 1,
+    srcs = QUERY_TESTS,
+    visibility = ["//visibility:public"],
+    deps = TESTUTIL_DEPS + [
+        ":testutil",
+        "//gerrit-antlr:query_exception",
+        "//gerrit-antlr:query_parser",
+        "//gerrit-common:annotations",
+        "//gerrit-server/src/main/prolog:common",
+        "//lib/antlr:java_runtime",
+    ],
 )
 
 junit_tests(
-  name = 'query_tests',
-  srcs = QUERY_TESTS,
-  size = "medium",
-  deps = TESTUTIL_DEPS + [
-    ':testutil',
-    '//gerrit-antlr:query_exception',
-    '//gerrit-antlr:query_parser',
-    '//gerrit-common:annotations',
-    '//gerrit-server/src/main/prolog:common',
-    '//lib/antlr:java_runtime',
-  ],
-  visibility = ['//visibility:public'],
+    name = "query_tests",
+    size = "medium",
+    srcs = QUERY_TESTS,
+    visibility = ["//visibility:public"],
+    deps = TESTUTIL_DEPS + [
+        ":testutil",
+        "//gerrit-antlr:query_exception",
+        "//gerrit-antlr:query_parser",
+        "//gerrit-common:annotations",
+        "//gerrit-server/src/main/prolog:common",
+        "//lib/antlr:java_runtime",
+    ],
 )
 
 junit_tests(
-  name = 'server_tests',
-  srcs = glob(
-    ['src/test/java/**/*.java'],
-    exclude = TESTUTIL + PROLOG_TESTS + PROLOG_TEST_CASE + QUERY_TESTS
-  ),
-  resources = glob(['src/test/resources/com/google/gerrit/server/mail/*']),
-  size = "medium",
-  deps = TESTUTIL_DEPS + [
-    ':testutil',
-    '//gerrit-antlr:query_exception',
-    '//gerrit-common:annotations',
-    '//gerrit-patch-jgit:server',
-    '//gerrit-server/src/main/prolog:common',
-    '//lib:args4j',
-    '//lib:grappa',
-    '//lib:gson',
-    '//lib:guava',
-    '//lib:guava-retrying',
-    '//lib:protobuf',
-    '//lib/dropwizard:dropwizard-core',
-    '//lib/guice:guice-assistedinject',
-    '//lib/prolog:runtime',
-  ],
-  visibility = ['//visibility:public'],
+    name = "server_tests",
+    size = "medium",
+    srcs = glob(
+        ["src/test/java/**/*.java"],
+        exclude = TESTUTIL + PROLOG_TESTS + PROLOG_TEST_CASE + QUERY_TESTS,
+    ),
+    resources = glob(["src/test/resources/com/google/gerrit/server/mail/*"]),
+    visibility = ["//visibility:public"],
+    deps = TESTUTIL_DEPS + [
+        ":testutil",
+        "//gerrit-antlr:query_exception",
+        "//gerrit-common:annotations",
+        "//gerrit-patch-jgit:server",
+        "//gerrit-server/src/main/prolog:common",
+        "//lib:args4j",
+        "//lib:grappa",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:guava-retrying",
+        "//lib:protobuf",
+        "//lib/dropwizard:dropwizard-core",
+        "//lib/guice:guice-assistedinject",
+        "//lib/prolog:runtime",
+    ],
 )
 
-load('//tools/bzl:javadoc.bzl', 'java_doc')
+load("//tools/bzl:javadoc.bzl", "java_doc")
 
 java_doc(
-  name = 'doc',
-  title = 'Gerrit Review Server Documentation',
-  libs = [':server'],
-  pkgs = ['com.google.gerrit'],
+    name = "doc",
+    libs = [":server"],
+    pkgs = ["com.google.gerrit"],
+    title = "Gerrit Review Server Documentation",
 )
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
index 4148e7a..4af066f 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/auth/ldap/LdapRealm.java
@@ -19,6 +19,7 @@
 import com.google.common.base.Strings;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
+import com.google.gerrit.common.data.GroupReference;
 import com.google.gerrit.common.data.ParameterizedString;
 import com.google.gerrit.extensions.client.AccountFieldName;
 import com.google.gerrit.extensions.client.AuthType;
@@ -30,6 +31,7 @@
 import com.google.gerrit.server.account.AccountException;
 import com.google.gerrit.server.account.AuthRequest;
 import com.google.gerrit.server.account.EmailExpander;
+import com.google.gerrit.server.account.GroupBackends;
 import com.google.gerrit.server.auth.AuthenticationUnavailableException;
 import com.google.gerrit.server.config.AuthConfig;
 import com.google.gerrit.server.config.GerritServerConfig;
@@ -70,6 +72,9 @@
   private final LoadingCache<String, Optional<Account.Id>> usernameCache;
   private final Set<AccountFieldName> readOnlyAccountFields;
   private final boolean fetchMemberOfEagerly;
+  private final String mandatoryGroup;
+  private final LdapGroupBackend groupBackend;
+
   private final Config config;
 
   private final LoadingCache<String, Set<AccountGroup.UUID>> membershipCache;
@@ -79,12 +84,14 @@
       Helper helper,
       AuthConfig authConfig,
       EmailExpander emailExpander,
+      LdapGroupBackend groupBackend,
       @Named(LdapModule.GROUP_CACHE) final LoadingCache<String, Set<AccountGroup.UUID>> membershipCache,
       @Named(LdapModule.USERNAME_CACHE) final LoadingCache<String, Optional<Account.Id>> usernameCache,
       @GerritServerConfig final Config config) {
     this.helper = helper;
     this.authConfig = authConfig;
     this.emailExpander = emailExpander;
+    this.groupBackend = groupBackend;
     this.usernameCache = usernameCache;
     this.membershipCache = membershipCache;
     this.config = config;
@@ -102,6 +109,7 @@
     }
 
     fetchMemberOfEagerly = optional(config, "fetchMemberOfEagerly", true);
+    mandatoryGroup = optional(config, "mandatoryGroup");
   }
 
   static SearchScope scope(final Config c, final String setting) {
@@ -263,8 +271,23 @@
         // in the middle of authenticating the user, its likely we will
         // need to know what access rights they have soon.
         //
-        if (fetchMemberOfEagerly) {
-          membershipCache.put(username, helper.queryForGroups(ctx, username, m));
+        if (fetchMemberOfEagerly || mandatoryGroup != null) {
+          Set<AccountGroup.UUID> groups = helper.queryForGroups(ctx, username, m);
+          if (mandatoryGroup != null) {
+            GroupReference mandatoryGroupRef =
+                GroupBackends.findExactSuggestion(groupBackend, mandatoryGroup);
+            if (mandatoryGroupRef == null) {
+              throw new AccountException("Could not identify mandatory group: " +
+                  mandatoryGroup);
+            }
+            if (!groups.contains(mandatoryGroupRef.getUUID())) {
+              throw new AccountException("Not member of mandatory LDAP group: " +
+                  mandatoryGroupRef.getName());
+            }
+          }
+          // Regardless if we enabled fetchMemberOfEagerly, we already have the
+          // groups and it would be a waste not to cache them.
+          membershipCache.put(username, groups);
         }
         return who;
       } finally {
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java
index 7168b1b2..db23967 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/BranchResource.java
@@ -19,7 +19,7 @@
 import com.google.gerrit.reviewdb.client.Branch;
 import com.google.inject.TypeLiteral;
 
-public class BranchResource extends ProjectResource {
+public class BranchResource extends RefResource {
   public static final TypeLiteral<RestView<BranchResource>> BRANCH_KIND =
       new TypeLiteral<RestView<BranchResource>>() {};
 
@@ -38,10 +38,12 @@
     return new Branch.NameKey(getNameKey(), branchInfo.ref);
   }
 
+  @Override
   public String getRef() {
     return branchInfo.ref;
   }
 
+  @Override
   public String getRevision() {
     return branchInfo.revision;
   }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/RefResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/RefResource.java
new file mode 100644
index 0000000..9300d43
--- /dev/null
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/RefResource.java
@@ -0,0 +1,32 @@
+// Copyright (C) 2016 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.server.project;
+
+public abstract class RefResource extends ProjectResource {
+
+  public RefResource(ProjectControl control) {
+    super(control);
+  }
+
+  /**
+   * @return the ref's name
+   */
+  public abstract String getRef();
+
+  /**
+   * @return the ref's revision
+   */
+  public abstract String getRevision();
+}
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/TagResource.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/TagResource.java
index afbd3be..fe4d68d 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/project/TagResource.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/TagResource.java
@@ -18,18 +18,28 @@
 import com.google.gerrit.extensions.restapi.RestView;
 import com.google.inject.TypeLiteral;
 
-public class TagResource extends ProjectResource {
+public class TagResource extends RefResource {
   public static final TypeLiteral<RestView<TagResource>> TAG_KIND =
       new TypeLiteral<RestView<TagResource>>() {};
 
-  private final TagInfo tag;
+  private final TagInfo tagInfo;
 
-  public TagResource(ProjectControl control, TagInfo tag) {
+  public TagResource(ProjectControl control, TagInfo tagInfo) {
     super(control);
-    this.tag = tag;
+    this.tagInfo = tagInfo;
   }
 
   public TagInfo getTagInfo() {
-    return tag;
+    return tagInfo;
+  }
+
+  @Override
+  public String getRef() {
+    return tagInfo.ref;
+  }
+
+  @Override
+  public String getRevision() {
+    return tagInfo.revision;
   }
 }
diff --git a/gerrit-server/src/main/prolog/BUILD b/gerrit-server/src/main/prolog/BUILD
index 555cd90..603a0bf 100644
--- a/gerrit-server/src/main/prolog/BUILD
+++ b/gerrit-server/src/main/prolog/BUILD
@@ -1,8 +1,8 @@
-load('//lib/prolog:prolog.bzl', 'prolog_cafe_library')
+load("//lib/prolog:prolog.bzl", "prolog_cafe_library")
 
 prolog_cafe_library(
-  name = 'common',
-  srcs = ['gerrit_common.pl'],
-  deps = ['//gerrit-server:server'],
-  visibility = ['//visibility:public'],
+    name = "common",
+    srcs = ["gerrit_common.pl"],
+    visibility = ["//visibility:public"],
+    deps = ["//gerrit-server:server"],
 )
diff --git a/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java b/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java
index aa4c4eb..70ad137 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/metrics/proc/ProcMetricModuleTest.java
@@ -54,13 +54,13 @@
   MetricRegistry registry;
 
   @Test
-  public void testConstantBuildLabel() {
+  public void constantBuildLabel() {
     Gauge<String> buildLabel = gauge("build/label");
     assertThat(buildLabel.getValue()).isEqualTo(Version.getVersion());
   }
 
   @Test
-  public void testProcUptime() {
+  public void procUptime() {
     Gauge<Long> birth = gauge("proc/birth_timestamp");
     assertThat(birth.getValue()).isAtMost(
         TimeUnit.MILLISECONDS.toMicros(System.currentTimeMillis()));
@@ -70,7 +70,7 @@
   }
 
   @Test
-  public void testCounter0() {
+  public void counter0() {
     Counter0 cntr = metrics.newCounter(
         "test/count",
         new Description("simple test")
@@ -87,7 +87,7 @@
   }
 
   @Test
-  public void testCounter1() {
+  public void counter1() {
     Counter1<String> cntr = metrics.newCounter(
         "test/count",
         new Description("simple test")
@@ -110,7 +110,7 @@
   }
 
   @Test
-  public void testCounterPrefixFields() {
+  public void counterPrefixFields() {
     Counter1<String> cntr = metrics.newCounter(
         "test/count",
         new Description("simple test")
@@ -134,7 +134,7 @@
   }
 
   @Test
-  public void testCallbackMetric0() {
+  public void callbackMetric0() {
     final CallbackMetric0<Long> cntr = metrics.newCallbackMetric(
         "test/count",
         Long.class,
@@ -161,13 +161,13 @@
   }
 
   @Test
-  public void testInvalidName1() {
+  public void invalidName1() {
     exception.expect(IllegalArgumentException.class);
     metrics.newCounter("invalid name", new Description("fail"));
   }
 
   @Test
-  public void testInvalidName2() {
+  public void invalidName2() {
     exception.expect(IllegalArgumentException.class);
     metrics.newCounter("invalid/ name", new Description("fail"));
   }
diff --git a/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java b/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java
index e23867f..279ad61 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/rules/GerritCommonTest.java
@@ -70,12 +70,12 @@
   }
 
   @Test
-  public void testGerritCommon() {
+  public void gerritCommon() {
     runPrologBasedTests();
   }
 
   @Test
-  public void testReductionLimit() throws CompileException {
+  public void reductionLimit() throws CompileException {
     PrologEnvironment env = envFactory.create(machine);
     setUpEnvironment(env);
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java
index 0d2de399..c746c63 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/IdentifiedUserTest.java
@@ -111,7 +111,7 @@
   }
 
   @Test
-  public void testEmailsExistence() {
+  public void emailsExistence() {
     assertThat(identifiedUser.hasEmailAddress(TEST_CASES[0])).isTrue();
     assertThat(identifiedUser.hasEmailAddress(TEST_CASES[1].toLowerCase())).isTrue();
     assertThat(identifiedUser.hasEmailAddress(TEST_CASES[1])).isTrue();
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java
index 0646eef0..ed42c40 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/StringUtilTest.java
@@ -24,7 +24,7 @@
    * should be escaped.
    */
   @Test
-  public void testEscapeFirstChar() {
+  public void escapeFirstChar() {
     assertEquals(StringUtil.escapeString("\tLeading tab"), "\\tLeading tab");
   }
 
@@ -33,7 +33,7 @@
    * should be escaped.
    */
   @Test
-  public void testEscapeLastChar() {
+  public void escapeLastChar() {
     assertEquals(StringUtil.escapeString("Trailing tab\t"), "Trailing tab\\t");
   }
 
@@ -42,7 +42,7 @@
    * in the expected way.
    */
   @Test
-  public void testEscapeString() {
+  public void escapeString() {
     final String[] testPairs =
       { "", "",
         "plain string", "plain string",
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/account/AuthorizedKeysTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/account/AuthorizedKeysTest.java
index 2a86401..585dd04 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/account/AuthorizedKeysTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/account/AuthorizedKeysTest.java
@@ -85,7 +85,7 @@
   }
 
   @Test
-  public void testParseWindowsLineEndings() throws Exception {
+  public void parseWindowsLineEndings() throws Exception {
     List<Optional<AccountSshKey>> keys = new ArrayList<>();
     StringBuilder authorizedKeys = new StringBuilder();
     authorizedKeys.append(toWindowsLineEndings(addKey(keys, KEY1)));
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java
index b9514e1..f3269c5 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/account/UniversalGroupBackendTest.java
@@ -62,14 +62,14 @@
   }
 
   @Test
-  public void testHandles() {
+  public void handles() {
     assertTrue(backend.handles(ANONYMOUS_USERS));
     assertTrue(backend.handles(PROJECT_OWNERS));
     assertFalse(backend.handles(OTHER_UUID));
   }
 
   @Test
-  public void testGet() {
+  public void get() {
     assertEquals("Registered Users",
         backend.get(REGISTERED_USERS).getName());
     assertEquals("Project Owners",
@@ -78,14 +78,14 @@
   }
 
   @Test
-  public void testSuggest() {
+  public void suggest() {
     assertTrue(backend.suggest("X", null).isEmpty());
     assertEquals(1, backend.suggest("project", null).size());
     assertEquals(1, backend.suggest("reg", null).size());
   }
 
   @Test
-  public void testSytemGroupMemberships() {
+  public void sytemGroupMemberships() {
     GroupMembership checker = backend.membershipsOf(user);
     assertTrue(checker.contains(REGISTERED_USERS));
     assertFalse(checker.contains(OTHER_UUID));
@@ -93,7 +93,7 @@
   }
 
   @Test
-  public void testKnownGroups() {
+  public void knownGroups() {
     GroupMembership checker = backend.membershipsOf(user);
     Set<UUID> knownGroups = checker.getKnownGroups();
     assertEquals(2, knownGroups.size());
@@ -102,7 +102,7 @@
   }
 
   @Test
-  public void testOtherMemberships() {
+  public void otherMemberships() {
     final AccountGroup.UUID handled = new AccountGroup.UUID("handled");
     final AccountGroup.UUID notHandled = new AccountGroup.UUID("not handled");
     final IdentifiedUser member = createNiceMock(IdentifiedUser.class);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java
index 6282415..8f7e5b2 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/ConfigUtilTest.java
@@ -75,7 +75,7 @@
   }
 
   @Test
-  public void testStoreLoadSection() throws Exception {
+  public void storeLoadSection() throws Exception {
     SectionInfo d = SectionInfo.defaults();
     SectionInfo in = new SectionInfo();
     in.missing = "42";
@@ -142,7 +142,7 @@
   }
 
   @Test
-  public void testTimeUnit() {
+  public void timeUnit() {
     assertEquals(ms(0, MILLISECONDS), parse("0"));
     assertEquals(ms(2, MILLISECONDS), parse("2ms"));
     assertEquals(ms(200, MILLISECONDS), parse("200 milliseconds"));
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/GitwebConfigTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/GitwebConfigTest.java
index 12e563f..ab7da99 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/config/GitwebConfigTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/GitwebConfigTest.java
@@ -25,14 +25,14 @@
   private static final String SOME_INVALID_CHARACTERS = "09AZaz$-_.+!',";
 
   @Test
-  public void testValidPathSeparator() {
+  public void validPathSeparator() {
     for (char c : VALID_CHARACTERS.toCharArray()) {
       assertTrue("valid character rejected: " + c, GitwebConfig.isValidPathSeparator(c));
     }
   }
 
   @Test
-  public void testInalidPathSeparator() {
+  public void inalidPathSeparator() {
     for (char c : SOME_INVALID_CHARACTERS.toCharArray()) {
       assertFalse("invalid character accepted: " + c, GitwebConfig.isValidPathSeparator(c));
     }
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ListCapabilitiesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/ListCapabilitiesTest.java
index 992502f..bd9f463 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/config/ListCapabilitiesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/ListCapabilitiesTest.java
@@ -55,7 +55,7 @@
   }
 
   @Test
-  public void testList() throws Exception {
+  public void list() throws Exception {
     Map<String, CapabilityInfo> m =
         injector.getInstance(ListCapabilities.class)
             .apply(new ConfigResource());
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/RepositoryConfigTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/RepositoryConfigTest.java
index cfa1f5e..88eec7e 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/config/RepositoryConfigTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/RepositoryConfigTest.java
@@ -40,13 +40,13 @@
   }
 
   @Test
-  public void testDefaultSubmitTypeWhenNotConfigured() {
+  public void defaultSubmitTypeWhenNotConfigured() {
     assertThat(repoCfg.getDefaultSubmitType(new NameKey("someProject")))
         .isEqualTo(SubmitType.MERGE_IF_NECESSARY);
   }
 
   @Test
-  public void testDefaultSubmitTypeForStarFilter() {
+  public void defaultSubmitTypeForStarFilter() {
     configureDefaultSubmitType("*", SubmitType.CHERRY_PICK);
     assertThat(repoCfg.getDefaultSubmitType(new NameKey("someProject")))
         .isEqualTo(SubmitType.CHERRY_PICK);
@@ -65,7 +65,7 @@
   }
 
   @Test
-  public void testDefaultSubmitTypeForSpecificFilter() {
+  public void defaultSubmitTypeForSpecificFilter() {
     configureDefaultSubmitType("someProject", SubmitType.CHERRY_PICK);
     assertThat(repoCfg.getDefaultSubmitType(new NameKey("someOtherProject")))
         .isEqualTo(SubmitType.MERGE_IF_NECESSARY);
@@ -74,7 +74,7 @@
   }
 
   @Test
-  public void testDefaultSubmitTypeForStartWithFilter() {
+  public void defaultSubmitTypeForStartWithFilter() {
     configureDefaultSubmitType("somePath/somePath/*",
         SubmitType.REBASE_IF_NECESSARY);
     configureDefaultSubmitType("somePath/*", SubmitType.CHERRY_PICK);
@@ -100,12 +100,12 @@
   }
 
   @Test
-  public void testOwnerGroupsWhenNotConfigured() {
+  public void ownerGroupsWhenNotConfigured() {
     assertThat(repoCfg.getOwnerGroups(new NameKey("someProject"))).isEmpty();
   }
 
   @Test
-  public void testOwnerGroupsForStarFilter() {
+  public void ownerGroupsForStarFilter() {
     ImmutableList<String> ownerGroups = ImmutableList.of("group1", "group2");
     configureOwnerGroups("*", ownerGroups);
     assertThat(repoCfg.getOwnerGroups(new NameKey("someProject")))
@@ -113,7 +113,7 @@
   }
 
   @Test
-  public void testOwnerGroupsForSpecificFilter() {
+  public void ownerGroupsForSpecificFilter() {
     ImmutableList<String> ownerGroups = ImmutableList.of("group1", "group2");
     configureOwnerGroups("someProject", ownerGroups);
     assertThat(repoCfg.getOwnerGroups(new NameKey("someOtherProject")))
@@ -123,7 +123,7 @@
   }
 
   @Test
-  public void testOwnerGroupsForStartWithFilter() {
+  public void ownerGroupsForStartWithFilter() {
     ImmutableList<String> ownerGroups1 = ImmutableList.of("group1");
     ImmutableList<String> ownerGroups2 = ImmutableList.of("group2");
     ImmutableList<String> ownerGroups3 = ImmutableList.of("group3");
@@ -150,12 +150,12 @@
   }
 
   @Test
-  public void testBasePathWhenNotConfigured() {
+  public void basePathWhenNotConfigured() {
     assertThat((Object)repoCfg.getBasePath(new NameKey("someProject"))).isNull();
   }
 
   @Test
-  public void testBasePathForStarFilter() {
+  public void basePathForStarFilter() {
     String basePath = "/someAbsolutePath/someDirectory";
     configureBasePath("*", basePath);
     assertThat(repoCfg.getBasePath(new NameKey("someProject")).toString())
@@ -163,7 +163,7 @@
   }
 
   @Test
-  public void testBasePathForSpecificFilter() {
+  public void basePathForSpecificFilter() {
     String basePath = "/someAbsolutePath/someDirectory";
     configureBasePath("someProject", basePath);
     assertThat((Object) repoCfg.getBasePath(new NameKey("someOtherProject")))
@@ -173,7 +173,7 @@
   }
 
   @Test
-  public void testBasePathForStartWithFilter() {
+  public void basePathForStartWithFilter() {
     String basePath1 = "/someAbsolutePath1/someDirectory";
     String basePath2 = "someRelativeDirectory2";
     String basePath3 = "/someAbsolutePath3/someDirectory";
@@ -196,7 +196,7 @@
   }
 
   @Test
-  public void testAllBasePath() {
+  public void allBasePath() {
     ImmutableList<Path> allBasePaths = ImmutableList.of(
         Paths.get("/someBasePath1"),
         Paths.get("/someBasePath2"),
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/ScheduleConfigTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/ScheduleConfigTest.java
index d5f68cc..e93de50 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/config/ScheduleConfigTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/ScheduleConfigTest.java
@@ -32,7 +32,7 @@
   private static final DateTime NOW = DateTime.parse("2014-06-13T10:00:00-00:00");
 
   @Test
-  public void testInitialDelay() throws Exception {
+  public void initialDelay() throws Exception {
     assertEquals(ms(1, HOURS), initialDelay("11:00", "1h"));
     assertEquals(ms(30, MINUTES), initialDelay("05:30", "1h"));
     assertEquals(ms(30, MINUTES), initialDelay("09:30", "1h"));
@@ -56,7 +56,7 @@
   }
 
   @Test
-  public void testCustomKeys() {
+  public void customKeys() {
     Config rc = new Config();
     rc.setString("a", "b", "i", "1h");
     rc.setString("a", "b", "s", "01:00");
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java
index 8cdd42b..29a7dde 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/config/SitePathsTest.java
@@ -33,7 +33,7 @@
 
 public class SitePathsTest extends GerritBaseTests {
   @Test
-  public void testCreate_NotExisting() throws IOException {
+  public void create_NotExisting() throws IOException {
     final Path root = random();
     final SitePaths site = new SitePaths(root);
     assertTrue(site.isNew);
@@ -42,7 +42,7 @@
   }
 
   @Test
-  public void testCreate_Empty() throws IOException {
+  public void create_Empty() throws IOException {
     final Path root = random();
     try {
       Files.createDirectory(root);
@@ -56,7 +56,7 @@
   }
 
   @Test
-  public void testCreate_NonEmpty() throws IOException {
+  public void create_NonEmpty() throws IOException {
     final Path root = random();
     final Path txt = root.resolve("test.txt");
     try {
@@ -73,7 +73,7 @@
   }
 
   @Test
-  public void testCreate_NotDirectory() throws IOException {
+  public void create_NotDirectory() throws IOException {
     final Path root = random();
     try {
       Files.createFile(root);
@@ -85,7 +85,7 @@
   }
 
   @Test
-  public void testResolve() throws IOException {
+  public void resolve() throws IOException {
     final Path root = random();
     final SitePaths site = new SitePaths(root);
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java
index 6a006cd..b6e73ff 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventDeserializerTest.java
@@ -28,7 +28,7 @@
 public class EventDeserializerTest {
 
   @Test
-  public void testRefUpdatedEvent() {
+  public void refUpdatedEvent() {
     RefUpdatedEvent refUpdatedEvent = new RefUpdatedEvent();
 
     RefUpdateAttribute refUpdatedAttribute = new RefUpdateAttribute();
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventTypesTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventTypesTest.java
index 3cbb59c..de13fd8 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/events/EventTypesTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/events/EventTypesTest.java
@@ -34,7 +34,7 @@
   }
 
   @Test
-  public void testEventTypeRegistration() {
+  public void eventTypeRegistration() {
     EventTypes.register(TestEvent.TYPE, TestEvent.class);
     EventTypes.register(AnotherTestEvent.TYPE, AnotherTestEvent.class);
     assertThat(EventTypes.getClass(TestEvent.TYPE)).isEqualTo(TestEvent.class);
@@ -43,7 +43,7 @@
   }
 
   @Test
-  public void testGetClassForNonExistingType() {
+  public void getClassForNonExistingType() {
     Class<?> clazz = EventTypes.getClass("does-not-exist-event");
     assertThat(clazz).isNull();
   }
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/GroupListTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/git/GroupListTest.java
index 3b21444..6cdf6c9 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/git/GroupListTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/git/GroupListTest.java
@@ -54,7 +54,7 @@
   }
 
   @Test
-  public void testByUUID() throws Exception {
+  public void byUUID() throws Exception {
     AccountGroup.UUID uuid =
         new AccountGroup.UUID("d96b998f8a66ff433af50befb975d0e2bb6e0999");
 
@@ -65,7 +65,7 @@
   }
 
   @Test
-  public void testPut() {
+  public void put() {
     AccountGroup.UUID uuid = new AccountGroup.UUID("abc");
     GroupReference groupReference = new GroupReference(uuid, "Hutzliputz");
 
@@ -77,7 +77,7 @@
   }
 
   @Test
-  public void testReferences() throws Exception {
+  public void references() throws Exception {
     Collection<GroupReference> result = groupList.references();
 
     assertEquals(2, result.size());
@@ -89,7 +89,7 @@
   }
 
   @Test
-  public void testUUIDs() throws Exception {
+  public void uUIDs() throws Exception {
     Set<AccountGroup.UUID> result = groupList.uuids();
 
     assertEquals(2, result.size());
@@ -99,7 +99,7 @@
   }
 
   @Test
-  public void testValidationError() throws Exception {
+  public void validationError() throws Exception {
     ValidationError.Sink sink = createMock(ValidationError.Sink.class);
     sink.error(anyObject(ValidationError.class));
     expectLastCall().times(2);
@@ -109,7 +109,7 @@
   }
 
   @Test
-  public void testRetainAll() throws Exception {
+  public void retainAll() throws Exception {
     AccountGroup.UUID uuid =
         new AccountGroup.UUID("d96b998f8a66ff433af50befb975d0e2bb6e0999");
     groupList.retainUUIDs(Collections.singleton(uuid));
@@ -120,7 +120,7 @@
   }
 
   @Test
-  public void testAsText() throws Exception {
+  public void asText() throws Exception {
     assertTrue(TEXT.equals(groupList.asText()));
   }
 }
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java
index ddb4bf3..e30e3fc 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/git/LocalDiskRepositoryManagerTest.java
@@ -64,7 +64,7 @@
   }
 
   @Test
-  public void testProjectCreation() throws Exception {
+  public void projectCreation() throws Exception {
     Project.NameKey projectA = new Project.NameKey("projectA");
     try (Repository repo = repoManager.createRepository(projectA)) {
       assertThat(repo).isNotNull();
@@ -181,7 +181,7 @@
   }
 
   @Test
-  public void testOpenRepositoryCreatedDirectlyOnDisk() throws Exception {
+  public void openRepositoryCreatedDirectlyOnDisk() throws Exception {
     Project.NameKey projectA = new Project.NameKey("projectA");
     createRepository(repoManager.getBasePath(projectA), projectA.get());
     try (Repository repo = repoManager.openRepository(projectA)) {
@@ -231,7 +231,7 @@
   }
 
   @Test
-  public void testList() throws Exception {
+  public void list() throws Exception {
     Project.NameKey projectA = new Project.NameKey("projectA");
     createRepository(repoManager.getBasePath(projectA), projectA.get());
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
index a78f6c2..accf778 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/git/MultiBaseLocalDiskRepositoryManagerTest.java
@@ -69,7 +69,7 @@
   }
 
   @Test
-  public void testDefaultRepositoryLocation()
+  public void defaultRepositoryLocation()
       throws RepositoryCaseMismatchException, RepositoryNotFoundException,
       IOException {
     Project.NameKey someProjectKey = new Project.NameKey("someProject");
@@ -97,7 +97,7 @@
   }
 
   @Test
-  public void testAlternateRepositoryLocation() throws IOException {
+  public void alternateRepositoryLocation() throws IOException {
     Path alternateBasePath = TempFileUtil.createTempDirectory().toPath();
     Project.NameKey someProjectKey = new Project.NameKey("someProject");
     reset(configMock);
@@ -130,7 +130,7 @@
   }
 
   @Test
-  public void testListReturnRepoFromProperLocation() throws IOException {
+  public void listReturnRepoFromProperLocation() throws IOException {
     Project.NameKey basePathProject = new Project.NameKey("basePathProject");
     Project.NameKey altPathProject = new Project.NameKey("altPathProject");
     Project.NameKey misplacedProject1 =
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java
index 0757a26..94220f6 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/git/ProjectConfigTest.java
@@ -78,7 +78,7 @@
   }
 
   @Test
-  public void testReadConfig() throws Exception {
+  public void readConfig() throws Exception {
     RevCommit rev = util.commit(util.tree( //
         util.file("groups", util.blob(group(developers))), //
         util.file("project.config", util.blob(""//
@@ -125,7 +125,7 @@
   }
 
   @Test
-  public void testReadConfigLabelDefaultValue() throws Exception {
+  public void readConfigLabelDefaultValue() throws Exception {
     RevCommit rev = util.commit(util.tree( //
         util.file("groups", util.blob(group(developers))), //
         util.file("project.config", util.blob(""//
@@ -142,7 +142,7 @@
   }
 
   @Test
-  public void testReadConfigLabelDefaultValueInRange() throws Exception {
+  public void readConfigLabelDefaultValueInRange() throws Exception {
     RevCommit rev = util.commit(util.tree( //
         util.file("groups", util.blob(group(developers))), //
         util.file("project.config", util.blob(""//
@@ -160,7 +160,7 @@
   }
 
   @Test
-  public void testReadConfigLabelDefaultValueNotInRange() throws Exception {
+  public void readConfigLabelDefaultValueNotInRange() throws Exception {
     RevCommit rev = util.commit(util.tree( //
         util.file("groups", util.blob(group(developers))), //
         util.file("project.config", util.blob(""//
@@ -179,7 +179,7 @@
   }
 
   @Test
-  public void testReadConfigLabelScores() throws Exception {
+  public void readConfigLabelScores() throws Exception {
     RevCommit rev = util.commit(util.tree( //
         util.file("groups", util.blob(group(developers))), //
         util.file("project.config", util.blob(""//
@@ -203,7 +203,7 @@
   }
 
   @Test
-  public void testEditConfig() throws Exception {
+  public void editConfig() throws Exception {
     RevCommit rev = util.commit(util.tree( //
         util.file("groups", util.blob(group(developers))), //
         util.file("project.config", util.blob(""//
@@ -256,7 +256,7 @@
   }
 
   @Test
-  public void testEditConfigMissingGroupTableEntry() throws Exception {
+  public void editConfigMissingGroupTableEntry() throws Exception {
     RevCommit rev = util.commit(util.tree( //
         util.file("groups", util.blob(group(developers))), //
         util.file("project.config", util.blob(""//
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java
index ac7aed7..acf6b14 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java
@@ -65,13 +65,13 @@
   }
 
   @Test
-  public void testIndexPredicate() throws Exception {
+  public void indexPredicate() throws Exception {
     Predicate<ChangeData> in = parse("file:a");
     assertThat(rewrite(in)).isEqualTo(query(in));
   }
 
   @Test
-  public void testNonIndexPredicate() throws Exception {
+  public void nonIndexPredicate() throws Exception {
     Predicate<ChangeData> in = parse("foo:a");
     Predicate<ChangeData> out = rewrite(in);
     assertThat(AndChangeSource.class).isSameAs(out.getClass());
@@ -81,13 +81,13 @@
   }
 
   @Test
-  public void testIndexPredicates() throws Exception {
+  public void indexPredicates() throws Exception {
     Predicate<ChangeData> in = parse("file:a file:b");
     assertThat(rewrite(in)).isEqualTo(query(in));
   }
 
   @Test
-  public void testNonIndexPredicates() throws Exception {
+  public void nonIndexPredicates() throws Exception {
     Predicate<ChangeData> in = parse("foo:a OR foo:b");
     Predicate<ChangeData> out = rewrite(in);
     assertThat(AndChangeSource.class).isSameAs(out.getClass());
@@ -97,7 +97,7 @@
   }
 
   @Test
-  public void testOneIndexPredicate() throws Exception {
+  public void oneIndexPredicate() throws Exception {
     Predicate<ChangeData> in = parse("foo:a file:b");
     Predicate<ChangeData> out = rewrite(in);
     assertThat(AndChangeSource.class).isSameAs(out.getClass());
@@ -109,7 +109,7 @@
   }
 
   @Test
-  public void testThreeLevelTreeWithAllIndexPredicates() throws Exception {
+  public void threeLevelTreeWithAllIndexPredicates() throws Exception {
     Predicate<ChangeData> in =
         parse("-status:abandoned (file:a OR file:b)");
     assertThat(rewrite.rewrite(in, options(0, DEFAULT_MAX_QUERY_LIMIT)))
@@ -117,7 +117,7 @@
   }
 
   @Test
-  public void testThreeLevelTreeWithSomeIndexPredicates() throws Exception {
+  public void threeLevelTreeWithSomeIndexPredicates() throws Exception {
     Predicate<ChangeData> in = parse("-foo:a (file:b OR file:c)");
     Predicate<ChangeData> out = rewrite(in);
     assertThat(out.getClass()).isSameAs(AndChangeSource.class);
@@ -129,7 +129,7 @@
   }
 
   @Test
-  public void testMultipleIndexPredicates() throws Exception {
+  public void multipleIndexPredicates() throws Exception {
     Predicate<ChangeData> in =
         parse("file:a OR foo:b OR file:c OR foo:d");
     Predicate<ChangeData> out = rewrite(in);
@@ -143,7 +143,7 @@
   }
 
   @Test
-  public void testIndexAndNonIndexPredicates() throws Exception {
+  public void indexAndNonIndexPredicates() throws Exception {
     Predicate<ChangeData> in = parse("status:new bar:p file:a");
     Predicate<ChangeData> out = rewrite(in);
     assertThat(AndChangeSource.class).isSameAs(out.getClass());
@@ -155,7 +155,7 @@
   }
 
   @Test
-  public void testDuplicateCompoundNonIndexOnlyPredicates() throws Exception {
+  public void duplicateCompoundNonIndexOnlyPredicates() throws Exception {
     Predicate<ChangeData> in =
         parse("(status:new OR status:draft) bar:p file:a");
     Predicate<ChangeData> out = rewrite(in);
@@ -168,7 +168,7 @@
   }
 
   @Test
-  public void testDuplicateCompoundIndexOnlyPredicates() throws Exception {
+  public void duplicateCompoundIndexOnlyPredicates() throws Exception {
     Predicate<ChangeData> in =
         parse("(status:new OR file:a) bar:p file:b");
     Predicate<ChangeData> out = rewrite(in);
@@ -181,7 +181,7 @@
   }
 
   @Test
-  public void testOptionsArgumentOverridesAllLimitPredicates()
+  public void optionsArgumentOverridesAllLimitPredicates()
       throws Exception {
     Predicate<ChangeData> in = parse("limit:1 file:a limit:3");
     Predicate<ChangeData> out = rewrite(in, options(0, 5));
@@ -195,7 +195,7 @@
   }
 
   @Test
-  public void testStartIncreasesLimitInQueryButNotPredicate() throws Exception {
+  public void startIncreasesLimitInQueryButNotPredicate() throws Exception {
     int n = 3;
     Predicate<ChangeData> f = parse("file:a");
     Predicate<ChangeData> l = parse("limit:" + n);
@@ -209,7 +209,7 @@
   }
 
   @Test
-  public void testGetPossibleStatus() throws Exception {
+  public void getPossibleStatus() throws Exception {
     assertThat(status("file:a")).isEqualTo(EnumSet.allOf(Change.Status.class));
     assertThat(status("is:new")).containsExactly(NEW);
     assertThat(status("-is:new"))
@@ -225,7 +225,7 @@
   }
 
   @Test
-  public void testUnsupportedIndexOperator() throws Exception {
+  public void unsupportedIndexOperator() throws Exception {
     Predicate<ChangeData> in = parse("status:merged file:a");
     assertThat(rewrite(in)).isEqualTo(query(in));
 
@@ -240,7 +240,7 @@
   }
 
   @Test
-  public void testTooManyTerms() throws Exception {
+  public void tooManyTerms() throws Exception {
     String q = "file:a OR file:b OR file:c";
     Predicate<ChangeData> in = parse(q);
     assertEquals(query(in), rewrite(in));
@@ -258,7 +258,7 @@
   }
 
   @Test
-  public void testAddingStartToLimitDoesNotExceedBackendLimit() throws Exception {
+  public void addingStartToLimitDoesNotExceedBackendLimit() throws Exception {
     int max = CONFIG.maxLimit();
     assertEquals(options(0, max), convertOptions(options(0, max)));
     assertEquals(options(0, max), convertOptions(options(1, max)));
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/ColumnFormatterTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/ColumnFormatterTest.java
index 049e17d..51abe2b 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/ColumnFormatterTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/ioutil/ColumnFormatterTest.java
@@ -48,7 +48,7 @@
    * Test that only lines with at least one column of text emit output.
    */
   @Test
-  public void testEmptyLine() {
+  public void emptyLine() {
     final PrintWriterComparator comparator = new PrintWriterComparator();
     final ColumnFormatter formatter =
         new ColumnFormatter(comparator.getPrintWriter(), '\t');
@@ -67,7 +67,7 @@
    * Test that there is no output if no columns are ever added.
    */
   @Test
-  public void testEmptyOutput() {
+  public void emptyOutput() {
     final PrintWriterComparator comparator = new PrintWriterComparator();
     final ColumnFormatter formatter =
         new ColumnFormatter(comparator.getPrintWriter(), '\t');
@@ -82,7 +82,7 @@
    * the output immediately after the creation of the {@link ColumnFormatter}.
    */
   @Test
-  public void testNoNextLine() {
+  public void noNextLine() {
     final PrintWriterComparator comparator = new PrintWriterComparator();
     final ColumnFormatter formatter =
         new ColumnFormatter(comparator.getPrintWriter(), '\t');
@@ -95,7 +95,7 @@
    * (which of course shouldn't be escaped) is left alone.
    */
   @Test
-  public void testEscapingTakesPlace() {
+  public void escapingTakesPlace() {
     final PrintWriterComparator comparator = new PrintWriterComparator();
     final ColumnFormatter formatter =
         new ColumnFormatter(comparator.getPrintWriter(), '\t');
@@ -112,7 +112,7 @@
    * of columns in each line varies.
    */
   @Test
-  public void testMultiLineDifferentColumnCount() {
+  public void multiLineDifferentColumnCount() {
     final PrintWriterComparator comparator = new PrintWriterComparator();
     final ColumnFormatter formatter =
         new ColumnFormatter(comparator.getPrintWriter(), '\t');
@@ -131,7 +131,7 @@
    * Test that we get the correct output with a single column of input.
    */
   @Test
-  public void testOneColumn() {
+  public void oneColumn() {
     final PrintWriterComparator comparator = new PrintWriterComparator();
     final ColumnFormatter formatter =
         new ColumnFormatter(comparator.getPrintWriter(), '\t');
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
index d5f3132..6d33f50 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/AddressTest.java
@@ -23,63 +23,63 @@
 
 public class AddressTest extends GerritBaseTests {
   @Test
-  public void testParse_NameEmail1() {
+  public void parse_NameEmail1() {
     final Address a = Address.parse("A U Thor <author@example.com>");
     assertThat(a.name).isEqualTo("A U Thor");
     assertThat(a.email).isEqualTo("author@example.com");
   }
 
   @Test
-  public void testParse_NameEmail2() {
+  public void parse_NameEmail2() {
     final Address a = Address.parse("A <a@b>");
     assertThat(a.name).isEqualTo("A");
     assertThat(a.email).isEqualTo("a@b");
   }
 
   @Test
-  public void testParse_NameEmail3() {
+  public void parse_NameEmail3() {
     final Address a = Address.parse("<a@b>");
     assertThat(a.name).isNull();
     assertThat(a.email).isEqualTo("a@b");
   }
 
   @Test
-  public void testParse_NameEmail4() {
+  public void parse_NameEmail4() {
     final Address a = Address.parse("A U Thor<author@example.com>");
     assertThat(a.name).isEqualTo("A U Thor");
     assertThat(a.email).isEqualTo("author@example.com");
   }
 
   @Test
-  public void testParse_NameEmail5() {
+  public void parse_NameEmail5() {
     final Address a = Address.parse("A U Thor  <author@example.com>");
     assertThat(a.name).isEqualTo("A U Thor");
     assertThat(a.email).isEqualTo("author@example.com");
   }
 
   @Test
-  public void testParse_Email1() {
+  public void parse_Email1() {
     final Address a = Address.parse("author@example.com");
     assertThat(a.name).isNull();
     assertThat(a.email).isEqualTo("author@example.com");
   }
 
   @Test
-  public void testParse_Email2() {
+  public void parse_Email2() {
     final Address a = Address.parse("a@b");
     assertThat(a.name).isNull();
     assertThat(a.email).isEqualTo("a@b");
   }
 
   @Test
-  public void testParse_NewTLD() {
+  public void parse_NewTLD() {
     Address a = Address.parse("A U Thor <author@example.systems>");
     assertThat(a.name).isEqualTo("A U Thor");
     assertThat(a.email).isEqualTo("author@example.systems");
   }
 
   @Test
-  public void testParseInvalid() {
+  public void parseInvalid() {
     assertInvalid("");
     assertInvalid("a");
     assertInvalid("a<");
@@ -107,49 +107,49 @@
   }
 
   @Test
-  public void testToHeaderString_NameEmail1() {
+  public void toHeaderString_NameEmail1() {
     assertThat(format("A", "a@a")).isEqualTo("A <a@a>");
   }
 
   @Test
-  public void testToHeaderString_NameEmail2() {
+  public void toHeaderString_NameEmail2() {
     assertThat(format("A B", "a@a")).isEqualTo("A B <a@a>");
   }
 
   @Test
-  public void testToHeaderString_NameEmail3() {
+  public void toHeaderString_NameEmail3() {
     assertThat(format("A B. C", "a@a")).isEqualTo("\"A B. C\" <a@a>");
   }
 
   @Test
-  public void testToHeaderString_NameEmail4() {
+  public void toHeaderString_NameEmail4() {
     assertThat(format("A B, C", "a@a")).isEqualTo("\"A B, C\" <a@a>");
   }
 
   @Test
-  public void testToHeaderString_NameEmail5() {
+  public void toHeaderString_NameEmail5() {
     assertThat(format("A \" C", "a@a")).isEqualTo("\"A \\\" C\" <a@a>");
   }
 
   @Test
-  public void testToHeaderString_NameEmail6() {
+  public void toHeaderString_NameEmail6() {
     assertThat(format("A \u20ac B", "a@a"))
       .isEqualTo("=?UTF-8?Q?A_=E2=82=AC_B?= <a@a>");
   }
 
   @Test
-  public void testToHeaderString_NameEmail7() {
+  public void toHeaderString_NameEmail7() {
     assertThat(format("A \u20ac B (Code Review)", "a@a"))
       .isEqualTo("=?UTF-8?Q?A_=E2=82=AC_B_=28Code_Review=29?= <a@a>");
   }
 
   @Test
-  public void testToHeaderString_Email1() {
+  public void toHeaderString_Email1() {
     assertThat(format(null, "a@a")).isEqualTo("a@a");
   }
 
   @Test
-  public void testToHeaderString_Email2() {
+  public void toHeaderString_Email2() {
     assertThat(format(null, "a,b@a")).isEqualTo("<a,b@a>");
   }
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/MetadataParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/MetadataParserTest.java
index 65914c8..67f3e46 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/MetadataParserTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/MetadataParserTest.java
@@ -27,7 +27,7 @@
 
 public class MetadataParserTest {
   @Test
-  public void testParseMetadataFromHeader() {
+  public void parseMetadataFromHeader() {
     // This tests if the metadata parser is able to parse metadata from the
     // email headers of the message.
     MailMessage.Builder b = MailMessage.builder();
@@ -56,7 +56,7 @@
   }
 
   @Test
-  public void testParseMetadataFromText() {
+  public void parseMetadataFromText() {
     // This tests if the metadata parser is able to parse metadata from the
     // the text body of the message.
     MailMessage.Builder b = MailMessage.builder();
@@ -88,7 +88,7 @@
   }
 
   @Test
-  public void testParseMetadataFromHTML() {
+  public void parseMetadataFromHTML() {
     // This tests if the metadata parser is able to parse metadata from the
     // the HTML body of the message.
     MailMessage.Builder b = MailMessage.builder();
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/RawMailParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/RawMailParserTest.java
index 5ef077a..2e5b4c2 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/RawMailParserTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/receive/RawMailParserTest.java
@@ -29,7 +29,7 @@
 
 public class RawMailParserTest extends GerritBaseTests {
   @Test
-  public void testParseEmail() throws Exception {
+  public void parseEmail() throws Exception {
     RawMailMessage[] messages = new RawMailMessage[] {
         new SimpleTextMessage(),
         new Base64HeaderMessage(),
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java
index 2944038..ad06832 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/CommentFormatterTest.java
@@ -53,17 +53,17 @@
   }
 
   @Test
-  public void testParseNullAsEmpty() {
+  public void parseNullAsEmpty() {
     assertThat(CommentFormatter.parse(null)).isEmpty();
   }
 
   @Test
-  public void testParseEmpty() {
+  public void parseEmpty() {
     assertThat(CommentFormatter.parse("")).isEmpty();
   }
 
   @Test
-  public void testParseSimple() {
+  public void parseSimple() {
     String comment = "Para1";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -72,7 +72,7 @@
   }
 
   @Test
-  public void testParseMultilinePara() {
+  public void parseMultilinePara() {
     String comment = "Para 1\nStill para 1";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -81,7 +81,7 @@
   }
 
   @Test
-  public void testParseParaBreak() {
+  public void parseParaBreak() {
     String comment = "Para 1\n\nPara 2\n\nPara 3";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -92,7 +92,7 @@
   }
 
   @Test
-  public void testParseQuote() {
+  public void parseQuote() {
     String comment = "> Quote text";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -102,7 +102,7 @@
   }
 
   @Test
-  public void testParseExcludesEmpty() {
+  public void parseExcludesEmpty() {
     String comment = "Para 1\n\n\n\nPara 2";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -112,7 +112,7 @@
   }
 
   @Test
-  public void testParseQuoteLeadSpace() {
+  public void parseQuoteLeadSpace() {
     String comment = " > Quote text";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -122,7 +122,7 @@
   }
 
   @Test
-  public void testParseMultiLineQuote() {
+  public void parseMultiLineQuote() {
     String comment = "> Quote line 1\n> Quote line 2\n > Quote line 3\n";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -133,7 +133,7 @@
   }
 
   @Test
-  public void testParsePre() {
+  public void parsePre() {
     String comment = "    Four space indent.";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -142,7 +142,7 @@
   }
 
   @Test
-  public void testParseOneSpacePre() {
+  public void parseOneSpacePre() {
     String comment = " One space indent.\n Another line.";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -151,7 +151,7 @@
   }
 
   @Test
-  public void testParseTabPre() {
+  public void parseTabPre() {
     String comment = "\tOne tab indent.\n\tAnother line.\n  Yet another!";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -160,7 +160,7 @@
   }
 
   @Test
-  public void testParseIntermediateLeadingWhitespacePre() {
+  public void parseIntermediateLeadingWhitespacePre() {
     String comment = "No indent.\n\tNonzero indent.\nNo indent again.";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -169,7 +169,7 @@
   }
 
   @Test
-  public void testParseStarList() {
+  public void parseStarList() {
     String comment = "* Item 1\n* Item 2\n* Item 3";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -180,7 +180,7 @@
   }
 
   @Test
-  public void testParseDashList() {
+  public void parseDashList() {
     String comment = "- Item 1\n- Item 2\n- Item 3";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -191,7 +191,7 @@
   }
 
   @Test
-  public void testParseMixedList() {
+  public void parseMixedList() {
     String comment = "- Item 1\n* Item 2\n- Item 3\n* Item 4";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -203,7 +203,7 @@
   }
 
   @Test
-  public void testParseMixedBlockTypes() {
+  public void parseMixedBlockTypes() {
     String comment = "Paragraph\nacross\na\nfew\nlines."
         + "\n\n"
         + "> Quote\n> across\n> not many lines."
@@ -235,7 +235,7 @@
   }
 
   @Test
-  public void testBulletList1() {
+  public void bulletList1() {
     String comment = "A\n\n* line 1\n* 2nd line";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -246,7 +246,7 @@
   }
 
   @Test
-  public void testBulletList2() {
+  public void bulletList2() {
     String comment = "A\n\n* line 1\n* 2nd line\n\nB";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -258,7 +258,7 @@
   }
 
   @Test
-  public void testBulletList3() {
+  public void bulletList3() {
     String comment = "* line 1\n* 2nd line\n\nB";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -269,7 +269,7 @@
   }
 
   @Test
-  public void testBulletList4() {
+  public void bulletList4() {
     String comment = "To see this bug, you have to:\n" //
         + "* Be on IMAP or EAS (not on POP)\n"//
         + "* Be very unlucky\n";
@@ -282,7 +282,7 @@
   }
 
   @Test
-  public void testBulletList5() {
+  public void bulletList5() {
     String comment = "To see this bug,\n" //
         + "you have to:\n" //
         + "* Be on IMAP or EAS (not on POP)\n"//
@@ -296,7 +296,7 @@
   }
 
   @Test
-  public void testDashList1() {
+  public void dashList1() {
     String comment = "A\n\n- line 1\n- 2nd line";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -307,7 +307,7 @@
   }
 
   @Test
-  public void testDashList2() {
+  public void dashList2() {
     String comment = "A\n\n- line 1\n- 2nd line\n\nB";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -319,7 +319,7 @@
   }
 
   @Test
-  public void testDashList3() {
+  public void dashList3() {
     String comment = "- line 1\n- 2nd line\n\nB";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -330,7 +330,7 @@
   }
 
   @Test
-  public void testPreformat1() {
+  public void preformat1() {
     String comment = "A\n\n  This is pre\n  formatted";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -340,7 +340,7 @@
   }
 
   @Test
-  public void testPreformat2() {
+  public void preformat2() {
     String comment = "A\n\n  This is pre\n  formatted\n\nbut this is not";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -351,7 +351,7 @@
   }
 
   @Test
-  public void testPreformat3() {
+  public void preformat3() {
     String comment = "A\n\n  Q\n    <R>\n  S\n\nB";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -362,7 +362,7 @@
   }
 
   @Test
-  public void testPreformat4() {
+  public void preformat4() {
     String comment = "  Q\n    <R>\n  S\n\nB";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -372,7 +372,7 @@
   }
 
   @Test
-  public void testQuote1() {
+  public void quote1() {
     String comment = "> I'm happy\n > with quotes!\n\nSee above.";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -384,7 +384,7 @@
   }
 
   @Test
-  public void testQuote2() {
+  public void quote2() {
     String comment = "See this said:\n\n > a quoted\n > string block\n\nOK?";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
@@ -397,7 +397,7 @@
   }
 
   @Test
-  public void testNestedQuotes1() {
+  public void nestedQuotes1() {
     String comment = " > > prior\n > \n > next\n";
     List<CommentFormatter.Block> result = CommentFormatter.parse(comment);
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
index 01580c3..9d05fc6 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/mail/send/FromAddressGeneratorProviderTest.java
@@ -68,12 +68,12 @@
   }
 
   @Test
-  public void testDefaultIsMIXED() {
+  public void defaultIsMIXED() {
     assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.PatternGen.class);
   }
 
   @Test
-  public void testSelectUSER() {
+  public void selectUSER() {
     setFrom("USER");
     assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.UserGen.class);
 
@@ -85,7 +85,7 @@
   }
 
   @Test
-  public void testUSER_FullyConfiguredUser() {
+  public void USER_FullyConfiguredUser() {
     setFrom("USER");
 
     final String name = "A U. Thor";
@@ -101,7 +101,7 @@
   }
 
   @Test
-  public void testUSER_NoFullNameUser() {
+  public void USER_NoFullNameUser() {
     setFrom("USER");
 
     final String email = "a.u.thor@test.example.com";
@@ -116,7 +116,7 @@
   }
 
   @Test
-  public void testUSER_NoPreferredEmailUser() {
+  public void USER_NoPreferredEmailUser() {
     setFrom("USER");
 
     final String name = "A U. Thor";
@@ -131,7 +131,7 @@
   }
 
   @Test
-  public void testUSER_NullUser() {
+  public void USER_NullUser() {
     setFrom("USER");
     replay(accountCache);
     final Address r = create().from(null);
@@ -142,7 +142,7 @@
   }
 
   @Test
-  public void testUSERAllowDomain() {
+  public void USERAllowDomain() {
     setFrom("USER");
     setDomains(Arrays.asList("*.example.com"));
     final String name = "A U. Thor";
@@ -158,7 +158,7 @@
   }
 
   @Test
-  public void testUSERNoAllowDomain() {
+  public void USERNoAllowDomain() {
     setFrom("USER");
     setDomains(Arrays.asList("example.com"));
     final String name = "A U. Thor";
@@ -174,7 +174,7 @@
   }
 
   @Test
-  public void testUSERAllowDomainTwice() {
+  public void USERAllowDomainTwice() {
     setFrom("USER");
     setDomains(Arrays.asList("example.com"));
     setDomains(Arrays.asList("test.com"));
@@ -191,7 +191,7 @@
   }
 
   @Test
-  public void testUSERAllowDomainTwiceReverse() {
+  public void USERAllowDomainTwiceReverse() {
     setFrom("USER");
     setDomains(Arrays.asList("test.com"));
     setDomains(Arrays.asList("example.com"));
@@ -208,7 +208,7 @@
   }
 
   @Test
-  public void testUSERAllowTwoDomains() {
+  public void USERAllowTwoDomains() {
     setFrom("USER");
     setDomains(Arrays.asList("example.com", "test.com"));
     final String name = "A U. Thor";
@@ -224,7 +224,7 @@
   }
 
   @Test
-  public void testSelectSERVER() {
+  public void selectSERVER() {
     setFrom("SERVER");
     assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.ServerGen.class);
 
@@ -236,7 +236,7 @@
   }
 
   @Test
-  public void testSERVER_FullyConfiguredUser() {
+  public void SERVER_FullyConfiguredUser() {
     setFrom("SERVER");
 
     final String name = "A U. Thor";
@@ -252,7 +252,7 @@
   }
 
   @Test
-  public void testSERVER_NullUser() {
+  public void SERVER_NullUser() {
     setFrom("SERVER");
     replay(accountCache);
     final Address r = create().from(null);
@@ -263,7 +263,7 @@
   }
 
   @Test
-  public void testSelectMIXED() {
+  public void selectMIXED() {
     setFrom("MIXED");
     assertThat(create()).isInstanceOf(FromAddressGeneratorProvider.PatternGen.class);
 
@@ -275,7 +275,7 @@
   }
 
   @Test
-  public void testMIXED_FullyConfiguredUser() {
+  public void MIXED_FullyConfiguredUser() {
     setFrom("MIXED");
 
     final String name = "A U. Thor";
@@ -291,7 +291,7 @@
   }
 
   @Test
-  public void testMIXED_NoFullNameUser() {
+  public void MIXED_NoFullNameUser() {
     setFrom("MIXED");
 
     final String email = "a.u.thor@test.example.com";
@@ -306,7 +306,7 @@
   }
 
   @Test
-  public void testMIXED_NoPreferredEmailUser() {
+  public void MIXED_NoPreferredEmailUser() {
     setFrom("MIXED");
 
     final String name = "A U. Thor";
@@ -321,7 +321,7 @@
   }
 
   @Test
-  public void testMIXED_NullUser() {
+  public void MIXED_NullUser() {
     setFrom("MIXED");
     replay(accountCache);
     final Address r = create().from(null);
@@ -332,7 +332,7 @@
   }
 
   @Test
-  public void testCUSTOM_FullyConfiguredUser() {
+  public void CUSTOM_FullyConfiguredUser() {
     setFrom("A ${user} B <my.server@email.address>");
 
     final String name = "A U. Thor";
@@ -348,7 +348,7 @@
   }
 
   @Test
-  public void testCUSTOM_NoFullNameUser() {
+  public void CUSTOM_NoFullNameUser() {
     setFrom("A ${user} B <my.server@email.address>");
 
     final String email = "a.u.thor@test.example.com";
@@ -363,7 +363,7 @@
   }
 
   @Test
-  public void testCUSTOM_NullUser() {
+  public void CUSTOM_NullUser() {
     setFrom("A ${user} B <my.server@email.address>");
 
     replay(accountCache);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java
index bff557c..2721b30 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/patch/PatchListEntryTest.java
@@ -25,7 +25,7 @@
 
 public class PatchListEntryTest {
   @Test
-  public void testEmpty1() {
+  public void empty1() {
     final String name = "empty-file";
     final PatchListEntry e = PatchListEntry.empty(name);
     assertNull(e.getOldName());
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
index 316b984..ee1203d 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/project/RefControlTest.java
@@ -357,14 +357,14 @@
   }
 
   @Test
-  public void testOwnerProject() {
+  public void ownerProject() {
     allow(local, OWNER, ADMIN, "refs/*");
 
     assertAdminsAreOwnersAndDevsAreNot();
   }
 
   @Test
-  public void testDenyOwnerProject() {
+  public void denyOwnerProject() {
     allow(local, OWNER, ADMIN, "refs/*");
     deny(local, OWNER, DEVS, "refs/*");
 
@@ -372,7 +372,7 @@
   }
 
   @Test
-  public void testBlockOwnerProject() {
+  public void blockOwnerProject() {
     allow(local, OWNER, ADMIN, "refs/*");
     block(local, OWNER, DEVS, "refs/*");
 
@@ -380,7 +380,7 @@
   }
 
   @Test
-  public void testBranchDelegation1() {
+  public void branchDelegation1() {
     allow(local, OWNER, ADMIN, "refs/*");
     allow(local, OWNER, DEVS, "refs/heads/x/*");
 
@@ -397,7 +397,7 @@
   }
 
   @Test
-  public void testBranchDelegation2() {
+  public void branchDelegation2() {
     allow(local, OWNER, ADMIN, "refs/*");
     allow(local, OWNER, DEVS, "refs/heads/x/*");
     allow(local, OWNER, fixers, "refs/heads/x/y/*");
@@ -426,7 +426,7 @@
   }
 
   @Test
-  public void testInheritRead_SingleBranchDeniesUpload() {
+  public void inheritRead_SingleBranchDeniesUpload() {
     allow(parent, READ, REGISTERED_USERS, "refs/*");
     allow(parent, PUSH, REGISTERED_USERS, "refs/for/refs/*");
     allow(local, READ, REGISTERED_USERS, "refs/heads/foobar");
@@ -440,7 +440,7 @@
   }
 
   @Test
-  public void testBlockPushDrafts() {
+  public void blockPushDrafts() {
     allow(parent, PUSH, REGISTERED_USERS, "refs/for/refs/*");
     block(parent, PUSH, ANONYMOUS_USERS, "refs/drafts/*");
 
@@ -450,7 +450,7 @@
   }
 
   @Test
-  public void testBlockPushDraftsUnblockAdmin() {
+  public void blockPushDraftsUnblockAdmin() {
     block(parent, PUSH, ANONYMOUS_USERS, "refs/drafts/*");
     allow(parent, PUSH, ADMIN, "refs/drafts/*");
 
@@ -461,7 +461,7 @@
   }
 
   @Test
-  public void testInheritRead_SingleBranchDoesNotOverrideInherited() {
+  public void inheritRead_SingleBranchDoesNotOverrideInherited() {
     allow(parent, READ, REGISTERED_USERS, "refs/*");
     allow(parent, PUSH, REGISTERED_USERS, "refs/for/refs/*");
     allow(local, READ, REGISTERED_USERS, "refs/heads/foobar");
@@ -473,7 +473,7 @@
   }
 
   @Test
-  public void testInheritDuplicateSections() throws Exception {
+  public void inheritDuplicateSections() throws Exception {
     allow(parent, READ, ADMIN, "refs/*");
     allow(local, READ, DEVS, "refs/heads/*");
     assertCanRead(user(local, "a", ADMIN));
@@ -486,7 +486,7 @@
   }
 
   @Test
-  public void testInheritRead_OverrideWithDeny() {
+  public void inheritRead_OverrideWithDeny() {
     allow(parent, READ, REGISTERED_USERS, "refs/*");
     deny(local, READ, REGISTERED_USERS, "refs/*");
 
@@ -494,7 +494,7 @@
   }
 
   @Test
-  public void testInheritRead_AppendWithDenyOfRef() {
+  public void inheritRead_AppendWithDenyOfRef() {
     allow(parent, READ, REGISTERED_USERS, "refs/*");
     deny(local, READ, REGISTERED_USERS, "refs/heads/*");
 
@@ -506,7 +506,7 @@
   }
 
   @Test
-  public void testInheritRead_OverridesAndDeniesOfRef() {
+  public void inheritRead_OverridesAndDeniesOfRef() {
     allow(parent, READ, REGISTERED_USERS, "refs/*");
     deny(local, READ, REGISTERED_USERS, "refs/*");
     allow(local, READ, REGISTERED_USERS, "refs/heads/*");
@@ -519,7 +519,7 @@
   }
 
   @Test
-  public void testInheritSubmit_OverridesAndDeniesOfRef() {
+  public void inheritSubmit_OverridesAndDeniesOfRef() {
     allow(parent, SUBMIT, REGISTERED_USERS, "refs/*");
     deny(local, SUBMIT, REGISTERED_USERS, "refs/*");
     allow(local, SUBMIT, REGISTERED_USERS, "refs/heads/*");
@@ -531,7 +531,7 @@
   }
 
   @Test
-  public void testCannotUploadToAnyRef() {
+  public void cannotUploadToAnyRef() {
     allow(parent, READ, REGISTERED_USERS, "refs/*");
     allow(local, READ, DEVS, "refs/heads/*");
     allow(local, PUSH, DEVS, "refs/for/refs/heads/*");
@@ -542,14 +542,14 @@
   }
 
   @Test
-  public void testUsernamePatternCanUploadToAnyRef() {
+  public void usernamePatternCanUploadToAnyRef() {
     allow(local, PUSH, REGISTERED_USERS, "refs/heads/users/${username}/*");
     ProjectControl u = user(local, "a-registered-user");
     assertCanUpload(u);
   }
 
   @Test
-  public void testUsernamePatternNonRegex() {
+  public void usernamePatternNonRegex() {
     allow(local, READ, DEVS, "refs/sb/${username}/heads/*");
 
     ProjectControl u = user(local, "u", DEVS);
@@ -559,7 +559,7 @@
   }
 
   @Test
-  public void testUsernamePatternWithRegex() {
+  public void usernamePatternWithRegex() {
     allow(local, READ, DEVS, "^refs/sb/${username}/heads/.*");
 
     ProjectControl u = user(local, "d.v", DEVS);
@@ -569,7 +569,7 @@
   }
 
   @Test
-  public void testUsernameEmailPatternWithRegex() {
+  public void usernameEmailPatternWithRegex() {
     allow(local, READ, DEVS, "^refs/sb/${username}/heads/.*");
 
     ProjectControl u = user(local, "d.v@ger-rit.org", DEVS);
@@ -579,7 +579,7 @@
   }
 
   @Test
-  public void testSortWithRegex() {
+  public void sortWithRegex() {
     allow(local, READ, DEVS, "^refs/heads/.*");
     allow(parent, READ, ANONYMOUS_USERS, "^refs/heads/.*-QA-.*");
 
@@ -590,7 +590,7 @@
   }
 
   @Test
-  public void testBlockRule_ParentBlocksChild() {
+  public void blockRule_ParentBlocksChild() {
     allow(local, PUSH, DEVS, "refs/tags/*");
     block(parent, PUSH, ANONYMOUS_USERS, "refs/tags/*");
     ProjectControl u = user(local, DEVS);
@@ -598,7 +598,7 @@
   }
 
   @Test
-  public void testBlockRule_ParentBlocksChildEvenIfAlreadyBlockedInChild() {
+  public void blockRule_ParentBlocksChildEvenIfAlreadyBlockedInChild() {
     allow(local, PUSH, DEVS, "refs/tags/*");
     block(local, PUSH, ANONYMOUS_USERS, "refs/tags/*");
     block(parent, PUSH, ANONYMOUS_USERS, "refs/tags/*");
@@ -608,7 +608,7 @@
   }
 
   @Test
-  public void testBlockLabelRange_ParentBlocksChild() {
+  public void blockLabelRange_ParentBlocksChild() {
     allow(local, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/*");
     block(parent, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/*");
 
@@ -622,7 +622,7 @@
   }
 
   @Test
-  public void testBlockLabelRange_ParentBlocksChildEvenIfAlreadyBlockedInChild() {
+  public void blockLabelRange_ParentBlocksChildEvenIfAlreadyBlockedInChild() {
     allow(local, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/*");
     block(local, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/*");
     block(parent, LABEL + "Code-Review", -2, +2, DEVS,
@@ -639,7 +639,7 @@
   }
 
   @Test
-  public void testInheritSubmit_AllowInChildDoesntAffectUnblockInParent() {
+  public void inheritSubmit_AllowInChildDoesntAffectUnblockInParent() {
     block(parent, SUBMIT, ANONYMOUS_USERS, "refs/heads/*");
     allow(parent, SUBMIT, REGISTERED_USERS, "refs/heads/*");
     allow(local, SUBMIT, REGISTERED_USERS, "refs/heads/*");
@@ -649,7 +649,7 @@
   }
 
   @Test
-  public void testUnblockNoForce() {
+  public void unblockNoForce() {
     block(local, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, PUSH, DEVS, "refs/heads/*");
 
@@ -658,7 +658,7 @@
   }
 
   @Test
-  public void testUnblockForce() {
+  public void unblockForce() {
     PermissionRule r = block(local, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     r.setForce(true);
     allow(local, PUSH, DEVS, "refs/heads/*").setForce(true);
@@ -668,7 +668,7 @@
   }
 
   @Test
-  public void testUnblockForceWithAllowNoForce_NotPossible() {
+  public void unblockForceWithAllowNoForce_NotPossible() {
     PermissionRule r = block(local, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     r.setForce(true);
     allow(local, PUSH, DEVS, "refs/heads/*");
@@ -678,7 +678,7 @@
   }
 
   @Test
-  public void testUnblockMoreSpecificRef_Fails() {
+  public void unblockMoreSpecificRef_Fails() {
     block(local, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, PUSH, DEVS, "refs/heads/master");
 
@@ -687,7 +687,7 @@
   }
 
   @Test
-  public void testUnblockMoreSpecificRefInLocal_Fails() {
+  public void unblockMoreSpecificRefInLocal_Fails() {
     block(parent, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, PUSH, DEVS, "refs/heads/master");
 
@@ -696,7 +696,7 @@
   }
 
   @Test
-  public void testUnblockMoreSpecificRefWithExclusiveFlag() {
+  public void unblockMoreSpecificRefWithExclusiveFlag() {
     block(local, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, PUSH, DEVS, "refs/heads/master", true);
 
@@ -705,7 +705,7 @@
   }
 
   @Test
-  public void testUnblockMoreSpecificRefInLocalWithExclusiveFlag_Fails() {
+  public void unblockMoreSpecificRefInLocalWithExclusiveFlag_Fails() {
     block(parent, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, PUSH, DEVS, "refs/heads/master", true);
 
@@ -714,7 +714,7 @@
   }
 
   @Test
-  public void testUnblockOtherPermissionWithMoreSpecificRefAndExclusiveFlag_Fails() {
+  public void unblockOtherPermissionWithMoreSpecificRefAndExclusiveFlag_Fails() {
     block(local, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, PUSH, DEVS, "refs/heads/master");
     allow(local, SUBMIT, DEVS, "refs/heads/master", true);
@@ -724,7 +724,7 @@
   }
 
   @Test
-  public void testUnblockLargerScope_Fails() {
+  public void unblockLargerScope_Fails() {
     block(local, PUSH, ANONYMOUS_USERS, "refs/heads/master");
     allow(local, PUSH, DEVS, "refs/heads/*");
 
@@ -733,7 +733,7 @@
   }
 
   @Test
-  public void testUnblockInLocal_Fails() {
+  public void unblockInLocal_Fails() {
     block(parent, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, PUSH, fixers, "refs/heads/*");
 
@@ -742,7 +742,7 @@
   }
 
   @Test
-  public void testUnblockInParentBlockInLocal() {
+  public void unblockInParentBlockInLocal() {
     block(parent, PUSH, ANONYMOUS_USERS, "refs/heads/*");
     allow(parent, PUSH, DEVS, "refs/heads/*");
     block(local, PUSH, DEVS, "refs/heads/*");
@@ -752,7 +752,7 @@
   }
 
   @Test
-  public void testUnblockVisibilityByRegisteredUsers() {
+  public void unblockVisibilityByRegisteredUsers() {
     block(local, READ, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, READ, REGISTERED_USERS, "refs/heads/*");
 
@@ -763,7 +763,7 @@
   }
 
   @Test
-  public void testUnblockInLocalVisibilityByRegisteredUsers_Fails() {
+  public void unblockInLocalVisibilityByRegisteredUsers_Fails() {
     block(parent, READ, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, READ, REGISTERED_USERS, "refs/heads/*");
 
@@ -774,7 +774,7 @@
   }
 
   @Test
-  public void testUnblockForceEditTopicName() {
+  public void unblockForceEditTopicName() {
     block(local, EDIT_TOPIC_NAME, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, EDIT_TOPIC_NAME, DEVS, "refs/heads/*").setForce(true);
 
@@ -785,7 +785,7 @@
   }
 
   @Test
-  public void testUnblockInLocalForceEditTopicName_Fails() {
+  public void unblockInLocalForceEditTopicName_Fails() {
     block(parent, EDIT_TOPIC_NAME, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, EDIT_TOPIC_NAME, DEVS, "refs/heads/*").setForce(true);
 
@@ -796,7 +796,7 @@
   }
 
   @Test
-  public void testUnblockRange() {
+  public void unblockRange() {
     block(local, LABEL + "Code-Review", -1, +1, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/*");
 
@@ -807,7 +807,7 @@
   }
 
   @Test
-  public void testUnblockRangeOnMoreSpecificRef_Fails() {
+  public void unblockRangeOnMoreSpecificRef_Fails() {
     block(local, LABEL + "Code-Review", -1, +1, ANONYMOUS_USERS, "refs/heads/*");
     allow(local, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/master");
 
@@ -818,7 +818,7 @@
   }
 
   @Test
-  public void testUnblockRangeOnLargerScope_Fails() {
+  public void unblockRangeOnLargerScope_Fails() {
     block(local, LABEL + "Code-Review", -1, +1, ANONYMOUS_USERS, "refs/heads/master");
     allow(local, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/*");
 
@@ -829,7 +829,7 @@
   }
 
   @Test
-  public void testUnblockInLocalRange_Fails() {
+  public void unblockInLocalRange_Fails() {
     block(parent, LABEL + "Code-Review", -1, 1, ANONYMOUS_USERS,
         "refs/heads/*");
     allow(local, LABEL + "Code-Review", -2, +2, DEVS, "refs/heads/*");
@@ -842,7 +842,7 @@
   }
 
   @Test
-  public void testUnblockRangeForChangeOwner() {
+  public void unblockRangeForChangeOwner() {
     allow(local, LABEL + "Code-Review", -2, +2, CHANGE_OWNER, "refs/heads/*");
 
     ProjectControl u = user(local, DEVS);
@@ -853,7 +853,7 @@
   }
 
   @Test
-  public void testUnblockRangeForNotChangeOwner() {
+  public void unblockRangeForNotChangeOwner() {
     allow(local, LABEL + "Code-Review", -2, +2, CHANGE_OWNER, "refs/heads/*");
 
     ProjectControl u = user(local, DEVS);
@@ -864,7 +864,7 @@
   }
 
   @Test
-  public void testBlockOwner() {
+  public void blockOwner() {
     block(parent, OWNER, ANONYMOUS_USERS, "refs/*");
     allow(local, OWNER, DEVS, "refs/*");
 
@@ -872,7 +872,7 @@
   }
 
   @Test
-  public void testValidateRefPatternsOK() throws Exception {
+  public void validateRefPatternsOK() throws Exception {
     RefPattern.validate("refs/*");
     RefPattern.validate("^refs/heads/*");
     RefPattern.validate("^refs/tags/[0-9a-zA-Z-_.]+");
@@ -891,7 +891,7 @@
   }
 
   @Test
-  public void testValidateRefPatternNoDanglingCharacter() throws Exception {
+  public void validateRefPatternNoDanglingCharacter() throws Exception {
     RefPattern.validate("^refs/heads/tmp/sdk/[0-9]{3,3}_R[1-9][A-Z][0-9]{3,3}");
   }
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java
index 47df2db..01efa1d 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/AndPredicateTest.java
@@ -29,7 +29,7 @@
 
 public class AndPredicateTest extends PredicateTest {
   @Test
-  public void testChildren() {
+  public void children() {
     final TestPredicate a = f("author", "alice");
     final TestPredicate b = f("author", "bob");
     final Predicate<String> n = and(a, b);
@@ -39,7 +39,7 @@
   }
 
   @Test
-  public void testChildrenUnmodifiable() {
+  public void childrenUnmodifiable() {
     final TestPredicate a = f("author", "alice");
     final TestPredicate b = f("author", "bob");
     final Predicate<String> n = and(a, b);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java
index 8f16670..550bee5 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/FieldPredicateTest.java
@@ -46,7 +46,7 @@
   }
 
   @Test
-  public void testNameValue() {
+  public void nameValue() {
     final String name = "author";
     final String value = "alice";
     final OperatorPredicate<String> f = f(name, value);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java
index 0256081..93c1bf4 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/NotPredicateTest.java
@@ -30,7 +30,7 @@
 
 public class NotPredicateTest extends PredicateTest {
   @Test
-  public void testNotNot() {
+  public void notNot() {
     final TestPredicate p = f("author", "bob");
     final Predicate<String> n = not(p);
     assertTrue(n instanceof NotPredicate);
@@ -39,7 +39,7 @@
   }
 
   @Test
-  public void testChildren() {
+  public void children() {
     final TestPredicate p = f("author", "bob");
     final Predicate<String> n = not(p);
     assertEquals(1, n.getChildCount());
@@ -47,7 +47,7 @@
   }
 
   @Test
-  public void testChildrenUnmodifiable() {
+  public void childrenUnmodifiable() {
     final TestPredicate p = f("author", "bob");
     final Predicate<String> n = not(p);
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java
index 5640d1b..27be48d 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/OrPredicateTest.java
@@ -29,7 +29,7 @@
 
 public class OrPredicateTest extends PredicateTest {
   @Test
-  public void testChildren() {
+  public void children() {
     final TestPredicate a = f("author", "alice");
     final TestPredicate b = f("author", "bob");
     final Predicate<String> n = or(a, b);
@@ -39,7 +39,7 @@
   }
 
   @Test
-  public void testChildrenUnmodifiable() {
+  public void childrenUnmodifiable() {
     final TestPredicate a = f("author", "alice");
     final TestPredicate b = f("author", "bob");
     final Predicate<String> n = or(a, b);
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java
index e349273..efa1039 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/QueryParserTest.java
@@ -20,7 +20,7 @@
 
 public class QueryParserTest {
   @Test
-  public void testProjectBare() throws QueryParseException {
+  public void projectBare() throws QueryParseException {
     Tree r;
 
     r = parse("project:tools/gerrit");
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/RegexPathPredicateTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/RegexPathPredicateTest.java
index 5532108..0480c5e 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/query/change/RegexPathPredicateTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/query/change/RegexPathPredicateTest.java
@@ -27,7 +27,7 @@
 
 public class RegexPathPredicateTest {
   @Test
-  public void testPrefixOnlyOptimization() throws OrmException {
+  public void prefixOnlyOptimization() throws OrmException {
     RegexPathPredicate p = predicate("^a/b/.*");
     assertTrue(p.match(change("a/b/source.c")));
     assertFalse(p.match(change("source.c")));
@@ -37,7 +37,7 @@
   }
 
   @Test
-  public void testPrefixReducesSearchSpace() throws OrmException {
+  public void prefixReducesSearchSpace() throws OrmException {
     RegexPathPredicate p = predicate("^a/b/.*\\.[ch]");
     assertTrue(p.match(change("a/b/source.c")));
     assertFalse(p.match(change("a/b/source.res")));
@@ -47,7 +47,7 @@
   }
 
   @Test
-  public void testFileExtension_Constant() throws OrmException {
+  public void fileExtension_Constant() throws OrmException {
     RegexPathPredicate p = predicate("^.*\\.res");
     assertTrue(p.match(change("test.res")));
     assertTrue(p.match(change("foo/bar/test.res")));
@@ -55,7 +55,7 @@
   }
 
   @Test
-  public void testFileExtension_CharacterGroup() throws OrmException {
+  public void fileExtension_CharacterGroup() throws OrmException {
     RegexPathPredicate p = predicate("^.*\\.[ch]");
     assertTrue(p.match(change("test.c")));
     assertTrue(p.match(change("test.h")));
@@ -63,7 +63,7 @@
   }
 
   @Test
-  public void testEndOfString() throws OrmException {
+  public void endOfString() throws OrmException {
     assertTrue(predicate("^a$").match(change("a")));
     assertFalse(predicate("^a$").match(change("a$")));
 
@@ -72,7 +72,7 @@
   }
 
   @Test
-  public void testExactMatch() throws OrmException {
+  public void exactMatch() throws OrmException {
     RegexPathPredicate p = predicate("^foo.c");
     assertTrue(p.match(change("foo.c")));
     assertFalse(p.match(change("foo.cc")));
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/HANATest.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/HANATest.java
index cb0ab11..76bee6f 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/HANATest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/HANATest.java
@@ -32,7 +32,7 @@
   }
 
   @Test
-  public void testGetUrl() throws Exception {
+  public void getUrl() throws Exception {
     config.setString("database", null, "instance", "3");
     assertThat(hana.getUrl()).isEqualTo("jdbc:sap://my.host:30315");
 
@@ -41,7 +41,7 @@
   }
 
   @Test
-  public void testGetIndexScript() throws Exception {
+  public void getIndexScript() throws Exception {
     assertThat(hana.getIndexScript()).isSameAs(ScriptRunner.NOOP);
   }
 }
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
index bd01be3..ccd399f 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaCreatorTest.java
@@ -72,7 +72,7 @@
   }
 
   @Test
-  public void testGetCauses_CreateSchema() throws OrmException, SQLException,
+  public void getCauses_CreateSchema() throws OrmException, SQLException,
       IOException {
     // Initially the schema should be empty.
     String[] types = {"TABLE", "VIEW"};
@@ -108,7 +108,7 @@
   }
 
   @Test
-  public void testCreateSchema_LabelTypes() throws Exception {
+  public void createSchema_LabelTypes() throws Exception {
     List<String> labels = new ArrayList<>();
     for (LabelType label : getLabelTypes().getLabelTypes()) {
       labels.add(label.getName());
@@ -117,7 +117,7 @@
   }
 
   @Test
-  public void testCreateSchema_Label_CodeReview() throws Exception {
+  public void createSchema_Label_CodeReview() throws Exception {
     LabelType codeReview = getLabelTypes().byLabel("Code-Review");
     assertThat(codeReview).isNotNull();
     assertThat(codeReview.getName()).isEqualTo("Code-Review");
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java
index 4b4309a..6723386 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/schema/SchemaUpdaterTest.java
@@ -72,7 +72,7 @@
   }
 
   @Test
-  public void testUpdate() throws OrmException, FileNotFoundException,
+  public void update() throws OrmException, FileNotFoundException,
       IOException {
     db.create();
 
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
index c5d9151..0d3dfb8 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/tools/hooks/CommitMsgHookTest.java
@@ -64,7 +64,7 @@
   }
 
   @Test
-  public void testEmptyMessages() throws Exception {
+  public void emptyMessages() throws Exception {
     // Empty input must yield empty output so commit will abort.
     // Note we must consider different commit templates formats.
     //
@@ -85,7 +85,7 @@
   }
 
   @Test
-  public void testChangeIdAlreadySet() throws Exception {
+  public void changeIdAlreadySet() throws Exception {
     // If a Change-Id is already present in the footer, the hook must
     // not modify the message but instead must leave the identity alone.
     //
@@ -107,7 +107,7 @@
   }
 
   @Test
-  public void testTimeAltersId() throws Exception {
+  public void timeAltersId() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Change-Id: I7fc3876fee63c766a2063df97fbe04a2dddd8d7c\n",//
@@ -127,7 +127,7 @@
   }
 
   @Test
-  public void testFirstParentAltersId() throws Exception {
+  public void firstParentAltersId() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Change-Id: I7fc3876fee63c766a2063df97fbe04a2dddd8d7c\n",//
@@ -141,7 +141,7 @@
   }
 
   @Test
-  public void testDirCacheAltersId() throws Exception {
+  public void dirCacheAltersId() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Change-Id: I7fc3876fee63c766a2063df97fbe04a2dddd8d7c\n",//
@@ -158,7 +158,7 @@
   }
 
   @Test
-  public void testSingleLineMessages() throws Exception {
+  public void singleLineMessages() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Change-Id: I7fc3876fee63c766a2063df97fbe04a2dddd8d7c\n",//
@@ -184,7 +184,7 @@
   }
 
   @Test
-  public void testMultiLineMessagesWithoutFooter() throws Exception {
+  public void multiLineMessagesWithoutFooter() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "b\n" + //
@@ -210,7 +210,7 @@
   }
 
   @Test
-  public void testSingleLineMessagesWithSignedOffBy() throws Exception {
+  public void singleLineMessagesWithSignedOffBy() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Change-Id: I7fc3876fee63c766a2063df97fbe04a2dddd8d7c\n" + //
@@ -226,7 +226,7 @@
   }
 
   @Test
-  public void testMultiLineMessagesWithSignedOffBy() throws Exception {
+  public void multiLineMessagesWithSignedOffBy() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "b\nc\nd\ne\n" + //
@@ -275,7 +275,7 @@
   }
 
   @Test
-  public void testNoteInMiddle() throws Exception {
+  public void noteInMiddle() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "NOTE: This\n" + //
@@ -289,7 +289,7 @@
   }
 
   @Test
-  public void testKernelStyleFooter() throws Exception {
+  public void kernelStyleFooter() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Change-Id: I1bd787f9e7590a2ac82b02c404c955ffb21877c4\n" + //
@@ -306,7 +306,7 @@
   }
 
   @Test
-  public void testChangeIdAfterBugOrIssue() throws Exception {
+  public void changeIdAfterBugOrIssue() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Bug: 42\n" + //
@@ -329,7 +329,7 @@
   }
 
   @Test
-  public void testCommitDashV() throws Exception {
+  public void commitDashV() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "Change-Id: I7fc3876fee63c766a2063df97fbe04a2dddd8d7c\n" + //
@@ -347,7 +347,7 @@
   }
 
   @Test
-  public void testWithEndingURL() throws Exception {
+  public void withEndingURL() throws Exception {
     assertEquals("a\n" + //
         "\n" + //
         "http://example.com/ fixes this\n" + //
@@ -383,7 +383,7 @@
   }
 
   @Test
-  public void testWithFalseTags() throws Exception {
+  public void withFalseTags() throws Exception {
     assertEquals("foo\n" + //
 	"\n" + //
 	"FakeLine:\n" + //
diff --git a/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java b/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java
index 3be4f8a..2a61165 100644
--- a/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java
+++ b/gerrit-server/src/test/java/com/google/gerrit/server/util/IdGeneratorTest.java
@@ -37,7 +37,7 @@
   }
 
   @Test
-  public void testFormat() {
+  public void format() {
     assertEquals("0000000f", IdGenerator.format(0xf));
     assertEquals("801234ab", IdGenerator.format(0x801234ab));
     assertEquals("deadbeef", IdGenerator.format(0xdeadbeef));
diff --git a/gerrit-sshd/BUILD b/gerrit-sshd/BUILD
index be49c73..2288e5d 100644
--- a/gerrit-sshd/BUILD
+++ b/gerrit-sshd/BUILD
@@ -1,53 +1,53 @@
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:junit.bzl", "junit_tests")
 
-SRCS = glob(['src/main/java/**/*.java'])
+SRCS = glob(["src/main/java/**/*.java"])
 
 java_library(
-  name = 'sshd',
-  srcs = SRCS,
-  deps = [
-    '//gerrit-extension-api:api',
-    '//gerrit-cache-h2:cache-h2',
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//gerrit-lucene:lucene',
-    '//gerrit-patch-jgit:server',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//gerrit-util-cli:cli',
-    '//lib:args4j',
-    '//lib:gson',
-    '//lib:guava',
-    '//lib:gwtorm',
-    '//lib:jsch',
-    '//lib:servlet-api-3_1',
-    '//lib/auto:auto-value',
-    '//lib/bouncycastle:bcprov',
-    '//lib/commons:codec',
-    '//lib/dropwizard:dropwizard-core',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:guice-servlet',  # SSH should not depend on servlet
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/jgit/org.eclipse.jgit.archive:jgit-archive',
-    '//lib/log:api',
-    '//lib/log:log4j',
-    '//lib/mina:core',
-    '//lib/mina:sshd',
-  ],
-  visibility = ['//visibility:public'],
+    name = "sshd",
+    srcs = SRCS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-cache-h2:cache-h2",
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//gerrit-extension-api:api",
+        "//gerrit-lucene:lucene",
+        "//gerrit-patch-jgit:server",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//gerrit-util-cli:cli",
+        "//lib:args4j",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:jsch",
+        "//lib:servlet-api-3_1",
+        "//lib/auto:auto-value",
+        "//lib/bouncycastle:bcprov",
+        "//lib/commons:codec",
+        "//lib/dropwizard:dropwizard-core",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:guice-servlet",  # SSH should not depend on servlet
+        "//lib/jgit/org.eclipse.jgit.archive:jgit-archive",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//lib/log:log4j",
+        "//lib/mina:core",
+        "//lib/mina:sshd",
+    ],
 )
 
 junit_tests(
-  name = 'sshd_tests',
-  srcs = glob(
-    ['src/test/java/**/*.java'],
-  ),
-  deps = [
-    ':sshd',
-    '//gerrit-extension-api:api',
-    '//gerrit-server:server',
-    '//lib:truth',
-    '//lib/mina:sshd',
-  ],
+    name = "sshd_tests",
+    srcs = glob(
+        ["src/test/java/**/*.java"],
+    ),
+    deps = [
+        ":sshd",
+        "//gerrit-extension-api:api",
+        "//gerrit-server:server",
+        "//lib:truth",
+        "//lib/mina:sshd",
+    ],
 )
diff --git a/gerrit-util-cli/BUILD b/gerrit-util-cli/BUILD
index f3be5f3..bb282f4 100644
--- a/gerrit-util-cli/BUILD
+++ b/gerrit-util-cli/BUILD
@@ -1,13 +1,13 @@
 java_library(
-  name = 'cli',
-  srcs = glob(['src/main/java/**/*.java']),
-  deps = [
-    '//gerrit-common:annotations',
-    '//gerrit-common:server',
-    '//lib:args4j',
-    '//lib:guava',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-  ],
-  visibility = ['//visibility:public'],
+    name = "cli",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-common:annotations",
+        "//gerrit-common:server",
+        "//lib:args4j",
+        "//lib:guava",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+    ],
 )
diff --git a/gerrit-util-http/BUILD b/gerrit-util-http/BUILD
index c5d72ba..47cc62e 100644
--- a/gerrit-util-http/BUILD
+++ b/gerrit-util-http/BUILD
@@ -1,40 +1,40 @@
-load('//tools/bzl:junit.bzl', 'junit_tests')
+load("//tools/bzl:junit.bzl", "junit_tests")
 
 java_library(
-  name = 'http',
-  srcs = glob(['src/main/java/**/*.java']),
-  deps = ['//lib:servlet-api-3_1'],
-  visibility = ['//visibility:public'],
+    name = "http",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = ["//lib:servlet-api-3_1"],
 )
 
-TESTUTIL_SRCS = glob(['src/test/**/testutil/**/*.java'])
+TESTUTIL_SRCS = glob(["src/test/**/testutil/**/*.java"])
 
 java_library(
-  name = 'testutil',
-  srcs = TESTUTIL_SRCS,
-  deps = [
-    '//gerrit-extension-api:api',
-    '//lib:guava',
-    '//lib:servlet-api-3_1',
-    '//lib/httpcomponents:httpclient',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-  ],
-  visibility = ['//visibility:public'],
-  testonly = 1,
+    name = "testutil",
+    testonly = 1,
+    srcs = TESTUTIL_SRCS,
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-extension-api:api",
+        "//lib:guava",
+        "//lib:servlet-api-3_1",
+        "//lib/httpcomponents:httpclient",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+    ],
 )
 
 junit_tests(
-  name = 'http_tests',
-  srcs = glob(
-    ['src/test/java/**/*.java'],
-    exclude = TESTUTIL_SRCS,
-  ),
-  deps = [
-    ':http',
-    ':testutil',
-    '//lib:junit',
-    '//lib:servlet-api-3_1-without-neverlink',
-    '//lib:truth',
-    '//lib/easymock:easymock',
-  ],
+    name = "http_tests",
+    srcs = glob(
+        ["src/test/java/**/*.java"],
+        exclude = TESTUTIL_SRCS,
+    ),
+    deps = [
+        ":http",
+        ":testutil",
+        "//lib:junit",
+        "//lib:servlet-api-3_1-without-neverlink",
+        "//lib:truth",
+        "//lib/easymock",
+    ],
 )
diff --git a/gerrit-util-ssl/BUILD b/gerrit-util-ssl/BUILD
index 6333d45..ce53a26 100644
--- a/gerrit-util-ssl/BUILD
+++ b/gerrit-util-ssl/BUILD
@@ -1,5 +1,5 @@
 java_library(
-  name = 'ssl',
-  srcs = glob(['src/main/java/**/*.java']),
-  visibility = ['//visibility:public'],
+    name = "ssl",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
 )
diff --git a/gerrit-war/BUILD b/gerrit-war/BUILD
index 8f4946a..66a0a47 100644
--- a/gerrit-war/BUILD
+++ b/gerrit-war/BUILD
@@ -1,71 +1,71 @@
-load('//tools/bzl:genrule2.bzl', 'genrule2')
+load("//tools/bzl:genrule2.bzl", "genrule2")
 
 java_library(
-  name = 'init',
-  srcs = glob(['src/main/java/**/*.java']),
-  deps = [
-    '//gerrit-cache-h2:cache-h2',
-    '//gerrit-elasticsearch:elasticsearch',
-    '//gerrit-extension-api:api',
-    '//gerrit-gpg:gpg',
-    '//gerrit-httpd:httpd',
-    '//gerrit-lucene:lucene',
-    '//gerrit-oauth:oauth',
-    '//gerrit-openid:openid',
-    '//gerrit-pgm:http',
-    '//gerrit-pgm:init',
-    '//gerrit-pgm:init-api',
-    '//gerrit-pgm:util',
-    '//gerrit-reviewdb:server',
-    '//gerrit-server:server',
-    '//gerrit-server/src/main/prolog:common',
-    '//gerrit-sshd:sshd',
-    '//lib:guava',
-    '//lib:gwtorm',
-    '//lib:servlet-api-3_1',
-    '//lib/guice:guice',
-    '//lib/guice:guice-servlet',
-    '//lib/jgit/org.eclipse.jgit:jgit',
-    '//lib/log:api',
-  ],
-  visibility = ['//visibility:public'],
+    name = "init",
+    srcs = glob(["src/main/java/**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-cache-h2:cache-h2",
+        "//gerrit-elasticsearch:elasticsearch",
+        "//gerrit-extension-api:api",
+        "//gerrit-gpg:gpg",
+        "//gerrit-httpd:httpd",
+        "//gerrit-lucene:lucene",
+        "//gerrit-oauth:oauth",
+        "//gerrit-openid:openid",
+        "//gerrit-pgm:http",
+        "//gerrit-pgm:init",
+        "//gerrit-pgm:init-api",
+        "//gerrit-pgm:util",
+        "//gerrit-reviewdb:server",
+        "//gerrit-server:server",
+        "//gerrit-server/src/main/prolog:common",
+        "//gerrit-sshd:sshd",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:servlet-api-3_1",
+        "//lib/guice",
+        "//lib/guice:guice-servlet",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+    ],
 )
 
 genrule2(
-  name = 'webapp_assets',
-  cmd = 'cd gerrit-war/src/main/webapp; zip -qr $$ROOT/$@ .',
-  srcs = glob(['src/main/webapp/**/*']),
-  outs = [ 'webapp_assets.zip' ],
-  visibility = ['//visibility:public'],
+    name = "webapp_assets",
+    srcs = glob(["src/main/webapp/**/*"]),
+    outs = ["webapp_assets.zip"],
+    cmd = "cd gerrit-war/src/main/webapp; zip -qr $$ROOT/$@ .",
+    visibility = ["//visibility:public"],
 )
 
 java_import(
-  name = 'log4j-config',
-  jars = [':log4j-config__jar'],
-  visibility = ['//visibility:public'],
+    name = "log4j-config",
+    jars = [":log4j-config__jar"],
+    visibility = ["//visibility:public"],
 )
 
 genrule2(
-  name = 'log4j-config__jar',
-  cmd = 'cd gerrit-war/src/main/resources && zip -9Dqr $$ROOT/$@ .',
-  srcs = ['src/main/resources/log4j.properties'],
-  outs = [ 'log4j-config.jar' ],
+    name = "log4j-config__jar",
+    srcs = ["src/main/resources/log4j.properties"],
+    outs = ["log4j-config.jar"],
+    cmd = "cd gerrit-war/src/main/resources && zip -9Dqr $$ROOT/$@ .",
 )
 
 java_import(
-  name = 'version',
-  jars = [':gen_version'],
-  visibility = ['//visibility:public'],
+    name = "version",
+    jars = [":gen_version"],
+    visibility = ["//visibility:public"],
 )
 
 genrule2(
-  name = 'gen_version',
-  cmd = ' && '.join([
-    'cd $$TMP',
-    'mkdir -p com/google/gerrit/common',
-    'cat $$ROOT/$(location //:version.txt) >com/google/gerrit/common/Version',
-    'zip -9Dqr $$ROOT/$@ .',
-  ]),
-  tools = ['//:version.txt'],
-  outs = [ 'gen_version.jar' ],
+    name = "gen_version",
+    outs = ["gen_version.jar"],
+    cmd = " && ".join([
+        "cd $$TMP",
+        "mkdir -p com/google/gerrit/common",
+        "cat $$ROOT/$(location //:version.txt) >com/google/gerrit/common/Version",
+        "zip -9Dqr $$ROOT/$@ .",
+    ]),
+    tools = ["//:version.txt"],
 )
diff --git a/lib/BUILD b/lib/BUILD
index a4f1d51..ca0fec3 100644
--- a/lib/BUILD
+++ b/lib/BUILD
@@ -1,288 +1,289 @@
 exports_files(glob([
-  "LICENSE-*"
+    "LICENSE-*",
 ]))
 
 filegroup(
-  name = 'all-licenses',
-  srcs = glob(['LICENSE-*'], exclude = ['LICENSE-DO_NOT_DISTRIBUTE']),
-  visibility = ['//visibility:public'],
+    name = "all-licenses",
+    srcs = glob(
+        ["LICENSE-*"],
+        exclude = ["LICENSE-DO_NOT_DISTRIBUTE"],
+    ),
+    visibility = ["//visibility:public"],
 )
 
 java_library(
-  name = 'servlet-api-3_1',
-  neverlink = 1,
-  exports = ['@servlet_api_3_1//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "servlet-api-3_1",
+    data = ["//lib:LICENSE-Apache2.0"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@servlet_api_3_1//jar"],
 )
 
 java_library(
-  name = 'servlet-api-3_1-without-neverlink',
-  exports = ['@servlet_api_3_1//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "servlet-api-3_1-without-neverlink",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@servlet_api_3_1//jar"],
 )
 
 java_library(
-  name = 'gwtjsonrpc',
-  exports = ['@gwtjsonrpc//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "gwtjsonrpc",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@gwtjsonrpc//jar"],
 )
 
 java_library(
-  name = 'gwtjsonrpc_src',
-  exports = ['@gwtjsonrpc//jar:src'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "gwtjsonrpc_src",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@gwtjsonrpc//jar:src"],
 )
 
 java_library(
-  name = 'gson',
-  exports = ['@gson//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "gson",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@gson//jar"],
 )
 
 java_library(
-  name = 'gwtorm_client',
-  exports = ['@gwtorm_client//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "gwtorm_client",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@gwtorm_client//jar"],
 )
 
 java_library(
-  name = 'gwtorm_client_src',
-  exports = ['@gwtorm_client//jar:src'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "gwtorm_client_src",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@gwtorm_client//jar:src"],
 )
 
 java_library(
-  name = 'protobuf',
-  exports = ['@protobuf//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-protobuf'],
+    name = "protobuf",
+    data = ["//lib:LICENSE-protobuf"],
+    visibility = ["//visibility:public"],
+    exports = ["@protobuf//jar"],
 )
 
 java_library(
-  name = 'gwtorm',
-  exports = [':gwtorm_client'],
-  runtime_deps = [':protobuf'],
-  visibility = ['//visibility:public'],
+    name = "gwtorm",
+    visibility = ["//visibility:public"],
+    exports = [":gwtorm_client"],
+    runtime_deps = [":protobuf"],
 )
 
 java_library(
-  name = 'guava',
-  exports = ['@guava//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "guava",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@guava//jar"],
 )
 
 java_library(
-  name = 'velocity',
-  exports = ['@velocity//jar'],
-  runtime_deps = [
-    '//lib/commons:collections',
-    '//lib/commons:lang',
-    '//lib/commons:oro',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "velocity",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@velocity//jar"],
+    runtime_deps = [
+        "//lib/commons:collections",
+        "//lib/commons:lang",
+        "//lib/commons:oro",
+    ],
 )
 
 java_library(
-  name = 'jsch',
-  exports = ['@jsch//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-jsch'],
+    name = "jsch",
+    data = ["//lib:LICENSE-jsch"],
+    visibility = ["//visibility:public"],
+    exports = ["@jsch//jar"],
 )
 
 java_library(
-  name = 'juniversalchardet',
-  exports = ['@juniversalchardet//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-MPL1.1'],
+    name = "juniversalchardet",
+    data = ["//lib:LICENSE-MPL1.1"],
+    visibility = ["//visibility:public"],
+    exports = ["@juniversalchardet//jar"],
 )
 
 java_library(
-  name = 'args4j',
-  exports = ['@args4j//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-args4j'],
+    name = "args4j",
+    data = ["//lib:LICENSE-args4j"],
+    visibility = ["//visibility:public"],
+    exports = ["@args4j//jar"],
 )
 
 java_library(
-  name = 'automaton',
-  exports = ['@automaton//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-automaton'],
+    name = "automaton",
+    data = ["//lib:LICENSE-automaton"],
+    visibility = ["//visibility:public"],
+    exports = ["@automaton//jar"],
 )
 
 java_library(
-  name = 'pegdown',
-  exports = ['@pegdown//jar'],
-  runtime_deps = [':grappa'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "pegdown",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@pegdown//jar"],
+    runtime_deps = [":grappa"],
 )
 
 java_library(
-  name = 'grappa',
-  exports = ['@grappa//jar'],
-  runtime_deps = [
-    ':jitescript',
-    '//lib/ow2:ow2-asm',
-    '//lib/ow2:ow2-asm-analysis',
-    '//lib/ow2:ow2-asm-tree',
-    '//lib/ow2:ow2-asm-util',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "grappa",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@grappa//jar"],
+    runtime_deps = [
+        ":jitescript",
+        "//lib/ow2:ow2-asm",
+        "//lib/ow2:ow2-asm-analysis",
+        "//lib/ow2:ow2-asm-tree",
+        "//lib/ow2:ow2-asm-util",
+    ],
 )
 
 java_library(
-  name = 'jitescript',
-  exports = ['@jitescript//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "jitescript",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jitescript//jar"],
 )
 
 java_library(
-  name = 'tukaani-xz',
-  exports = ['@tukaani_xz//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-xz'],
+    name = "tukaani-xz",
+    data = ["//lib:LICENSE-xz"],
+    visibility = ["//visibility:public"],
+    exports = ["@tukaani_xz//jar"],
 )
 
 java_library(
-  name = 'mime-util',
-  exports = ['@mime_util//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "mime-util",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@mime_util//jar"],
 )
 
 java_library(
-  name = 'guava-retrying',
-  exports = ['@guava_retrying//jar'],
-  runtime_deps = [':jsr305'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "guava-retrying",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@guava_retrying//jar"],
+    runtime_deps = [":jsr305"],
 )
 
 java_library(
-  name = 'jsr305',
-  exports = ['@jsr305//jar'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "jsr305",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jsr305//jar"],
 )
 
 java_library(
-  name = 'blame-cache',
-  exports = ['@blame_cache//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
-)
-
-
-java_library(
-  name = 'h2',
-  exports = ['@h2//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-h2'],
-)
-
-
-java_library(
-  name = 'jimfs',
-  exports = ['@jimfs//jar'],
-  runtime_deps = [':guava'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "blame-cache",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@blame_cache//jar"],
 )
 
 java_library(
-  name = 'junit',
-  exports = [
-    '@junit//jar',
-    ':hamcrest-core',
-  ],
-  runtime_deps = [':hamcrest-core'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "h2",
+    data = ["//lib:LICENSE-h2"],
+    visibility = ["//visibility:public"],
+    exports = ["@h2//jar"],
 )
 
 java_library(
-  name = 'hamcrest-core',
-  exports = ['@hamcrest_core//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "jimfs",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@jimfs//jar"],
+    runtime_deps = [":guava"],
 )
 
 java_library(
-  name = 'truth',
-  exports = [
-    '@truth//jar',
-    ':guava',
-    ':junit',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "junit",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":hamcrest-core",
+        "@junit//jar",
+    ],
+    runtime_deps = [":hamcrest-core"],
 )
 
 java_library(
-  name = 'javassist',
-  exports = ['@javassist//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "hamcrest-core",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@hamcrest_core//jar"],
 )
 
 java_library(
-  name = 'derby',
-  exports = ['@derby//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "truth",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":guava",
+        ":junit",
+        "@truth//jar",
+    ],
 )
 
 java_library(
-  name = 'soy',
-  exports = ['@soy//jar'],
-  runtime_deps = [
-    ':args4j',
-    ':guava',
-    ':gson',
-    ':icu4j',
-    ':jsr305',
-    ':protobuf',
-    '//lib/guice:guice',
-    '//lib/guice:guice-assistedinject',
-    '//lib/guice:multibindings',
-    '//lib/guice:javax-inject',
-    '//lib/ow2:ow2-asm',
-    '//lib/ow2:ow2-asm-analysis',
-    '//lib/ow2:ow2-asm-commons',
-    '//lib/ow2:ow2-asm-util',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "javassist",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@javassist//jar"],
 )
 
 java_library(
-  name = 'icu4j',
-  exports = [ '@icu4j//jar' ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-icu4j'],
+    name = "derby",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@derby//jar"],
 )
 
 java_library(
-  name = 'postgresql',
-  exports = ['@postgresql//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-postgresql'],
+    name = "soy",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@soy//jar"],
+    runtime_deps = [
+        ":args4j",
+        ":gson",
+        ":guava",
+        ":icu4j",
+        ":jsr305",
+        ":protobuf",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/guice:javax-inject",
+        "//lib/guice:multibindings",
+        "//lib/ow2:ow2-asm",
+        "//lib/ow2:ow2-asm-analysis",
+        "//lib/ow2:ow2-asm-commons",
+        "//lib/ow2:ow2-asm-util",
+    ],
 )
 
 java_library(
-  name = 'commons-io',
-  exports = ['@commons_io//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "icu4j",
+    data = ["//lib:LICENSE-icu4j"],
+    visibility = ["//visibility:public"],
+    exports = ["@icu4j//jar"],
+)
+
+java_library(
+    name = "postgresql",
+    data = ["//lib:LICENSE-postgresql"],
+    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/antlr/BUILD b/lib/antlr/BUILD
index 92f3d0f..6afe7b8 100644
--- a/lib/antlr/BUILD
+++ b/lib/antlr/BUILD
@@ -1,34 +1,33 @@
-
 [java_library(
-  name = n,
-  exports = ['@%s//jar' % n],
-  data = ['//lib:LICENSE-antlr'],
+    name = n,
+    data = ["//lib:LICENSE-antlr"],
+    exports = ["@%s//jar" % n],
 ) for n in [
-  'antlr27',
-  'stringtemplate',
+    "antlr27",
+    "stringtemplate",
 ]]
 
 java_library(
-  name = 'java_runtime',
-  exports = ['@java_runtime//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-antlr'],
+    name = "java_runtime",
+    data = ["//lib:LICENSE-antlr"],
+    visibility = ["//visibility:public"],
+    exports = ["@java_runtime//jar"],
 )
 
 java_binary(
-  name = 'antlr-tool',
-  main_class = 'org.antlr.Tool',
-  runtime_deps = [':tool'],
-  visibility = ['//gerrit-antlr:__pkg__'],
+    name = "antlr-tool",
+    main_class = "org.antlr.Tool",
+    visibility = ["//gerrit-antlr:__pkg__"],
+    runtime_deps = [":tool"],
 )
 
 java_library(
-  name = 'tool',
-  exports = ['@org_antlr//jar'],
-  runtime_deps = [
-    ':antlr27',
-    ':java_runtime',
-    ':stringtemplate',
-  ],
-  data = ['//lib:LICENSE-antlr'],
+    name = "tool",
+    data = ["//lib:LICENSE-antlr"],
+    exports = ["@org_antlr//jar"],
+    runtime_deps = [
+        ":antlr27",
+        ":java_runtime",
+        ":stringtemplate",
+    ],
 )
diff --git a/lib/asciidoctor/BUILD b/lib/asciidoctor/BUILD
index d1b98f8..c7567d9 100644
--- a/lib/asciidoctor/BUILD
+++ b/lib/asciidoctor/BUILD
@@ -1,54 +1,54 @@
 java_binary(
-  name = "asciidoc",
-  main_class = "AsciiDoctor",
-  runtime_deps = [":asciidoc_lib"],
-  visibility = ["//visibility:public"],
+    name = "asciidoc",
+    main_class = "AsciiDoctor",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":asciidoc_lib"],
 )
 
 java_library(
-  name = "asciidoc_lib",
-  srcs = ["java/AsciiDoctor.java"],
-  deps = [
-    ":asciidoctor",
-    "//lib:args4j",
-    "//lib:guava",
-    "//lib/log:api",
-    "//lib/log:nop",
-  ],
-  visibility = ["//visibility:public"],
+    name = "asciidoc_lib",
+    srcs = ["java/AsciiDoctor.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":asciidoctor",
+        "//lib:args4j",
+        "//lib:guava",
+        "//lib/log:api",
+        "//lib/log:nop",
+    ],
 )
 
 java_binary(
-  name = "doc_indexer",
-  main_class = "DocIndexer",
-  runtime_deps = [":doc_indexer_lib"],
-  visibility = ["//visibility:public"],
+    name = "doc_indexer",
+    main_class = "DocIndexer",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":doc_indexer_lib"],
 )
 
 java_library(
-  name = "doc_indexer_lib",
-  srcs = ["java/DocIndexer.java"],
-  deps = [
-    ":asciidoc_lib",
-    "//gerrit-server:constants",
-    "//lib:args4j",
-    "//lib:guava",
-    "//lib/lucene:lucene-analyzers-common",
-    "//lib/lucene:lucene-core-and-backward-codecs",
-  ],
-  visibility = ["//visibility:public"],
+    name = "doc_indexer_lib",
+    srcs = ["java/DocIndexer.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":asciidoc_lib",
+        "//gerrit-server:constants",
+        "//lib:args4j",
+        "//lib:guava",
+        "//lib/lucene:lucene-analyzers-common",
+        "//lib/lucene:lucene-core-and-backward-codecs",
+    ],
 )
 
 java_library(
-  name = "asciidoctor",
-  exports = ["@asciidoctor//jar"],
-  runtime_deps = [":jruby"],
-  visibility = ["//visibility:public"],
-  data = ["//lib:LICENSE-asciidoctor"],
+    name = "asciidoctor",
+    data = ["//lib:LICENSE-asciidoctor"],
+    visibility = ["//visibility:public"],
+    exports = ["@asciidoctor//jar"],
+    runtime_deps = [":jruby"],
 )
 
 java_library(
-  name = "jruby",
-  exports = ["@jruby//jar"],
-  data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    name = "jruby",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    exports = ["@jruby//jar"],
 )
diff --git a/lib/auto/BUILD b/lib/auto/BUILD
index c50c105..569398e 100644
--- a/lib/auto/BUILD
+++ b/lib/auto/BUILD
@@ -1,22 +1,22 @@
 java_plugin(
-  name = 'auto-annotation-plugin',
-  processor_class = 'com.google.auto.value.processor.AutoAnnotationProcessor',
-  deps = ['@auto_value//jar'],
+    name = "auto-annotation-plugin",
+    processor_class = "com.google.auto.value.processor.AutoAnnotationProcessor",
+    deps = ["@auto_value//jar"],
 )
 
 java_plugin(
-  name = 'auto-value-plugin',
-  processor_class = 'com.google.auto.value.processor.AutoValueProcessor',
-  deps = ['@auto_value//jar'],
+    name = "auto-value-plugin",
+    processor_class = "com.google.auto.value.processor.AutoValueProcessor",
+    deps = ["@auto_value//jar"],
 )
 
 java_library(
-  name = 'auto-value',
-  exported_plugins = [
-    ':auto-annotation-plugin',
-    ':auto-value-plugin',
-  ],
-  exports = ['@auto_value//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "auto-value",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exported_plugins = [
+        ":auto-annotation-plugin",
+        ":auto-value-plugin",
+    ],
+    visibility = ["//visibility:public"],
+    exports = ["@auto_value//jar"],
 )
diff --git a/lib/bouncycastle/BUILD b/lib/bouncycastle/BUILD
index 333c355..4ec7fa0 100644
--- a/lib/bouncycastle/BUILD
+++ b/lib/bouncycastle/BUILD
@@ -1,44 +1,44 @@
 java_library(
-  name = 'bcprov',
-  neverlink = 1,
-  exports = ['@bcprov//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "bcprov",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@bcprov//jar"],
 )
 
 java_library(
-  name = 'bcprov-without-neverlink',
-  exports = ['@bcprov//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "bcprov-without-neverlink",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@bcprov//jar"],
 )
 
 java_library(
-  name = 'bcpg',
-  neverlink = 1,
-  exports = ['@bcpg//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "bcpg",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@bcpg//jar"],
 )
 
 java_library(
-  name = 'bcpg-without-neverlink',
-  exports = ['@bcpg//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "bcpg-without-neverlink",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@bcpg//jar"],
 )
 
 java_library(
-  name = 'bcpkix',
-  neverlink = 1,
-  exports = ['@bcpkix//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "bcpkix",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@bcpkix//jar"],
 )
 
 java_library(
-  name = 'bcpkix-without-neverlink',
-  exports = ['@bcpkix//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "bcpkix-without-neverlink",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@bcpkix//jar"],
 )
diff --git a/lib/codemirror/BUILD b/lib/codemirror/BUILD
index 0a62d41..56ed174 100644
--- a/lib/codemirror/BUILD
+++ b/lib/codemirror/BUILD
@@ -1,2 +1,3 @@
-load('//lib/codemirror:cm.bzl', 'pkg_cm')
+load("//lib/codemirror:cm.bzl", "pkg_cm")
+
 pkg_cm()
diff --git a/lib/commons/BUILD b/lib/commons/BUILD
index d4d6145..cc4de55 100644
--- a/lib/commons/BUILD
+++ b/lib/commons/BUILD
@@ -1,71 +1,71 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
 
 java_library(
-  name = 'codec',
-  exports = ['@commons_codec//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "codec",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_codec//jar"],
 )
 
 java_library(
-  name = 'collections',
-  exports = ['@commons_collections//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "collections",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_collections//jar"],
 )
 
 java_library(
-  name = 'compress',
-  exports = ['@commons_compress//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "compress",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_compress//jar"],
 )
 
 java_library(
-  name = 'lang',
-  exports = ['@commons_lang//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lang",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_lang//jar"],
 )
 
 java_library(
-  name = 'lang3',
-  exports = [ '@commons_lang3//jar'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lang3",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@commons_lang3//jar"],
 )
 
 java_library(
-  name = 'net',
-  exports = ['@commons_net//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "net",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_net//jar"],
 )
 
 java_library(
-  name = 'dbcp',
-  exports = ['@commons_dbcp//jar'],
-  runtime_deps = [':pool'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "dbcp",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_dbcp//jar"],
+    runtime_deps = [":pool"],
 )
 
 java_library(
-  name = 'pool',
-  exports = ['@commons_pool//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "pool",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_pool//jar"],
 )
 
 java_library(
-  name = 'oro',
-  exports = ['@commons_oro//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache1.1'],
+    name = "oro",
+    data = ["//lib:LICENSE-Apache1.1"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_oro//jar"],
 )
 
 java_library(
-  name = 'validator',
-  exports = ['@commons_validator//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "validator",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@commons_validator//jar"],
 )
diff --git a/lib/dropwizard/BUILD b/lib/dropwizard/BUILD
index b456d5e..dd14699 100644
--- a/lib/dropwizard/BUILD
+++ b/lib/dropwizard/BUILD
@@ -1,6 +1,6 @@
 java_library(
-  name = 'dropwizard-core',
-  exports = ['@dropwizard_core//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "dropwizard-core",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@dropwizard_core//jar"],
 )
diff --git a/lib/easymock/BUILD b/lib/easymock/BUILD
index fce3ff7..b579ec5 100644
--- a/lib/easymock/BUILD
+++ b/lib/easymock/BUILD
@@ -1,25 +1,24 @@
 java_library(
-  name = 'easymock',
-  exports = ['@easymock//jar'],
-  runtime_deps = [
-    ':cglib-3_2',
-    ':objenesis',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "easymock",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@easymock//jar"],
+    runtime_deps = [
+        ":cglib-3_2",
+        ":objenesis",
+    ],
 )
 
 java_library(
-  name = 'cglib-3_2',
-  exports = ['@cglib_3_2//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "cglib-3_2",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@cglib_3_2//jar"],
 )
 
 java_library(
-  name = 'objenesis',
-  exports = ['@objenesis//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "objenesis",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@objenesis//jar"],
 )
-
diff --git a/lib/elasticsearch/BUILD b/lib/elasticsearch/BUILD
index 6c3d423..8dc4bce 100644
--- a/lib/elasticsearch/BUILD
+++ b/lib/elasticsearch/BUILD
@@ -1,92 +1,92 @@
-package(default_visibility=['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
 
 java_library(
-  name = 'elasticsearch',
-  data = [ '//lib:LICENSE-Apache2.0' ],
-  exports = [ '@elasticsearch//jar' ],
-  runtime_deps = [
-    ':jna',
-    ':hppc',
-    ':jsr166e',
-    ':netty',
-    ':t-digest',
-    ':compress-lzf',
-    '//lib/joda:joda-time',
-    '//lib/lucene:lucene-codecs',
-    '//lib/lucene:lucene-highlighter',
-    '//lib/lucene:lucene-join',
-    '//lib/lucene:lucene-memory',
-    '//lib/lucene:lucene-sandbox',
-    '//lib/lucene:lucene-suggest',
-    '//lib/lucene:lucene-queries',
-    '//lib/lucene:lucene-spatial',
-    '//lib/jackson:jackson-core',
-    '//lib/jackson:jackson-dataformat-cbor',
-    '//lib/jackson:jackson-dataformat-smile',
-  ]
+    name = "elasticsearch",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@elasticsearch//jar"],
+    runtime_deps = [
+        ":compress-lzf",
+        ":hppc",
+        ":jna",
+        ":jsr166e",
+        ":netty",
+        ":t-digest",
+        "//lib/jackson:jackson-core",
+        "//lib/jackson:jackson-dataformat-cbor",
+        "//lib/jackson:jackson-dataformat-smile",
+        "//lib/joda:joda-time",
+        "//lib/lucene:lucene-codecs",
+        "//lib/lucene:lucene-highlighter",
+        "//lib/lucene:lucene-join",
+        "//lib/lucene:lucene-memory",
+        "//lib/lucene:lucene-queries",
+        "//lib/lucene:lucene-sandbox",
+        "//lib/lucene:lucene-spatial",
+        "//lib/lucene:lucene-suggest",
+    ],
 )
 
 # Java REST client for Elasticsearch.
-VERSION = '0.1.7'
+VERSION = "0.1.7"
 
 java_library(
-  name = 'jest-common',
-  exports = [ '@jest_common//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
+    name = "jest-common",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jest_common//jar"],
 )
 
 java_library(
-  name = 'jest',
-  exports = [ '@jest//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
-  runtime_deps = [
-    ':elasticsearch',
-    ':jest-common',
-    '//lib/commons:lang3',
-    '//lib/httpcomponents:httpasyncclient',
-    '//lib/httpcomponents:httpclient',
-    '//lib/httpcomponents:httpcore-nio',
-    '//lib/httpcomponents:httpcore-niossl',
-  ],
+    name = "jest",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jest//jar"],
+    runtime_deps = [
+        ":elasticsearch",
+        ":jest-common",
+        "//lib/commons:lang3",
+        "//lib/httpcomponents:httpasyncclient",
+        "//lib/httpcomponents:httpclient",
+        "//lib/httpcomponents:httpcore-nio",
+        "//lib/httpcomponents:httpcore-niossl",
+    ],
 )
 
 java_library(
-  name = 'compress-lzf',
-  exports = [ '@compress_lzf//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
-  visibility = ['//lib/elasticsearch:__pkg__'],
+    name = "compress-lzf",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//lib/elasticsearch:__pkg__"],
+    exports = ["@compress_lzf//jar"],
 )
 
 java_library(
-  name = 'hppc',
-  exports = [ '@hppc//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
-  visibility = ['//lib/elasticsearch:__pkg__'],
+    name = "hppc",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//lib/elasticsearch:__pkg__"],
+    exports = ["@hppc//jar"],
 )
 
 java_library(
-  name = 'jsr166e',
-  exports = [ '@jsr166e//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
-  visibility = ['//lib/elasticsearch:__pkg__'],
+    name = "jsr166e",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//lib/elasticsearch:__pkg__"],
+    exports = ["@jsr166e//jar"],
 )
 
 java_library(
-  name = 'netty',
-  exports = [ '@netty//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
-  visibility = ['//lib/elasticsearch:__pkg__'],
+    name = "netty",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//lib/elasticsearch:__pkg__"],
+    exports = ["@netty//jar"],
 )
 
 java_library(
-  name = 't-digest',
-  exports = [ '@t_digest//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
-  visibility = ['//lib/elasticsearch:__pkg__'],
+    name = "t-digest",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//lib/elasticsearch:__pkg__"],
+    exports = ["@t_digest//jar"],
 )
 
 java_library(
-  name = 'jna',
-  exports = [ '@jna//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
+    name = "jna",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jna//jar"],
 )
diff --git a/lib/fonts/BUILD b/lib/fonts/BUILD
index a764524..fb5ea84 100644
--- a/lib/fonts/BUILD
+++ b/lib/fonts/BUILD
@@ -1,13 +1,13 @@
-load('//tools/bzl:genrule2.bzl', 'genrule2')
+load("//tools/bzl:genrule2.bzl", "genrule2")
 
 # Source Code Pro. Version 2.010 Roman / 1.030 Italics
 # https://github.com/adobe-fonts/source-code-pro/releases/tag/2.010R-ro%2F1.030R-it
 filegroup(
-  name = 'sourcecodepro',
-  srcs = [
-    'SourceCodePro-Regular.woff',
-    'SourceCodePro-Regular.woff2'
-  ],
-  data = [ "//lib:LICENSE-OFL1.1" ],
-  visibility = ['//visibility:public'],
+    name = "sourcecodepro",
+    srcs = [
+        "SourceCodePro-Regular.woff",
+        "SourceCodePro-Regular.woff2",
+    ],
+    data = ["//lib:LICENSE-OFL1.1"],
+    visibility = ["//visibility:public"],
 )
diff --git a/lib/greenmail/BUILD b/lib/greenmail/BUILD
index 9dd45bc..55eb9f3 100644
--- a/lib/greenmail/BUILD
+++ b/lib/greenmail/BUILD
@@ -1,7 +1,8 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
+
 java_library(
-  name = 'greenmail',
-  exports = ['@greenmail//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "greenmail",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@greenmail//jar"],
 )
diff --git a/lib/guice/BUILD b/lib/guice/BUILD
index 43018e0..6d7bf91 100644
--- a/lib/guice/BUILD
+++ b/lib/guice/BUILD
@@ -1,54 +1,54 @@
 java_library(
-  name = 'guice',
-  exports = [
-    ':guice_library',
-    ':javax-inject',
-    ':multibindings',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "guice",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":guice_library",
+        ":javax-inject",
+        ":multibindings",
+    ],
 )
 
 java_library(
-  name = 'guice_library',
-  exports = ['@guice_library//jar'],
-  runtime_deps = ['aopalliance'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "guice_library",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@guice_library//jar"],
+    runtime_deps = ["aopalliance"],
 )
 
 java_library(
-  name = 'guice-assistedinject',
-  exports = ['@guice_assistedinject//jar'],
-  runtime_deps = [':guice'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "guice-assistedinject",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@guice_assistedinject//jar"],
+    runtime_deps = [":guice"],
 )
 
 java_library(
-  name = 'guice-servlet',
-  exports = ['@guice_servlet//jar'],
-  runtime_deps = [':guice'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "guice-servlet",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@guice_servlet//jar"],
+    runtime_deps = [":guice"],
 )
 
 java_library(
-  name = 'aopalliance',
-  exports = ['@aopalliance//jar'],
-  data = ['//lib:LICENSE-PublicDomain'],
+    name = "aopalliance",
+    data = ["//lib:LICENSE-PublicDomain"],
+    exports = ["@aopalliance//jar"],
 )
 
 java_library(
-  name = 'javax-inject',
-  exports = ['@javax_inject//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "javax-inject",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@javax_inject//jar"],
 )
 
 java_library(
-  name = 'multibindings',
-  exports = [ '@multibindings//jar' ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "multibindings",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@multibindings//jar"],
 )
diff --git a/lib/gwt/BUILD b/lib/gwt/BUILD
index 5d826d2..487e05b 100644
--- a/lib/gwt/BUILD
+++ b/lib/gwt/BUILD
@@ -1,45 +1,45 @@
 [java_library(
-  name = n,
-  exports = ['@%s//jar' % n.replace("-", "_")],
-  visibility = ["//visibility:public"],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = n,
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@%s//jar" % n.replace("-", "_")],
 ) for n in [
-  'ant',
-  'colt',
-  'dev',
-  'javax-validation',
-  'jsinterop-annotations',
-  'tapestry',
-  'user',
-  'w3c-css-sac',
+    "ant",
+    "colt",
+    "dev",
+    "javax-validation",
+    "jsinterop-annotations",
+    "tapestry",
+    "user",
+    "w3c-css-sac",
 ]]
 
 java_library(
-  name = 'user-neverlink',
-  exports = ['@user//jar'],
-  visibility = ['//visibility:public'],
-  neverlink = 1,
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "user-neverlink",
+    data = ["//lib:LICENSE-Apache2.0"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@user//jar"],
 )
 
 java_library(
-  name = 'dev-neverlink',
-  exports = ['@dev//jar'],
-  visibility = ['//visibility:public'],
-  neverlink = 1,
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "dev-neverlink",
+    data = ["//lib:LICENSE-Apache2.0"],
+    neverlink = 1,
+    visibility = ["//visibility:public"],
+    exports = ["@dev//jar"],
 )
 
 java_library(
-  name = 'javax-validation_src',
-  exports = ['@javax_validation//jar:src'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "javax-validation_src",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@javax_validation//jar:src"],
 )
 
 java_library(
-  name = 'jsinterop-annotations_src',
-  exports = ['@jsinterop_annotations//jar:src'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "jsinterop-annotations_src",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jsinterop_annotations//jar:src"],
 )
diff --git a/lib/highlightjs/BUILD b/lib/highlightjs/BUILD
index 5fb2a71..b10bc55 100644
--- a/lib/highlightjs/BUILD
+++ b/lib/highlightjs/BUILD
@@ -1,4 +1,3 @@
-
 exports_files([
-  'highlight.min.js',
+    "highlight.min.js",
 ])
diff --git a/lib/httpcomponents/BUILD b/lib/httpcomponents/BUILD
index c11df29..2b2cc6f 100644
--- a/lib/httpcomponents/BUILD
+++ b/lib/httpcomponents/BUILD
@@ -1,53 +1,53 @@
-package(default_visibility = ['//visibility:public'])
+package(default_visibility = ["//visibility:public"])
 
 java_library(
-  name = 'fluent-hc',
-  exports = ['@fluent_hc//jar'],
-  runtime_deps = [':httpclient'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "fluent-hc",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@fluent_hc//jar"],
+    runtime_deps = [":httpclient"],
 )
 
 java_library(
-  name = 'httpclient',
-  exports = ['@httpclient//jar'],
-  runtime_deps = [
-    '//lib/commons:codec',
-    ':httpcore',
-    '//lib/log:jcl-over-slf4j',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "httpclient",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@httpclient//jar"],
+    runtime_deps = [
+        ":httpcore",
+        "//lib/commons:codec",
+        "//lib/log:jcl-over-slf4j",
+    ],
 )
 
 java_library(
-  name = 'httpcore',
-  exports = ['@httpcore//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "httpcore",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@httpcore//jar"],
 )
 
 java_library(
-  name = 'httpmime',
-  exports = ['@httpmime//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "httpmime",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@httpmime//jar"],
 )
 
 java_library(
-  name = 'httpasyncclient',
-  exports = [ '@httpasyncclient//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "httpasyncclient",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@httpasyncclient//jar"],
 )
 
 java_library(
-  name = 'httpcore-nio',
-  exports =  [ '@httpcore_nio//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "httpcore-nio",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@httpcore_nio//jar"],
 )
 
 java_library(
-  name = 'httpcore-niossl',
-  exports = ['@httpcore_niossl//jar'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "httpcore-niossl",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@httpcore_niossl//jar"],
 )
diff --git a/lib/jackson/BUILD b/lib/jackson/BUILD
index 87ea42e4..4847371 100644
--- a/lib/jackson/BUILD
+++ b/lib/jackson/BUILD
@@ -1,21 +1,21 @@
-package(default_visibility = [ "//visibility:public"])
+package(default_visibility = ["//visibility:public"])
 
-VERSION = '2.6.6'
+VERSION = "2.6.6"
 
 java_library(
-  name = 'jackson-core',
-  exports = [ '@jackson_core//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
+    name = "jackson-core",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jackson_core//jar"],
 )
 
 java_library(
-  name = 'jackson-dataformat-smile',
-  exports = [ '@jackson_dataformat_smile//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
+    name = "jackson-dataformat-smile",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jackson_dataformat_smile//jar"],
 )
 
 java_library(
-  name = 'jackson-dataformat-cbor',
-  exports = [ '@jackson_dataformat_cbor//jar' ],
-  data = [ '//lib:LICENSE-Apache2.0' ],
+    name = "jackson-dataformat-cbor",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jackson_dataformat_cbor//jar"],
 )
diff --git a/lib/jetty/BUILD b/lib/jetty/BUILD
index d6e6355..c6ba9c8 100644
--- a/lib/jetty/BUILD
+++ b/lib/jetty/BUILD
@@ -1,76 +1,76 @@
 java_library(
-  name = 'servlet',
-  exports = ['@jetty_servlet//jar'],
-  runtime_deps = [':security'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "servlet",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jetty_servlet//jar"],
+    runtime_deps = [":security"],
 )
 
 java_library(
-  name = 'security',
-  exports = ['@jetty_security//jar'],
-  runtime_deps = [':server'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "security",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jetty_security//jar"],
+    runtime_deps = [":server"],
 )
 
 java_library(
-  name = 'servlets',
-  exports = ['@jetty_servlets//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "servlets",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jetty_servlets//jar"],
 )
 
 java_library(
-  name = 'server',
-  exports = [
-    '@jetty_server//jar',
-    ':continuation',
-    ':http',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "server",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":continuation",
+        ":http",
+        "@jetty_server//jar",
+    ],
 )
 
 java_library(
-  name = 'jmx',
-  exports = [
-    '@jetty_jmx//jar',
-    ':continuation',
-    ':http',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "jmx",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":continuation",
+        ":http",
+        "@jetty_jmx//jar",
+    ],
 )
 
 java_library(
-  name = 'continuation',
-  exports = ['@jetty_continuation//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "continuation",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jetty_continuation//jar"],
 )
 
 java_library(
-  name = 'http',
-  exports = [
-    '@jetty_http//jar',
-    ':io',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "http",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":io",
+        "@jetty_http//jar",
+    ],
 )
 
 java_library(
-  name = 'io',
-  exports = [
-    '@jetty_io//jar',
-    ':util',
-  ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "io",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = [
+        ":util",
+        "@jetty_io//jar",
+    ],
 )
 
 java_library(
-  name = 'util',
-  exports = ['@jetty_util//jar'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "util",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@jetty_util//jar"],
 )
diff --git a/lib/jgit/org.eclipse.jgit.archive/BUILD b/lib/jgit/org.eclipse.jgit.archive/BUILD
index 7d6fe22..d4e0a8c 100644
--- a/lib/jgit/org.eclipse.jgit.archive/BUILD
+++ b/lib/jgit/org.eclipse.jgit.archive/BUILD
@@ -1,7 +1,7 @@
 java_library(
-  name = 'jgit-archive',
-  exports = ['@jgit_archive//jar'],
-  runtime_deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-jgit'],
+    name = "jgit-archive",
+    data = ["//lib:LICENSE-jgit"],
+    visibility = ["//visibility:public"],
+    exports = ["@jgit_archive//jar"],
+    runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
 )
diff --git a/lib/jgit/org.eclipse.jgit.http.server/BUILD b/lib/jgit/org.eclipse.jgit.http.server/BUILD
index f4c66c0..c448c4b 100644
--- a/lib/jgit/org.eclipse.jgit.http.server/BUILD
+++ b/lib/jgit/org.eclipse.jgit.http.server/BUILD
@@ -1,7 +1,7 @@
 java_library(
-  name = 'jgit-servlet',
-  exports = ['@jgit_servlet//jar'],
-  runtime_deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-jgit'],
+    name = "jgit-servlet",
+    data = ["//lib:LICENSE-jgit"],
+    visibility = ["//visibility:public"],
+    exports = ["@jgit_servlet//jar"],
+    runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
 )
diff --git a/lib/jgit/org.eclipse.jgit.junit/BUILD b/lib/jgit/org.eclipse.jgit.junit/BUILD
index 10e9874..2c8966a 100644
--- a/lib/jgit/org.eclipse.jgit.junit/BUILD
+++ b/lib/jgit/org.eclipse.jgit.junit/BUILD
@@ -1,7 +1,7 @@
 java_library(
-  name = 'junit',
-  exports = ['@jgit_junit//jar'],
-  runtime_deps = ['//lib/jgit/org.eclipse.jgit:jgit'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "junit",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@jgit_junit//jar"],
+    runtime_deps = ["//lib/jgit/org.eclipse.jgit:jgit"],
 )
diff --git a/lib/jgit/org.eclipse.jgit/BUILD b/lib/jgit/org.eclipse.jgit/BUILD
index e220a96..33de929 100644
--- a/lib/jgit/org.eclipse.jgit/BUILD
+++ b/lib/jgit/org.eclipse.jgit/BUILD
@@ -1,14 +1,14 @@
 java_library(
-  name = 'jgit',
-  exports = ['@jgit//jar'],
-  runtime_deps = [':javaewah'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-jgit'],
+    name = "jgit",
+    data = ["//lib:LICENSE-jgit"],
+    visibility = ["//visibility:public"],
+    exports = ["@jgit//jar"],
+    runtime_deps = [":javaewah"],
 )
 
 java_library(
-  name = 'javaewah',
-  exports = ['@javaewah//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "javaewah",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@javaewah//jar"],
 )
diff --git a/lib/joda/BUILD b/lib/joda/BUILD
index ef759d7..e1a1924 100644
--- a/lib/joda/BUILD
+++ b/lib/joda/BUILD
@@ -1,13 +1,13 @@
 java_library(
-  name = 'joda-time',
-  exports = ['@joda_time//jar'],
-  runtime_deps = ['joda-convert'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "joda-time",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@joda_time//jar"],
+    runtime_deps = ["joda-convert"],
 )
 
 java_library(
-  name = 'joda-convert',
-  exports = ['@joda_convert//jar'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "joda-convert",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@joda_convert//jar"],
 )
diff --git a/lib/js/BUILD b/lib/js/BUILD
index 71fa94f..9528151 100644
--- a/lib/js/BUILD
+++ b/lib/js/BUILD
@@ -1,4 +1,5 @@
-package(default_visibility = [ "//visibility:public" ])
+package(default_visibility = ["//visibility:public"])
+
 load("//tools/bzl:js.bzl", "bower_component", "js_component")
 
 # For updating the bower versions, run
@@ -17,18 +18,18 @@
 # 4) remove bower_component(name="my_new_dependency", .. ) here
 #
 
-
 load("//lib/js:bower_components.bzl", "define_bower_components")
+
 define_bower_components()
 
 js_component(
-  name = 'highlightjs',
-  srcs = [ "//lib/highlightjs:highlight.min.js" ],
-  license = '//lib:LICENSE-highlightjs',
+    name = "highlightjs",
+    srcs = ["//lib/highlightjs:highlight.min.js"],
+    license = "//lib:LICENSE-highlightjs",
 )
 
 filegroup(
-  name = "highlightjs_files",
-  srcs = [ "//lib/highlightjs:highlight.min.js" ],
-  data = ['//lib:LICENSE-highlightjs',],
+    name = "highlightjs_files",
+    srcs = ["//lib/highlightjs:highlight.min.js"],
+    data = ["//lib:LICENSE-highlightjs"],
 )
diff --git a/lib/jsoup/BUILD b/lib/jsoup/BUILD
index e4d58c9..3142dac 100644
--- a/lib/jsoup/BUILD
+++ b/lib/jsoup/BUILD
@@ -1,6 +1,6 @@
 java_library(
-  name = 'jsoup',
-  exports = ['@jsoup//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-jsoup'],
+    name = "jsoup",
+    data = ["//lib:LICENSE-jsoup"],
+    visibility = ["//visibility:public"],
+    exports = ["@jsoup//jar"],
 )
diff --git a/lib/log/BUILD b/lib/log/BUILD
index 1e40372..af83d19 100644
--- a/lib/log/BUILD
+++ b/lib/log/BUILD
@@ -1,54 +1,54 @@
 java_library(
-  name = 'api',
-  exports = ['@log_api//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-slf4j'],
+    name = "api",
+    data = ["//lib:LICENSE-slf4j"],
+    visibility = ["//visibility:public"],
+    exports = ["@log_api//jar"],
 )
 
 java_library(
-  name = 'nop',
-  exports = ['@log_nop//jar'],
-  runtime_deps = [':api'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-slf4j'],
+    name = "nop",
+    data = ["//lib:LICENSE-slf4j"],
+    visibility = ["//visibility:public"],
+    exports = ["@log_nop//jar"],
+    runtime_deps = [":api"],
 )
 
 java_library(
-  name = 'impl_log4j',
-  exports = ['@impl_log4j//jar'],
-  runtime_deps = [':log4j'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-slf4j'],
+    name = "impl_log4j",
+    data = ["//lib:LICENSE-slf4j"],
+    visibility = ["//visibility:public"],
+    exports = ["@impl_log4j//jar"],
+    runtime_deps = [":log4j"],
 )
 
 java_library(
-  name = 'jcl-over-slf4j',
-  exports = ['@jcl_over_slf4j//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-slf4j'],
+    name = "jcl-over-slf4j",
+    data = ["//lib:LICENSE-slf4j"],
+    visibility = ["//visibility:public"],
+    exports = ["@jcl_over_slf4j//jar"],
 )
 
 java_library(
-  name = 'log4j',
-  exports = ['@log4j//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "log4j",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@log4j//jar"],
 )
 
 java_library(
-  name = 'jsonevent-layout',
-  exports = ['@jsonevent_layout//jar'],
-  runtime_deps = [
-    ':json-smart',
-    '//lib/commons:lang'
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "jsonevent-layout",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@jsonevent_layout//jar"],
+    runtime_deps = [
+        ":json-smart",
+        "//lib/commons:lang",
+    ],
 )
 
 java_library(
-  name = 'json-smart',
-  exports = ['@json_smart//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "json-smart",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@json_smart//jar"],
 )
diff --git a/lib/lucene/BUILD b/lib/lucene/BUILD
index 4739981..bbf43a6 100644
--- a/lib/lucene/BUILD
+++ b/lib/lucene/BUILD
@@ -1,94 +1,95 @@
-package(default_visibility = [ "//visibility:public"])
-load('//tools/bzl:maven.bzl', 'merge_maven_jars')
+package(default_visibility = ["//visibility:public"])
+
+load("//tools/bzl:maven.bzl", "merge_maven_jars")
 
 # core and backward-codecs both provide
 # META-INF/services/org.apache.lucene.codecs.Codec, so they must be merged.
 merge_maven_jars(
-  name = 'lucene-core-and-backward-codecs',
-  srcs = [
-    '@backward_codecs//jar',
-    '@lucene_core//jar',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-core-and-backward-codecs",
+    srcs = [
+        "@backward_codecs//jar",
+        "@lucene_core//jar",
+    ],
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
 )
 
 java_library(
-  name = 'lucene-analyzers-common',
-  exports = ['@lucene_analyzers_common//jar'],
-  runtime_deps = [':lucene-core-and-backward-codecs'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-analyzers-common",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@lucene_analyzers_common//jar"],
+    runtime_deps = [":lucene-core-and-backward-codecs"],
 )
 
 java_library(
-  name = 'lucene-codecs',
-  exports = ['@lucene_codecs//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-codecs",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@lucene_codecs//jar"],
 )
 
 java_library(
-  name = 'lucene-core',
-  exports = ['@lucene_core//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-core",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@lucene_core//jar"],
 )
 
 java_library(
-  name = 'lucene-misc',
-  exports = ['@lucene_misc//jar'],
-  runtime_deps = [':lucene-core-and-backward-codecs'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-misc",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@lucene_misc//jar"],
+    runtime_deps = [":lucene-core-and-backward-codecs"],
 )
 
 java_library(
-  name = 'lucene-queryparser',
-  exports = ['@lucene_queryparser//jar'],
-  runtime_deps = [':lucene-core-and-backward-codecs'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-queryparser",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@lucene_queryparser//jar"],
+    runtime_deps = [":lucene-core-and-backward-codecs"],
 )
 
 java_library(
-  name = 'lucene-highlighter',
-  exports = [ '@lucene_highlighter//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-highlighter",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@lucene_highlighter//jar"],
 )
 
 java_library(
-  name = 'lucene-join',
-  exports = [ '@lucene_join//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-join",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@lucene_join//jar"],
 )
 
 java_library(
-  name = 'lucene-memory',
-  exports = [ '@lucene_memory//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-memory",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@lucene_memory//jar"],
 )
 
 java_library(
-  name = 'lucene-sandbox',
-  exports = [ '@lucene_sandbox//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-sandbox",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@lucene_sandbox//jar"],
 )
 
 java_library(
-  name = 'lucene-spatial',
-  exports = [ '@lucene_spatial//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-spatial",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@lucene_spatial//jar"],
 )
 
 java_library(
-  name = 'lucene-suggest',
-  exports = [ '@lucene_suggest//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-suggest",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@lucene_suggest//jar"],
 )
 
 java_library(
-  name = 'lucene-queries',
-  exports = [ '@lucene_queries//jar' ],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "lucene-queries",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@lucene_queries//jar"],
 )
diff --git a/lib/mail/BUILD b/lib/mail/BUILD
index 40dd302..eca2b6b 100644
--- a/lib/mail/BUILD
+++ b/lib/mail/BUILD
@@ -1,6 +1,6 @@
 java_library(
-  name = 'mail',
-  exports = ['@mail//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "mail",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = ["@mail//jar"],
 )
diff --git a/lib/mina/BUILD b/lib/mina/BUILD
index b3ba684..a30b3d2 100644
--- a/lib/mina/BUILD
+++ b/lib/mina/BUILD
@@ -1,14 +1,14 @@
 java_library(
-  name = 'sshd',
-  exports = ['@sshd//jar'],
-  visibility = ['//visibility:public'],
-  runtime_deps = [':core'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "sshd",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@sshd//jar"],
+    runtime_deps = [":core"],
 )
 
 java_library(
-  name = 'core',
-  exports = ['@mina_core//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "core",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@mina_core//jar"],
 )
diff --git a/lib/openid/BUILD b/lib/openid/BUILD
index 8c5da45..2b36fbb 100644
--- a/lib/openid/BUILD
+++ b/lib/openid/BUILD
@@ -1,26 +1,26 @@
 java_library(
-  name = 'consumer',
-  exports = ['@openid_consumer//jar'],
-  runtime_deps = [
-    ':nekohtml',
-    ':xerces',
-    '//lib/httpcomponents:httpclient',
-    '//lib/log:jcl-over-slf4j',
-    '//lib/guice:guice',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "consumer",
+    data = ["//lib:LICENSE-Apache2.0"],
+    visibility = ["//visibility:public"],
+    exports = ["@openid_consumer//jar"],
+    runtime_deps = [
+        ":nekohtml",
+        ":xerces",
+        "//lib/guice",
+        "//lib/httpcomponents:httpclient",
+        "//lib/log:jcl-over-slf4j",
+    ],
 )
 
 java_library(
-  name = 'nekohtml',
-  exports = ['@nekohtml//jar'],
-  runtime_deps = [':xerces'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "nekohtml",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@nekohtml//jar"],
+    runtime_deps = [":xerces"],
 )
 
 java_library(
-  name = 'xerces',
-  exports = ['@xerces//jar'],
-  data = ['//lib:LICENSE-Apache2.0'],
+    name = "xerces",
+    data = ["//lib:LICENSE-Apache2.0"],
+    exports = ["@xerces//jar"],
 )
diff --git a/lib/ow2/BUILD b/lib/ow2/BUILD
index 4c37357..aebca49 100644
--- a/lib/ow2/BUILD
+++ b/lib/ow2/BUILD
@@ -1,35 +1,35 @@
 java_library(
-  name = 'ow2-asm',
-  exports = ['@ow2_asm//jar'],
-  visibility = ["//visibility:public"],
-  data = ['//lib:LICENSE-ow2'],
+    name = "ow2-asm",
+    data = ["//lib:LICENSE-ow2"],
+    visibility = ["//visibility:public"],
+    exports = ["@ow2_asm//jar"],
 )
 
 java_library(
-  name = 'ow2-asm-analysis',
-  exports = ['@ow2_asm_analysis//jar'],
-  visibility = ["//visibility:public"],
-  data = ['//lib:LICENSE-ow2'],
+    name = "ow2-asm-analysis",
+    data = ["//lib:LICENSE-ow2"],
+    visibility = ["//visibility:public"],
+    exports = ["@ow2_asm_analysis//jar"],
 )
 
 java_library(
-  name = 'ow2-asm-commons',
-  exports = ['@ow2_asm_commons//jar'],
-  runtime_deps = [':ow2-asm-tree'],
-  visibility = ["//visibility:public"],
-  data = ['//lib:LICENSE-ow2'],
+    name = "ow2-asm-commons",
+    data = ["//lib:LICENSE-ow2"],
+    visibility = ["//visibility:public"],
+    exports = ["@ow2_asm_commons//jar"],
+    runtime_deps = [":ow2-asm-tree"],
 )
 
 java_library(
-  name = 'ow2-asm-tree',
-  exports = ['@ow2_asm_tree//jar'],
-  visibility = ["//visibility:public"],
-  data = ['//lib:LICENSE-ow2'],
+    name = "ow2-asm-tree",
+    data = ["//lib:LICENSE-ow2"],
+    visibility = ["//visibility:public"],
+    exports = ["@ow2_asm_tree//jar"],
 )
 
 java_library(
-  name = 'ow2-asm-util',
-  exports = ['@ow2_asm_util//jar'],
-  visibility = ["//visibility:public"],
-  data = ['//lib:LICENSE-ow2'],
+    name = "ow2-asm-util",
+    data = ["//lib:LICENSE-ow2"],
+    visibility = ["//visibility:public"],
+    exports = ["@ow2_asm_util//jar"],
 )
diff --git a/lib/powermock/BUILD b/lib/powermock/BUILD
index 075b6bf..d0cab9b 100644
--- a/lib/powermock/BUILD
+++ b/lib/powermock/BUILD
@@ -1,66 +1,66 @@
 java_library(
-  name = 'powermock-module-junit4',
-  exports = [
-    '@powermock_module_junit4//jar',
-    ':powermock-module-junit4-common',
-    '//lib:junit',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "powermock-module-junit4",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":powermock-module-junit4-common",
+        "//lib:junit",
+        "@powermock_module_junit4//jar",
+    ],
 )
 
 java_library(
-  name = 'powermock-module-junit4-common',
-  exports = [
-    '@powermock_module_junit4_common//jar',
-    ':powermock-reflect',
-    '//lib:junit',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "powermock-module-junit4-common",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":powermock-reflect",
+        "//lib:junit",
+        "@powermock_module_junit4_common//jar",
+    ],
 )
 
 java_library(
-  name = 'powermock-reflect',
-  exports = [
-    '@powermock_reflect//jar',
-    '//lib:junit',
-    '//lib/easymock:objenesis',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "powermock-reflect",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        "//lib:junit",
+        "//lib/easymock:objenesis",
+        "@powermock_reflect//jar",
+    ],
 )
 
 java_library(
-  name = 'powermock-api-easymock',
-  exports = [
-    '@powermock_api_easymock//jar',
-    ':powermock-api-support',
-    '//lib/easymock:easymock',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "powermock-api-easymock",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":powermock-api-support",
+        "//lib/easymock",
+        "@powermock_api_easymock//jar",
+    ],
 )
 
 java_library(
-  name = 'powermock-api-support',
-  exports = [
-    '@powermock_api_support//jar',
-    ':powermock-core',
-    ':powermock-reflect',
-    '//lib:junit',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "powermock-api-support",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":powermock-core",
+        ":powermock-reflect",
+        "//lib:junit",
+        "@powermock_api_support//jar",
+    ],
 )
 
 java_library(
-  name = 'powermock-core',
-  exports = [
-    ':powermock-reflect',
-    '//lib:javassist',
-    '//lib:junit',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-DO_NOT_DISTRIBUTE'],
+    name = "powermock-core",
+    data = ["//lib:LICENSE-DO_NOT_DISTRIBUTE"],
+    visibility = ["//visibility:public"],
+    exports = [
+        ":powermock-reflect",
+        "//lib:javassist",
+        "//lib:junit",
+    ],
 )
diff --git a/lib/prolog/BUILD b/lib/prolog/BUILD
index a45cff2..875f135 100644
--- a/lib/prolog/BUILD
+++ b/lib/prolog/BUILD
@@ -1,51 +1,51 @@
 java_library(
-  name = 'runtime',
-  exports = ['@prolog_runtime//jar'],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-prologcafe'],
+    name = "runtime",
+    data = ["//lib:LICENSE-prologcafe"],
+    visibility = ["//visibility:public"],
+    exports = ["@prolog_runtime//jar"],
 )
 
 java_library(
-  name = 'compiler',
-  exports = ['@prolog_compiler//jar'],
-  runtime_deps = [
-    ':io',
-    ':runtime',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-prologcafe'],
+    name = "compiler",
+    data = ["//lib:LICENSE-prologcafe"],
+    visibility = ["//visibility:public"],
+    exports = ["@prolog_compiler//jar"],
+    runtime_deps = [
+        ":io",
+        ":runtime",
+    ],
 )
 
 java_library(
-  name = 'io',
-  exports = ['@prolog_io//jar'],
-  data = ['//lib:LICENSE-prologcafe'],
+    name = "io",
+    data = ["//lib:LICENSE-prologcafe"],
+    exports = ["@prolog_io//jar"],
 )
 
 java_library(
-  name = 'cafeteria',
-  exports = ['@cafeteria//jar'],
-  runtime_deps = [
-    'io',
-    'runtime',
-  ],
-  visibility = ['//visibility:public'],
-  data = ['//lib:LICENSE-prologcafe'],
+    name = "cafeteria",
+    data = ["//lib:LICENSE-prologcafe"],
+    visibility = ["//visibility:public"],
+    exports = ["@cafeteria//jar"],
+    runtime_deps = [
+        "io",
+        "runtime",
+    ],
 )
 
 java_binary(
-  name = 'compiler_bin',
-  main_class = 'BuckPrologCompiler',
-  runtime_deps = [':compiler_lib'],
-  visibility = ['//visibility:public'],
+    name = "compiler_bin",
+    main_class = "BuckPrologCompiler",
+    visibility = ["//visibility:public"],
+    runtime_deps = [":compiler_lib"],
 )
 
 java_library(
-  name = 'compiler_lib',
-  srcs = ['java/BuckPrologCompiler.java'],
-  deps = [
-    ':compiler',
-    ':runtime',
-  ],
-  visibility = ['//visibility:public'],
+    name = "compiler_lib",
+    srcs = ["java/BuckPrologCompiler.java"],
+    visibility = ["//visibility:public"],
+    deps = [
+        ":compiler",
+        ":runtime",
+    ],
 )
diff --git a/plugins/BUILD b/plugins/BUILD
index 27690c8..86788d7 100644
--- a/plugins/BUILD
+++ b/plugins/BUILD
@@ -1,14 +1,14 @@
-load('//tools/bzl:genrule2.bzl', 'genrule2')
-load('//tools/bzl:plugins.bzl', 'CORE_PLUGINS')
+load("//tools/bzl:genrule2.bzl", "genrule2")
+load("//tools/bzl:plugins.bzl", "CORE_PLUGINS")
 
 genrule2(
-  name = 'core',
-  srcs = ['//plugins/%s:%s.jar' % (n, n) for n in CORE_PLUGINS],
-  cmd = 'mkdir -p $$TMP/WEB-INF/plugins;' +
-    'for s in $(SRCS) ; do ' +
-    'ln -s $$ROOT/$$s $$TMP/WEB-INF/plugins;done;' +
-    'cd $$TMP;' +
-    'zip -qr $$ROOT/$@ .',
-  outs = [ 'core.zip' ],
-  visibility = ['//visibility:public'],
+    name = "core",
+    srcs = ["//plugins/%s:%s.jar" % (n, n) for n in CORE_PLUGINS],
+    outs = ["core.zip"],
+    cmd = "mkdir -p $$TMP/WEB-INF/plugins;" +
+          "for s in $(SRCS) ; do " +
+          "ln -s $$ROOT/$$s $$TMP/WEB-INF/plugins;done;" +
+          "cd $$TMP;" +
+          "zip -qr $$ROOT/$@ .",
+    visibility = ["//visibility:public"],
 )
diff --git a/plugins/replication b/plugins/replication
index bb1ee89..f9a4963 160000
--- a/plugins/replication
+++ b/plugins/replication
@@ -1 +1 @@
-Subproject commit bb1ee89bdf6bdd2dfdf5d16a11a18b077c7c523d
+Subproject commit f9a49639a7b658353cf22b60cf8ccd1db97fef8a
diff --git a/polygerrit-ui/BUILD b/polygerrit-ui/BUILD
index 67a5456..1f11cde 100644
--- a/polygerrit-ui/BUILD
+++ b/polygerrit-ui/BUILD
@@ -1,43 +1,43 @@
 package(
-  default_visibility=["//visibility:public"]
+    default_visibility = ["//visibility:public"],
 )
 
 load("//tools/bzl:js.bzl", "bower_component_bundle")
-load('//tools/bzl:genrule2.bzl', 'genrule2')
+load("//tools/bzl:genrule2.bzl", "genrule2")
 
 bower_component_bundle(
-  name = "polygerrit_components.bower_components",
-  deps = [
-    '//lib/js:es6-promise',
-    '//lib/js:fetch',
-    # TODO(hanwen): this is inserted separately in the UI zip. Do we need this here?
-    '//lib/js:highlightjs',
-    '//lib/js:iron-a11y-keys-behavior',
-    '//lib/js:iron-autogrow-textarea',
-    '//lib/js:iron-dropdown',
-    '//lib/js:iron-input',
-    '//lib/js:iron-overlay-behavior',
-    '//lib/js:iron-selector',
-    '//lib/js:moment',
-    '//lib/js:page',
-    '//lib/js:polymer',
-    '//lib/js:promise-polyfill',
-])
-
+    name = "polygerrit_components.bower_components",
+    deps = [
+        "//lib/js:es6-promise",
+        "//lib/js:fetch",
+        # TODO(hanwen): this is inserted separately in the UI zip. Do we need this here?
+        "//lib/js:highlightjs",
+        "//lib/js:iron-a11y-keys-behavior",
+        "//lib/js:iron-autogrow-textarea",
+        "//lib/js:iron-dropdown",
+        "//lib/js:iron-input",
+        "//lib/js:iron-overlay-behavior",
+        "//lib/js:iron-selector",
+        "//lib/js:moment",
+        "//lib/js:page",
+        "//lib/js:polymer",
+        "//lib/js:promise-polyfill",
+    ],
+)
 
 genrule2(
-  name = 'fonts',
-  cmd = ' && '.join([
-    'mkdir -p $$TMP/fonts',
-    'cp $(SRCS) $$TMP/fonts/',
-    'cd $$TMP',
-    "find fonts/ -exec touch -t 198001010000 '{}' ';'",
-    'zip -qr $$ROOT/$@ fonts',
-  ]),
-  srcs = [
-    '//lib/fonts:sourcecodepro',
-  ],
-  outs = ['fonts.zip',],
-  visibility = ['//visibility:public'],
-  output_to_bindir = 1,
+    name = "fonts",
+    srcs = [
+        "//lib/fonts:sourcecodepro",
+    ],
+    outs = ["fonts.zip"],
+    cmd = " && ".join([
+        "mkdir -p $$TMP/fonts",
+        "cp $(SRCS) $$TMP/fonts/",
+        "cd $$TMP",
+        "find fonts/ -exec touch -t 198001010000 '{}' ';'",
+        "zip -qr $$ROOT/$@ fonts",
+    ]),
+    output_to_bindir = 1,
+    visibility = ["//visibility:public"],
 )
diff --git a/polygerrit-ui/app/BUILD b/polygerrit-ui/app/BUILD
index 91240e5..94f9bc8 100644
--- a/polygerrit-ui/app/BUILD
+++ b/polygerrit-ui/app/BUILD
@@ -1,108 +1,123 @@
 package(
-  default_visibility = ["//visibility:public"])
+    default_visibility = ["//visibility:public"],
+)
 
-load('//tools/bzl:genrule2.bzl', 'genrule2')
+load("//tools/bzl:genrule2.bzl", "genrule2")
 load(
-  "//tools/bzl:js.bzl",
-  "bower_component_bundle", "vulcanize",
-  "bower_component", "js_component")
+    "//tools/bzl:js.bzl",
+    "bower_component_bundle",
+    "vulcanize",
+    "bower_component",
+    "js_component",
+)
 
 vulcanize(
-  name = "gr-app",
-  app = 'elements/gr-app.html',
-  srcs = glob(
-  ['**/*.html', '**/*.js'],
-  exclude = [
-    'bower_components/**',
-    'index.html',
-    'test/**',
-    '**/*_test.html',
-    ]),
-  deps = [ "//polygerrit-ui:polygerrit_components.bower_components"],
+    name = "gr-app",
+    srcs = glob(
+        [
+            "**/*.html",
+            "**/*.js",
+        ],
+        exclude = [
+            "bower_components/**",
+            "index.html",
+            "test/**",
+            "**/*_test.html",
+        ],
+    ),
+    app = "elements/gr-app.html",
+    deps = ["//polygerrit-ui:polygerrit_components.bower_components"],
 )
 
 filegroup(
-  name = "top_sources",
-  srcs = [
-    'favicon.ico',
-    'index.html',
-  ],
+    name = "top_sources",
+    srcs = [
+        "favicon.ico",
+        "index.html",
+    ],
 )
 
 filegroup(
-  name = "css_sources",
-  srcs = glob(['styles/**/*.css'])
+    name = "css_sources",
+    srcs = glob(["styles/**/*.css"]),
 )
 
 genrule2(
-  name = "polygerrit_ui",
-  cmd = " && ".join([
-    "mkdir -p $$TMP/polygerrit_ui/{styles,fonts,bower_components/{highlightjs,webcomponentsjs},elements}",
-    "cp $(locations :gr-app) $$TMP/polygerrit_ui/elements/",
-    "cp $(locations //lib/fonts:sourcecodepro) $$TMP/polygerrit_ui/fonts/",
-    "for f in $(locations :top_sources); do cp $$f $$TMP/polygerrit_ui/; done",
-    "for f in $(locations :css_sources); do cp $$f $$TMP/polygerrit_ui/styles; done",
-    "for f in $(locations //lib/js:highlightjs_files); do cp $$f $$TMP/polygerrit_ui/bower_components/highlightjs/ ; done",
-    "unzip -qd $$TMP/polygerrit_ui/bower_components $(location @webcomponentsjs//:zipfile) webcomponentsjs/webcomponents-lite.js",
-    "cd $$TMP",
-    "find . -exec touch -t 198001010000 '{}' ';'",
-    "zip -qr $$ROOT/$@ *",
-  ]),
-  srcs = [
-    "//lib/fonts:sourcecodepro",
-    "//lib/js:highlightjs_files",
-    ":top_sources",
-    ":css_sources",
-    ":gr-app",
-    # we extract from the zip, but depend on the component for license checking.
-    "@webcomponentsjs//:zipfile",
-    "//lib/js:webcomponentsjs",
-  ],
-  outs = [ "polygerrit_ui.zip" ],
+    name = "polygerrit_ui",
+    srcs = [
+        "//lib/fonts:sourcecodepro",
+        "//lib/js:highlightjs_files",
+        ":top_sources",
+        ":css_sources",
+        ":gr-app",
+        # we extract from the zip, but depend on the component for license checking.
+        "@webcomponentsjs//:zipfile",
+        "//lib/js:webcomponentsjs",
+    ],
+    outs = ["polygerrit_ui.zip"],
+    cmd = " && ".join([
+        "mkdir -p $$TMP/polygerrit_ui/{styles,fonts,bower_components/{highlightjs,webcomponentsjs},elements}",
+        "cp $(locations :gr-app) $$TMP/polygerrit_ui/elements/",
+        "cp $(locations //lib/fonts:sourcecodepro) $$TMP/polygerrit_ui/fonts/",
+        "for f in $(locations :top_sources); do cp $$f $$TMP/polygerrit_ui/; done",
+        "for f in $(locations :css_sources); do cp $$f $$TMP/polygerrit_ui/styles; done",
+        "for f in $(locations //lib/js:highlightjs_files); do cp $$f $$TMP/polygerrit_ui/bower_components/highlightjs/ ; done",
+        "unzip -qd $$TMP/polygerrit_ui/bower_components $(location @webcomponentsjs//:zipfile) webcomponentsjs/webcomponents-lite.js",
+        "cd $$TMP",
+        "find . -exec touch -t 198001010000 '{}' ';'",
+        "zip -qr $$ROOT/$@ *",
+    ]),
 )
 
 bower_component_bundle(
-  name = 'test_components',
-  testonly = 1,
-  deps = [
-    '//polygerrit-ui:polygerrit_components.bower_components',
-    '//lib/js:iron-test-helpers',
-    '//lib/js:test-fixture',
-    '//lib/js:web-component-tester',
-  ],
+    name = "test_components",
+    testonly = 1,
+    deps = [
+        "//lib/js:iron-test-helpers",
+        "//lib/js:test-fixture",
+        "//lib/js:web-component-tester",
+        "//polygerrit-ui:polygerrit_components.bower_components",
+    ],
 )
 
 filegroup(
-  name = "pg_code",
-  srcs = glob([
-    '**/*.html',
-    '**/*.js',
-  ], exclude = [
-    'bower_components/**',
-  ])
+    name = "pg_code",
+    srcs = glob(
+        [
+            "**/*.html",
+            "**/*.js",
+        ],
+        exclude = [
+            "bower_components/**",
+        ],
+    ),
 )
 
 genrule2(
-  name = "pg_code_zip",
-  outs = [ "pg_code.zip", ],
-  srcs = [ ":pg_code" ],
-  cmd = " && ".join([
-    ("tar -hcf- $(locations :pg_code) |"
-     + " tar --strip-components=2 -C $$TMP/ -xf-"),
-    "cd $$TMP",
-    "find . -exec touch -t 198001010000 '{}' ';'",
-    "zip -rq $$ROOT/$@ *"])
+    name = "pg_code_zip",
+    srcs = [":pg_code"],
+    outs = ["pg_code.zip"],
+    cmd = " && ".join([
+        ("tar -hcf- $(locations :pg_code) |" +
+         " tar --strip-components=2 -C $$TMP/ -xf-"),
+        "cd $$TMP",
+        "find . -exec touch -t 198001010000 '{}' ';'",
+        "zip -rq $$ROOT/$@ *",
+    ]),
 )
 
 sh_test(
-  name = "wct_test",
-  srcs = [ "wct_test.sh" ],
-  data = [
-    ":pg_code.zip",
-    ":test_components.zip",
-    "test/index.html",
-  ],
-  size = "large",
-  # Should not run sandboxed.
-  tags = ["local", "manual"],
+    name = "wct_test",
+    size = "large",
+    srcs = ["wct_test.sh"],
+    data = [
+        "test/index.html",
+        ":pg_code.zip",
+        ":test_components.zip",
+    ],
+    # Should not run sandboxed.
+    tags = [
+        "local",
+        "manual",
+    ],
 )
diff --git a/tools/BUILD b/tools/BUILD
index ff64faa..060cbd8 100644
--- a/tools/BUILD
+++ b/tools/BUILD
@@ -1,6 +1,6 @@
 py_binary(
-  name = 'merge_jars',
-  srcs = ['merge_jars.py'],
-  main = 'merge_jars.py',
-  visibility = ['//visibility:public'],
+    name = "merge_jars",
+    srcs = ["merge_jars.py"],
+    main = "merge_jars.py",
+    visibility = ["//visibility:public"],
 )
diff --git a/tools/bzl/BUILD b/tools/bzl/BUILD
index bfbbd21..a0f5bd1 100644
--- a/tools/bzl/BUILD
+++ b/tools/bzl/BUILD
@@ -1,6 +1,5 @@
-
 exports_files([
-  "license-map.py",
-  "test_empty.sh",
-  "test_license.sh",
+    "license-map.py",
+    "test_empty.sh",
+    "test_license.sh",
 ])
diff --git a/tools/eclipse/BUILD b/tools/eclipse/BUILD
index 41c89b1..2b3f77a 100644
--- a/tools/eclipse/BUILD
+++ b/tools/eclipse/BUILD
@@ -1,68 +1,69 @@
-load('//tools/bzl:pkg_war.bzl', 'LIBS', 'PGMLIBS')
-load('//tools/bzl:classpath.bzl', 'classpath_collector')
-load('//tools/bzl:plugins.bzl',
-     'CORE_PLUGINS',
-     'CUSTOM_PLUGINS')
+load("//tools/bzl:pkg_war.bzl", "LIBS", "PGMLIBS")
+load("//tools/bzl:classpath.bzl", "classpath_collector")
+load(
+    "//tools/bzl:plugins.bzl",
+    "CORE_PLUGINS",
+    "CUSTOM_PLUGINS",
+)
 
 PROVIDED_DEPS = [
-  '//lib/bouncycastle:bcprov',
-  '//lib/bouncycastle:bcpg',
-  '//lib/bouncycastle:bcpkix',
+    "//lib/bouncycastle:bcprov",
+    "//lib/bouncycastle:bcpg",
+    "//lib/bouncycastle:bcpkix",
 ]
 
 TEST_DEPS = [
-  '//gerrit-gpg:gpg_tests',
-  '//gerrit-gwtui:ui_tests',
-  '//gerrit-httpd:httpd_tests',
-  '//gerrit-patch-jgit:jgit_patch_tests',
-  '//gerrit-reviewdb:client_tests',
-  '//gerrit-server:server_tests',
+    "//gerrit-gpg:gpg_tests",
+    "//gerrit-gwtui:ui_tests",
+    "//gerrit-httpd:httpd_tests",
+    "//gerrit-patch-jgit:jgit_patch_tests",
+    "//gerrit-reviewdb:client_tests",
+    "//gerrit-server:server_tests",
 ]
 
 DEPS = [
-  '//gerrit-acceptance-tests:lib',
-  '//gerrit-gwtdebug:gwtdebug',
-  '//gerrit-gwtui:ui_module',
-  '//gerrit-main:main_lib',
-  '//gerrit-plugin-gwtui:gwtui-api-lib',
-  '//gerrit-server:server',
-  '//lib/asciidoctor:asciidoc_lib',
-  '//lib/asciidoctor:doc_indexer_lib',
-  '//lib/auto:auto-value',
-  '//lib/gwt:ant',
-  '//lib/gwt:colt',
-  '//lib/gwt:javax-validation',
-  '//lib/gwt:javax-validation_src',
-  '//lib/gwt:jsinterop-annotations',
-  '//lib/gwt:jsinterop-annotations_src',
-  '//lib/gwt:tapestry',
-  '//lib/gwt:w3c-css-sac',
-  '//lib/jetty:servlets',
-  '//lib/prolog:compiler_lib',
-  # TODO(davido): I do not understand why it must be on the Eclipse classpath
-  #'//Documentation:index',
+    "//gerrit-acceptance-tests:lib",
+    "//gerrit-gwtdebug:gwtdebug",
+    "//gerrit-gwtui:ui_module",
+    "//gerrit-main:main_lib",
+    "//gerrit-plugin-gwtui:gwtui-api-lib",
+    "//gerrit-server:server",
+    "//lib/asciidoctor:asciidoc_lib",
+    "//lib/asciidoctor:doc_indexer_lib",
+    "//lib/auto:auto-value",
+    "//lib/gwt:ant",
+    "//lib/gwt:colt",
+    "//lib/gwt:javax-validation",
+    "//lib/gwt:javax-validation_src",
+    "//lib/gwt:jsinterop-annotations",
+    "//lib/gwt:jsinterop-annotations_src",
+    "//lib/gwt:tapestry",
+    "//lib/gwt:w3c-css-sac",
+    "//lib/jetty:servlets",
+    "//lib/prolog:compiler_lib",
+    # TODO(davido): I do not understand why it must be on the Eclipse classpath
+    #'//Documentation:index',
 ]
 
 java_library(
-  name = 'classpath',
-  runtime_deps = LIBS + PGMLIBS + DEPS,
-  testonly = 1,
+    name = "classpath",
+    testonly = 1,
+    runtime_deps = LIBS + PGMLIBS + DEPS,
 )
 
 classpath_collector(
-  name = 'main_classpath_collect',
-  deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + PROVIDED_DEPS +
-    ['//plugins/%s:%s__plugin' % (n, n)
-     for n in CORE_PLUGINS + CUSTOM_PLUGINS],
-  testonly = 1,
+    name = "main_classpath_collect",
+    testonly = 1,
+    deps = LIBS + PGMLIBS + DEPS + TEST_DEPS + PROVIDED_DEPS +
+           ["//plugins/%s:%s__plugin" % (n, n) for n in CORE_PLUGINS + CUSTOM_PLUGINS],
 )
 
 classpath_collector(
-  name = "gwt_classpath_collect",
-  deps = ["//gerrit-gwtui:ui_module"],
+    name = "gwt_classpath_collect",
+    deps = ["//gerrit-gwtui:ui_module"],
 )
 
 classpath_collector(
-  name = "autovalue_classpath_collect",
-  deps = ["//lib/auto:auto-value"],
+    name = "autovalue_classpath_collect",
+    deps = ["//lib/auto:auto-value"],
 )
diff --git a/tools/maven/BUILD b/tools/maven/BUILD
index 14eb2be..9ac46ac 100644
--- a/tools/maven/BUILD
+++ b/tools/maven/BUILD
@@ -1,31 +1,32 @@
-load('//:version.bzl', 'GERRIT_VERSION')
-load('//tools/maven:package.bzl', 'maven_package')
+load("//:version.bzl", "GERRIT_VERSION")
+load("//tools/maven:package.bzl", "maven_package")
 
-MAVEN_REPOSITORY = 'sonatype-nexus-staging'
+MAVEN_REPOSITORY = "sonatype-nexus-staging"
+
 # TODO(davido): support snapshot repositories
-MAVEN_RELEASE_URL = 'https://oss.sonatype.org/service/local/staging/deploy/maven2'
+MAVEN_RELEASE_URL = "https://oss.sonatype.org/service/local/staging/deploy/maven2"
 
 maven_package(
-  repository = MAVEN_REPOSITORY,
-  url = MAVEN_RELEASE_URL,
-  version = GERRIT_VERSION,
-  jar = {
-    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework_deploy.jar',
-    'gerrit-extension-api': '//gerrit-extension-api:extension-api_deploy.jar',
-    'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api_deploy.jar',
-    'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api_deploy.jar',
-  },
-  src = {
-    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:liblib-src.jar',
-    'gerrit-extension-api': '//gerrit-extension-api:libapi-src.jar',
-    'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-sources_deploy.jar',
-    'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar',
-  },
-  doc = {
-    'gerrit-acceptance-framework': '//gerrit-acceptance-framework:acceptance-framework-javadoc',
-    'gerrit-extension-api': '//gerrit-extension-api:extension-api-javadoc',
-    'gerrit-plugin-api': '//gerrit-plugin-api:plugin-api-javadoc',
-    'gerrit-plugin-gwtui': '//gerrit-plugin-gwtui:gwtui-api-javadoc',
-  },
-  war = {'gerrit-war': '//:release'},
+    src = {
+        "gerrit-acceptance-framework": "//gerrit-acceptance-framework:liblib-src.jar",
+        "gerrit-extension-api": "//gerrit-extension-api:libapi-src.jar",
+        "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-sources_deploy.jar",
+        "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-source_deploy.jar",
+    },
+    doc = {
+        "gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework-javadoc",
+        "gerrit-extension-api": "//gerrit-extension-api:extension-api-javadoc",
+        "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api-javadoc",
+        "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api-javadoc",
+    },
+    jar = {
+        "gerrit-acceptance-framework": "//gerrit-acceptance-framework:acceptance-framework_deploy.jar",
+        "gerrit-extension-api": "//gerrit-extension-api:extension-api_deploy.jar",
+        "gerrit-plugin-api": "//gerrit-plugin-api:plugin-api_deploy.jar",
+        "gerrit-plugin-gwtui": "//gerrit-plugin-gwtui:gwtui-api_deploy.jar",
+    },
+    repository = MAVEN_REPOSITORY,
+    url = MAVEN_RELEASE_URL,
+    version = GERRIT_VERSION,
+    war = {"gerrit-war": "//:release"},
 )
diff --git a/version.bzl b/version.bzl
index 3035c93..24a3c27 100644
--- a/version.bzl
+++ b/version.bzl
@@ -2,4 +2,4 @@
 # Used by :api_install and :api_deploy targets
 # when talking to the destination repository.
 #
-GERRIT_VERSION = '2.14-SNAPSHOT'
+GERRIT_VERSION = "2.14-SNAPSHOT"