Merge branch 'stable-3.4' into stable-3.5
* stable-3.4:
download to GERRIT_CACHE_HOME when set
Migrate to python 3
tools/maven/package.bzl: Use bazelisk instead bazel
Change-Id: I3d13738ec314a23041bc9681164100d95df3d82f
diff --git a/gerrit_api.bzl b/gerrit_api.bzl
index 62f3938..d0a90c4 100644
--- a/gerrit_api.bzl
+++ b/gerrit_api.bzl
@@ -7,9 +7,9 @@
gerrit_api is rule for fetching Gerrit plugin API using Bazel.
"""
-def gerrit_api(version = "3.4.0",
- plugin_api_sha1 = "9938efcf30a708e1a660f26e2ded993c42f397a4",
- acceptance_framework_sha1 = "4c34e156c90738504280eb8f0023aababab35cf2"):
+def gerrit_api(version = "3.5.0.1",
+ plugin_api_sha1 = "9ae63c02455635de2d1a78865b0374a10f5e9465",
+ acceptance_framework_sha1 = "2d33e5944f5a0b048ea355609040178e7385fdb3"):
gerrit_api_version(
name = "gerrit_api_version",
version = version,
diff --git a/tools/javadoc.bzl b/tools/javadoc.bzl
index c7a7e1d..4799254 100644
--- a/tools/javadoc.bzl
+++ b/tools/javadoc.bzl
@@ -25,7 +25,7 @@
transitive_jar_paths = [j.path for j in transitive_jars.to_list()]
dir = ctx.outputs.zip.path + ".dir"
source = ctx.outputs.zip.path + ".source"
- external_docs = ["https://docs.oracle.com/javase/8/docs/api"] + ctx.attr.external_docs
+ external_docs = ["https://docs.oracle.com/en/java/javase/11/docs/api"] + ctx.attr.external_docs
cmd = [
"rm -rf %s" % source,
"mkdir %s" % source,
