Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Switch required bazel version to 0.29.1
Change-Id: I394c764adcc02916f8aa6dbfbcf37338af00b9b6
diff --git a/WORKSPACE b/WORKSPACE
index 1a9d125..8042d6c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "6af2e084b72d38a3375925c4586ac2278ef95ee9",
+ commit = "0ca51936ca46049cddd34e971a595d3baafe731b",
#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());