Merge branch 'stable-2.16' into stable-3.0
* stable-2.16:
Bump Bazel version to 2.0.0
Change-Id: Icc6b7ba72f29ceadc1650730ac7fb11b7f312ed7
diff --git a/WORKSPACE b/WORKSPACE
index 2058f70..3ff2e21 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "59529f046a5cb855d9fe3ee87110d53305ec69b9",
+ commit = "99d51724c816dc25f03c8ca96126716298a6ee38",
#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());