Merge branch 'stable-3.13'

* stable-3.13:
  Skip plugins with malformed JSON metadata

Change-Id: Iff90945c5c18d2cf01be49558d021511cbf9538b

BUILD

diff --git a/BUILD b/BUILD
index 51b324d..dcb81ba 100644
--- a/BUILD
+++ b/BUILD
@@ -1,5 +1,4 @@
-load("//tools/bzl:junit.bzl", "junit_tests")
-load("//tools/bzl:plugin.bzl", "PLUGIN_TEST_DEPS", "gerrit_plugin")
+load("@com_googlesource_gerrit_bazlets//:gerrit_plugin.bzl", "gerrit_plugin", "gerrit_plugin_tests")
 
 gerrit_plugin(
     name = "plugin-manager",
@@ -15,12 +14,12 @@
     resources = glob(["src/main/resources/**/*"]),
 )
 
-junit_tests(
+gerrit_plugin_tests(
     name = "plugin_manager_tests",
     srcs = glob(["src/test/java/**/*.java"]),
     data = ["//:release.war"],
     visibility = ["//visibility:public"],
-    deps = PLUGIN_TEST_DEPS + [
+    deps = [
         ":plugin-manager__plugin",
         "//lib/mockito",
     ],