Merge branch 'stable-2.15'
* stable-2.15:
Adjust names of prolog dependencies
Add optional dir_name argument to gerrit_plugin
gerrit_plugin: Improve stamping error message
Upgrade Gerrit API to version 2.15.2
Change-Id: I1b9815289e1a632603380468844092a1fb686999
diff --git a/gerrit_api.bzl b/gerrit_api.bzl
index c415315..fd72e92 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.15.1"
+VER = "2.15.2"
def gerrit_api():
bouncycastle_repos()
@@ -13,18 +13,18 @@
maven_jar(
name = 'gerrit_plugin_api',
artifact = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = '08e9c947b73d88daf741c246b19334555cb77ec5',
+ sha1 = '118179c5577e6d6d67a6347694eedc8214d0e44b',
)
maven_jar(
name = 'gerrit_plugin_gwtui',
artifact = 'com.google.gerrit:gerrit-plugin-gwtui:' + VER,
- sha1 = '2d985422cc4b73b947a216cc394ca33d60ff3305',
+ sha1 = 'bc1b74ca1cdef78ee0533c853adb3a399682a648',
exclude = ['com/google/gwt/*'],
)
maven_jar(
name = 'gerrit_acceptance_framework',
artifact = 'com.google.gerrit:gerrit-acceptance-framework:' + VER,
- sha1 = '9b074b4703dbdfde0ea933284b01e5240009ebe3',
+ sha1 = '5c2dee7b74812cd78c054fc5b933778e5daaf7ed',
)
native.bind(
name = 'gerrit-plugin-api',
diff --git a/lib/prolog/BUILD b/lib/prolog/BUILD
index bbbc0de..ceff892 100644
--- a/lib/prolog/BUILD
+++ b/lib/prolog/BUILD
@@ -1,17 +1,17 @@
java_binary(
- name = "compiler_bin",
+ name = "compiler-bin",
main_class = "PrologCompiler",
visibility = ["//visibility:public"],
- runtime_deps = [":compiler_lib"],
+ runtime_deps = [":compiler-lib"],
)
java_library(
- name = "compiler_lib",
+ name = "compiler-lib",
srcs = ["java/PrologCompiler.java"],
visibility = ["//visibility:public"],
deps = [
- "@prolog_compiler//jar",
- "@prolog_runtime//jar",
- "@prolog_io//jar",
+ "@prolog-compiler//jar",
+ "@prolog-runtime//jar",
+ "@prolog-io//jar",
],
)
diff --git a/lib/prolog/prolog.bzl b/lib/prolog/prolog.bzl
index dad82b4..fe300c4 100644
--- a/lib/prolog/prolog.bzl
+++ b/lib/prolog/prolog.bzl
@@ -19,16 +19,16 @@
**kwargs):
native.genrule(
name = name + '__pl2j',
- cmd = '$(location @com_googlesource_gerrit_bazlets//lib/prolog:compiler_bin) ' +
+ cmd = '$(location @com_googlesource_gerrit_bazlets//lib/prolog:compiler-bin) ' +
'$$(dirname $@) $@ ' +
'$(SRCS)',
srcs = srcs,
- tools = ['@com_googlesource_gerrit_bazlets//lib/prolog:compiler_bin'],
+ tools = ['@com_googlesource_gerrit_bazlets//lib/prolog:compiler-bin'],
outs = [ name + '.srcjar' ],
)
native.java_library(
name = name,
srcs = [':' + name + '__pl2j'],
- deps = ['@prolog_runtime//jar:neverlink'] + deps,
+ deps = ['@prolog-runtime//jar:neverlink'] + deps,
**kwargs
)
