Merge branch 'stable-2.11' into stable-2.12
* stable-2.11:
Use bucklets-provided constant to refer to Plugin API
Change-Id: I4e7154bd492a0f2447d3bb41d5aad5731066ca64
diff --git a/BUCK b/BUCK
index 58d3cfb..0cfa8ca 100644
--- a/BUCK
+++ b/BUCK
@@ -57,22 +57,20 @@
provided_deps = DEPS + GERRIT_PLUGIN_API,
)
-genrule(
+zip_file(
name = 'all',
- cmd = 'echo done >$OUT',
- deps = [
+ srcs = [
':javamelody',
':javamelody-datasource-interceptor',
':javamelody-deps',
':javamelody-nodep',
],
- out = '__fake.all__',
)
maven_jar(
name = 'javamelody-lib',
- id = 'net.bull.javamelody:javamelody-core:1.55.0',
- sha1 = '65c4f7cec7f499ac312e57704d3e37f39ee940ee',
+ id = 'net.bull.javamelody:javamelody-core:1.56.0',
+ sha1 = '0ae378effb19d2ad2db6f352ed91548f338b7c46',
license = 'DO_NOT_DISTRIBUTE',
)
diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index b100578..277a452 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,12 @@
include_defs('//bucklets/maven_jar.bucklet')
-VER = '2.11.5'
+VER = '2.12-rc0'
REPO = MAVEN_CENTRAL
maven_jar(
name = 'plugin-api',
id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
- sha1 = '768ab4bcf49d3809c4558a1532b44368337f8e6f',
+ sha1 = '8fd408e0eedc5e891ac779ab26491fb377800e74',
license = 'Apache2.0',
attach_source = False,
repository = REPO,
