Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Upgrade bazlets to latest stable-2.15
Upgrade bazlets to latest stable-2.14
Change-Id: I014b9adea419473ba99817de71ee24d009eb616f
diff --git a/WORKSPACE b/WORKSPACE
index db537c6..7b64f11 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "3df1fac2202ac2a42cec61fac8c502178c9af391",
+ commit = "631205bc4f7903d3cf656a844cab2bfd6b03f246",
#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());