commit 1e1663c40ace21b14158d1c53c98068c53c4c8c1
author Marco Miller <marco.miller@ericsson.com> Fri Apr 12 15:21:58 2019 -0400
committer Marco Miller <marco.miller@ericsson.com> Fri Apr 12 15:21:58 2019 -0400
tree 821f0113c41ce7d2841c2e25b394f3dc03f98171
parent 586493efdd77a62bdd331cd34382893d1fd380ae
parent 002927aafa18e66d3bf9091b4d958b7e389e93a9

Merge branch 'stable-2.16'

* stable-2.16:
  Upgrade mockito-core to 2.27.0

Change-Id: I36fb7ea8654f3a5f009cdb49c9fa94cba199d7db

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 1088a27..e96b40a 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,27 +3,27 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "c827ba79413585ab9dfc1bbd0d7f609eedd6aa80",
+    commit = "f3b3eecf061193e8909298bc9c35027df3bf9d44",
     #local_path = "/home/<user>/projects/bazlets",
 )
 
 # Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()
-
-# Release Plugin API
 load(
-    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
-    "gerrit_api",
+    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
+    "gerrit_api_maven_local",
 )
 
+# Load snapshot Plugin API
+gerrit_api_maven_local()
+
+# Release Plugin API
+#load(
+#    "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
+#    "gerrit_api",
+#)
+
 # Load release Plugin API
-gerrit_api()
+#gerrit_api()
 
 load("//:external_plugin_deps.bzl", "external_plugin_deps")
 

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 {