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.bzl b/gerrit_api.bzl
index 15efe1d..31f68d3 100644
--- a/gerrit_api.bzl
+++ b/gerrit_api.bzl
@@ -6,7 +6,7 @@
 gerrit_api is rule for fetching Gerrit plugin API using Bazel.
 """
 
-VER = "3.0.3"
+VER = "3.1.0-rc1"
 
 def gerrit_api():
     bouncycastle_repos()
@@ -15,12 +15,12 @@
     maven_jar(
         name = "gerrit_plugin_api",
         artifact = "com.google.gerrit:gerrit-plugin-api:" + VER,
-        sha1 = "d52314ea1245d31e67dd7de5731cb2db854ef3e3",
+        sha1 = "9e81ffb444dcf78e8298c813b635223226403cdc",
     )
     maven_jar(
         name = "gerrit_acceptance_framework",
         artifact = "com.google.gerrit:gerrit-acceptance-framework:" + VER,
-        sha1 = "ae2cdc1bdf8922e5bd9fb3fef0810d060e4ec5c8",
+        sha1 = "c658a91fa59a311c5217fcef02227d23fe9bb1b6",
     )
     native.bind(
         name = "gerrit-plugin-api",
diff --git a/gerrit_api_maven_local.bzl b/gerrit_api_maven_local.bzl
index bdeb4ba..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.0.2-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/")