Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
Fix indentation
Add Prolog skylark rule
Set gerrit maven local api to version 2.14.7-SNAPSHOT
Update API to 2.14.6
Upgrade Gerrit API to 2.14.5.1
Change-Id: I731065b7bb97485fd929e340674af9ca92645548
diff --git a/gerrit_api.bzl b/gerrit_api.bzl
index 5c2e893..cfe72c5 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.6"
+VER = "2.15-rc1"
def gerrit_api():
bouncycastle_repos()
@@ -13,17 +13,17 @@
maven_jar(
name = 'gerrit_plugin_api',
artifact = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = '0bcd16415c9f2cd2e51c5d6f8b0939b5742b69cd',
+ sha1 = 'a448355a7fdfbace0e6e4f449c9a37aaa3a889f9',
)
maven_jar(
name = 'gerrit_plugin_gwtui',
artifact = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
- sha1 = 'ccf9fe33a759c247339ab096ac505013aed27a17',
+ sha1 = 'd2412bc6048294d2a3a5567d45788692631baa1a',
)
maven_jar(
name = 'gerrit_acceptance_framework',
artifact = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
- sha1 = 'a4054a28d79cc4d9b00613ff9d31876243b21e2e',
+ sha1 = '0870c05eaefa99bbfd0a873095d880d6398d43b0',
)
native.bind(
name = 'gerrit-plugin-api',
diff --git a/gerrit_api_maven_local.bzl b/gerrit_api_maven_local.bzl
index f703240..b1fe421 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.7-SNAPSHOT"
+VER = "2.15-SNAPSHOT"
def gerrit_api_maven_local():
bouncycastle_repos()
