commit 914f9157ed3ace1e0c7311a62f0c8fb061e42f39
author David Ostrovsky <david.ostrovsky@gmail.com> Fri Jan 22 06:53:15 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Jan 22 06:53:15 2016 +0000
tree 63d28bd5f4e77188800e0a7160cfef43a002ecb9
parent 997487a6740d9b6b5af434343d494694c8e33cdb
parent 6f9097d6860217f4ccd21f973cfa468ed1952eb3

Merge "Merge branch 'stable-2.12'"

BUCK

diff --git a/BUCK b/BUCK
index 1bd5073..8eded1a 100644
--- a/BUCK
+++ b/BUCK
@@ -54,7 +54,7 @@
 java_library(
   name = 'javamelody-datasource-interceptor-lib',
   srcs = INTERCEPTOR,
-  provided_deps = DEPS + ['//gerrit-extension-api:api'],
+  provided_deps = DEPS + GERRIT_PLUGIN_API,
 )
 
 zip_file(
@@ -69,8 +69,8 @@
 
 maven_jar(
   name = 'javamelody-lib',
-  id = 'net.bull.javamelody:javamelody-core:1.56.0',
-  sha1 = '0ae378effb19d2ad2db6f352ed91548f338b7c46',
+  id = 'net.bull.javamelody:javamelody-core:1.58.0',
+  sha1 = '5f1b3c3c1d037e4d62605b9ca6e15da390f8bc6a',
   license = 'DO_NOT_DISTRIBUTE',
 )
 

gerrit-extension-api/BUCK

diff --git a/gerrit-extension-api/BUCK b/gerrit-extension-api/BUCK
deleted file mode 100644
index 6cdf765..0000000
--- a/gerrit-extension-api/BUCK
+++ /dev/null
@@ -1,14 +0,0 @@
-include_defs('//bucklets/maven_jar.bucklet')
-
-VER = '2.12-rc0'
-REPO = MAVEN_CENTRAL
-
-maven_jar(
-  name = 'api',
-  id = 'com.google.gerrit:gerrit-extension-api:' + VER,
-  sha1 = 'ee4deac28112cdb65dda69468572523ce359b3bb',
-  license = 'Apache2.0',
-  attach_source = False,
-  repository = REPO,
-)
-