Merge branch 'stable-3.1'
* stable-3.1:
Bazel: Update time attribute of file entries in plugin artifact
Change-Id: Ie55d89b06823678dda84a1812ec08ad15e536168
diff --git a/bouncycastle.bzl b/bouncycastle.bzl
index 02960bc..d9025bf 100644
--- a/bouncycastle.bzl
+++ b/bouncycastle.bzl
@@ -5,23 +5,23 @@
"""
# This should be the same version used in Gerrit.
-BC_VERS = "1.60"
+BC_VERS = "1.61"
def bouncycastle_repos():
maven_jar(
name = "bouncycastle_bcprov",
artifact = "org.bouncycastle:bcprov-jdk15on:" + BC_VERS,
- sha1 = "bd47ad3bd14b8e82595c7adaa143501e60842a84",
+ sha1 = "00df4b474e71be02c1349c3292d98886f888d1f7",
)
maven_jar(
name = "bouncycastle_bcpg",
artifact = "org.bouncycastle:bcpg-jdk15on:" + BC_VERS,
- sha1 = "13c7a199c484127daad298996e95818478431a2c",
+ sha1 = "422656435514ab8a28752b117d5d2646660a0ace",
)
maven_jar(
name = "bouncycastle_bcpkix",
artifact = "org.bouncycastle:bcpkix-jdk15on:" + BC_VERS,
- sha1 = "d0c46320fbc07be3a24eb13a56cee4e3d38e0c75",
+ sha1 = "89bb3aa5b98b48e584eee2a7401b7682a46779b4",
)
native.bind(
name = "bcprov",
diff --git a/gerrit_api_maven_local.bzl b/gerrit_api_maven_local.bzl
index aa9b50b..f1f5496 100644
--- a/gerrit_api_maven_local.bzl
+++ b/gerrit_api_maven_local.bzl
@@ -6,7 +6,7 @@
gerrit_api is rule for fetching Gerrit plugin API using Bazel.
"""
-VER = "3.1.3-SNAPSHOT"
+VER = "3.2.0-SNAPSHOT"
def gerrit_api_maven_local():
bouncycastle_repos()
diff --git a/tools/pkg_war.bzl b/tools/pkg_war.bzl
index 931450b..2952a03 100644
--- a/tools/pkg_war.bzl
+++ b/tools/pkg_war.bzl
@@ -67,7 +67,7 @@
inputs.append(dep)
if ctx.attr.web_xml:
- for web_xml in ctx.attr.web_xml.files:
+ for web_xml in ctx.attr.web_xml.files.to_list():
inputs.append(web_xml)
cmd = cmd + _add_file(ctx.attr.name, web_xml, build_output + "/WEB-INF/")
