Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Upgrade bazlets to latest stable-2.16 to build with 2.16.21 API Upgrade bazlets to latest stable-2.15 to build with 2.15.19 API Upgrade bazlets to latest stable-2.14 to build with 2.14.21 API Change-Id: I9e6a8d678039fd186be3306e3729c31585472f8f
diff --git a/WORKSPACE b/WORKSPACE index 908791b..d56171b 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "fff6f20bb2eceaf872a8acf8ad51471c25a82d38", + commit = "15eae2ee5cd524a204bd62c3d59bfd0ce86916ec", #local_path = "/home/<user>/projects/bazlets", )
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());