Merge branch 'stable-2.16' into stable-3.0 * stable-2.16: Bump Bazel version to 3.0.0 Change-Id: I46fcad6b2a367669779aa5de50c0cc23470a706e
diff --git a/WORKSPACE b/WORKSPACE index 5a1e818..c1fbb1c 100644 --- a/WORKSPACE +++ b/WORKSPACE
@@ -3,7 +3,7 @@ load("//:bazlets.bzl", "load_bazlets") load_bazlets( - commit = "9e23df10840ca3976431c842fdada58c7a51c6e3", + commit = "97eef86854b0fb68b9287831f3075b6f6218ff41", #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 43cc3a3..e24137f 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());