commit 86b3407147c7f711d9e9df54744f48e70a18de93
author David Pursehouse <dpursehouse@collab.net> Fri Jun 15 08:08:29 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Fri Jun 15 08:08:45 2018 +0900
tree 6b04473cf89d7ebbce21c692d9b27984ce6f718f
parent 3bcf7751bbd74335105668418f5960c62c69a1e2
parent 257b2fc80ac05f57fe5973715c8b8f5a0afdd083

Merge branch 'stable-2.15'

* stable-2.15:
  Format BUILD file with buildifier 0.12.0
  Format all Java files with google-java-format 1.6

Change-Id: Ic9108ef83bbb72d3a1e9f4818af05bc8fa9637dd

BUILD

diff --git a/BUILD b/BUILD
index 27a1870..cfd1fbd 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,5 @@
 load("//tools/bzl:junit.bzl", "junit_tests")
-load("//tools/bzl:plugin.bzl", "gerrit_plugin", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS")
+load("//tools/bzl:plugin.bzl", "PLUGIN_DEPS", "PLUGIN_TEST_DEPS", "gerrit_plugin")
 
 gerrit_plugin(
     name = "automerger",

src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
index 0235cd8..095ba1a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/ConfigLoaderIT.java
@@ -42,9 +42,8 @@
 import org.junit.Test;
 
 @TestPlugin(
-  name = "automerger",
-  sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule"
-)
+    name = "automerger",
+    sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule")
 public class ConfigLoaderIT extends LightweightPluginDaemonTest {
   private ConfigLoader configLoader;
   @Inject private AllProjectsName allProjectsName;

src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
index 57a25e5..ac6a95f 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreatorIT.java
@@ -59,9 +59,8 @@
 import org.junit.Test;
 
 @TestPlugin(
-  name = "automerger",
-  sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule"
-)
+    name = "automerger",
+    sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule")
 public class DownstreamCreatorIT extends LightweightPluginDaemonTest {
   @Inject private Provider<CurrentUser> user;
 

src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java b/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java
index 368b5cf..2df693a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/automerger/MergeValidatorIT.java
@@ -39,9 +39,8 @@
 import org.junit.Test;
 
 @TestPlugin(
-  name = "automerger",
-  sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule"
-)
+    name = "automerger",
+    sysModule = "com.googlesource.gerrit.plugins.automerger.AutomergerModule")
 public class MergeValidatorIT extends LightweightPluginDaemonTest {
   private void pushConfig(String resourceName, String project, String branch) throws Exception {
     TestRepository<InMemoryRepository> allProjectRepo = cloneProject(allProjects, admin);