commit 40aecb8ffc62ac9ed318b4ff6abf7b864c64e4d6
author Marco Miller <marco.miller@ericsson.com> Mon Jul 27 16:22:35 2020 -0400
committer Marco Miller <marco.miller@ericsson.com> Mon Jul 27 16:22:35 2020 -0400
tree 78b732e1cfa14a5684f14415fbc38831faf8716f
parent d2e2a44b19779ef1a75bc51af6d2b6289f932954
parent d77f4bcd71def50aab7be774d19531c9f9577306

Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I045532ba2cbf5d2c636de396fc705bd289e9eeba

.bazelversion

diff --git a/.bazelversion b/.bazelversion
index fd2a018..47b322c 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1 +1 @@
-3.1.0
+3.4.1

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index ef3f9f5..461b83e 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,24 +3,13 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "8ad33887665f4f6adf7cb465a03f6bd81b95e01d",
+    commit = "7a9ae377b519934c87184cc05845663ed708b69c",
     #local_path = "/home/<user>/projects/bazlets",
 )
 
-# Release Plugin API
 load(
     "@com_googlesource_gerrit_bazlets//:gerrit_api.bzl",
     "gerrit_api",
 )
 
-# Snapshot Plugin API
-#load(
-#    "@com_googlesource_gerrit_bazlets//:gerrit_api_maven_local.bzl",
-#    "gerrit_api_maven_local",
-#)
-
-# Load release Plugin API
 gerrit_api()
-
-# Load snapshot Plugin API
-#gerrit_api_maven_local()

src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java

diff --git a/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java b/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
index d680abd..56be07a 100644
--- a/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
+++ b/src/test/java/com/googlesource/gerrit/plugins/readonly/AbstractReadOnlyTest.java
@@ -135,7 +135,7 @@
     String url = ssh ? adminSshSession.getUrl() : admin.getHttpUrl(server);
     if (!ssh) {
       CredentialsProvider.setDefault(
-          new UsernamePasswordCredentialsProvider(admin.username, admin.httpPassword));
+          new UsernamePasswordCredentialsProvider(admin.username(), admin.httpPassword()));
     }
     testRepo = GitUtil.cloneProject(project, url + "/" + project.get());