Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Fix the error in project properties generation file
Switch to 2.14.9-SNAPSHOT Gerrit API version for local dev
Change-Id: I6316a60fffe36cba3ff20ef8630df0768e0aa82d
diff --git a/gerrit_api.bzl b/gerrit_api.bzl
index 1304e9b..c415315 100644
--- a/gerrit_api.bzl
+++ b/gerrit_api.bzl
@@ -5,7 +5,7 @@
gerrit_api is rule for fetching Gerrit plugin API using Bazel.
"""
-VER = "2.14.8"
+VER = "2.15.1"
def gerrit_api():
bouncycastle_repos()
@@ -13,18 +13,18 @@
maven_jar(
name = 'gerrit_plugin_api',
artifact = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = '80855a1736a5e28c6d86fb8ccfeb6b2642bf5133',
+ sha1 = '08e9c947b73d88daf741c246b19334555cb77ec5',
)
maven_jar(
name = 'gerrit_plugin_gwtui',
artifact = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
- sha1 = '03e3e95205562a8ed6c8b348276c5eaf84cf1a23',
+ sha1 = '2d985422cc4b73b947a216cc394ca33d60ff3305',
exclude = ['com/google/gwt/*'],
)
maven_jar(
name = 'gerrit_acceptance_framework',
artifact = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
- sha1 = '4b4f9f13448aa3211cb32642f08018675889e363',
+ sha1 = '9b074b4703dbdfde0ea933284b01e5240009ebe3',
)
native.bind(
name = 'gerrit-plugin-api',
diff --git a/gerrit_api_maven_local.bzl b/gerrit_api_maven_local.bzl
index ccaa7fe..32f0db7 100644
--- a/gerrit_api_maven_local.bzl
+++ b/gerrit_api_maven_local.bzl
@@ -5,7 +5,7 @@
gerrit_api is rule for fetching Gerrit plugin API using Bazel.
"""
-VER = "2.14.9-SNAPSHOT"
+VER = "2.15.2-SNAPSHOT"
def gerrit_api_maven_local():
bouncycastle_repos()
