commit 6c452c9291d59502f81a1e7c55539e244d302575
author Marco Miller <marco.miller@ericsson.com> Tue Jun 02 16:15:18 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Tue Jun 02 16:15:18 2020 -0400
tree 579c39e23a358579af2cab49774f64cba1b56db2
parent 9bb2587a3f51ce64416a3eec250911bbe5b64ec1
parent 753d199a3d6aef61e864aa2dc0d43056eb31b6f5

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade bazlets to latest stable-2.16 to build with 2.16.20 API

Change-Id: I72b0954532c9a53289eaf6dbe560f15289e0d483

BUILD

diff --git a/BUILD b/BUILD
index fc9673b..354abff 100644
--- a/BUILD
+++ b/BUILD
@@ -24,7 +24,6 @@
     visibility = ["//visibility:public"],
     exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
         ":rate-limiter__plugin",
-        "@mockito//jar",
     ],
 )
 

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index a12a874..90b15c3 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "c40247e30381ddc4a90ef99d749a9161ac4d064b",
+    commit = "15eae2ee5cd524a204bd62c3d59bfd0ce86916ec",
     #local_path = "/home/<user>/projects/bazlets",
 )
 
@@ -24,7 +24,3 @@
 
 # Load release Plugin API
 gerrit_api()
-
-load("//:external_plugin_deps.bzl", "external_plugin_deps")
-
-external_plugin_deps()

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
deleted file mode 100644
index 151b2fb..0000000
--- a/external_plugin_deps.bzl
+++ /dev/null
@@ -1,26 +0,0 @@
-load("//tools/bzl:maven_jar.bzl", "maven_jar")
-
-def external_plugin_deps():
-    maven_jar(
-        name = "mockito",
-        artifact = "org.mockito:mockito-core:2.28.2",
-        sha1 = "91110215a8cb9b77a46e045ee758f77d79167cc0",
-        deps = [
-            "@byte-buddy//jar",
-            "@objenesis//jar",
-        ],
-    )
-
-    BYTE_BUDDY_VERSION = "1.9.10"
-
-    maven_jar(
-        name = "byte-buddy",
-        artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION,
-        sha1 = "211a2b4d3df1eeef2a6cacf78d74a1f725e7a840",
-    )
-
-    maven_jar(
-        name = "objenesis",
-        artifact = "org.objenesis:objenesis:2.6",
-        sha1 = "639033469776fd37c08358c6b92a4761feb2af4b",
-    )

src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java
index 0c0101b..352389b 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/ratelimiter/RateLimitUploadPackIT.java
@@ -66,7 +66,7 @@
     in.name = groupName;
     in.ownerId = "Administrators";
     gApi.groups().create(in);
-    gApi.groups().id(groupName).addMembers(user.username);
+    gApi.groups().id(groupName).addMembers(user.username());
   }
 
   private void createProjectWithChange(String projectName) throws RestApiException {