commit f3f897ccbd407766a30660b4adf17262572480e6
author Marco Miller <marco.miller@ericsson.com> Fri Sep 28 16:59:09 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Fri Sep 28 17:00:32 2018 -0400
tree 6fc7b6e139b495b534777dc99fc82905d1652255
parent 8522d07e1d7dae34f40cdd0e73f1165f3675b49b
parent fc16db7567fa9b16d405ba992410592a08098565

Merge branch 'stable-2.15'

* stable-2.15:
  GoImportFilterTest: Expand Mockito wildcard import
  Format all Bazel build files with buildifier
  Migrate (i.e. move) `tools/bazel.rc` to `.bazelrc`
  Update bazlets to build with current latest 2.14.14 API

Change-Id: Iafc0819ac3ec577b8dd5502c5f64aa29c3ec6da2

.bazelrc

diff --git a/tools/bazel.rc b/.bazelrc
similarity index 100%
rename from tools/bazel.rc
rename to .bazelrc

BUILD

diff --git a/BUILD b/BUILD
index d07240a..3545a67 100644
--- a/BUILD
+++ b/BUILD
@@ -1,9 +1,9 @@
 load("//tools/bzl:junit.bzl", "junit_tests")
 load(
     "//tools/bzl:plugin.bzl",
-    "gerrit_plugin",
     "PLUGIN_DEPS",
     "PLUGIN_TEST_DEPS",
+    "gerrit_plugin",
 )
 
 gerrit_plugin(

bazlets.bzl

diff --git a/bazlets.bzl b/bazlets.bzl
index e14e488..f97b72c 100644
--- a/bazlets.bzl
+++ b/bazlets.bzl
@@ -1,17 +1,16 @@
 NAME = "com_googlesource_gerrit_bazlets"
 
 def load_bazlets(
-    commit,
-    local_path = None
-  ):
-  if not local_path:
-      native.git_repository(
-          name = NAME,
-          remote = "https://gerrit.googlesource.com/bazlets",
-          commit = commit,
-      )
-  else:
-      native.local_repository(
-          name = NAME,
-          path = local_path,
-      )
+        commit,
+        local_path = None):
+    if not local_path:
+        native.git_repository(
+            name = NAME,
+            remote = "https://gerrit.googlesource.com/bazlets",
+            commit = commit,
+        )
+    else:
+        native.local_repository(
+            name = NAME,
+            path = local_path,
+        )

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 135e5f6..53fbc09 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -1,24 +1,24 @@
 load("//tools/bzl:maven_jar.bzl", "maven_jar")
 
 def external_plugin_deps():
-  maven_jar(
-    name = "mockito",
-    artifact = "org.mockito:mockito-core:2.5.0",
-    sha1 = "be28d46a52c7f2563580adeca350145e9ce916f8",
-    deps = [
-      "@byte_buddy//jar",
-      "@objenesis//jar",
-    ],
-  )
+    maven_jar(
+        name = "mockito",
+        artifact = "org.mockito:mockito-core:2.5.0",
+        sha1 = "be28d46a52c7f2563580adeca350145e9ce916f8",
+        deps = [
+            "@byte_buddy//jar",
+            "@objenesis//jar",
+        ],
+    )
 
-  maven_jar(
-    name = "byte_buddy",
-    artifact = "net.bytebuddy:byte-buddy:1.5.12",
-    sha1 = "b1ba1d15f102b36ed43b826488114678d6d413da",
-  )
+    maven_jar(
+        name = "byte_buddy",
+        artifact = "net.bytebuddy:byte-buddy:1.5.12",
+        sha1 = "b1ba1d15f102b36ed43b826488114678d6d413da",
+    )
 
-  maven_jar(
-    name = "objenesis",
-    artifact = "org.objenesis:objenesis:2.4",
-    sha1 = "2916b6c96b50c5b3ec4452ed99401db745aabb27",
-  )
+    maven_jar(
+        name = "objenesis",
+        artifact = "org.objenesis:objenesis:2.4",
+        sha1 = "2916b6c96b50c5b3ec4452ed99401db745aabb27",
+    )

src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java b/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
index 6f1a582..d00e03e 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
@@ -16,7 +16,11 @@
 
 import static com.google.common.truth.Truth.assertThat;
 import static org.junit.Assert.fail;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.any;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import com.google.gerrit.reviewdb.client.Project;
 import com.google.gerrit.server.project.ProjectCache;

tools/bzl/plugin.bzl

diff --git a/tools/bzl/plugin.bzl b/tools/bzl/plugin.bzl
index a2e438f..0b25d23 100644
--- a/tools/bzl/plugin.bzl
+++ b/tools/bzl/plugin.bzl
@@ -1,6 +1,6 @@
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl",
-    "gerrit_plugin",
     "PLUGIN_DEPS",
     "PLUGIN_TEST_DEPS",
+    "gerrit_plugin",
 )