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'"

lib/gerrit/BUCK

diff --git a/lib/gerrit/BUCK b/lib/gerrit/BUCK
index 277a452..d7f6f1f 100644
--- a/lib/gerrit/BUCK
+++ b/lib/gerrit/BUCK
@@ -1,12 +1,11 @@
 include_defs('//bucklets/maven_jar.bucklet')
 
-VER = '2.12-rc0'
-REPO = MAVEN_CENTRAL
+VER = '2.13-SNAPSHOT'
+REPO = MAVEN_LOCAL
 
 maven_jar(
   name = 'plugin-api',
   id = 'com.google.gerrit:gerrit-plugin-api:' + VER,
-  sha1 = '8fd408e0eedc5e891ac779ab26491fb377800e74',
   license = 'Apache2.0',
   attach_source = False,
   repository = REPO,

src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
index 4faa057..16baac0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
@@ -16,6 +16,7 @@
 
 import com.google.common.collect.Lists;
 import com.google.gerrit.extensions.annotations.PluginName;
+import com.google.gerrit.extensions.client.MenuItem;
 import com.google.gerrit.extensions.webui.TopMenu;
 import com.google.gerrit.server.CurrentUser;
 import com.google.gerrit.server.account.CapabilityControl;