Merge branch 'stable-2.16'
* stable-2.16:
Update javamelody-core to 1.75.0
Upgrade bazlets to latest stable-2.16 to build with 2.16.1 API
Bazel: Include eclipse-out directory in .bazelignore
MonitoringTopMenu: Prepend path to the top menu item
Add explanatory comment to empty BUILD file(s)
Change-Id: I357ea4ee77d1e5279247cd2731f609fbaca8cb5c
diff --git a/.bazelignore b/.bazelignore
new file mode 100644
index 0000000..30f1613
--- /dev/null
+++ b/.bazelignore
@@ -0,0 +1 @@
+eclipse-out
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index a839df4..c15a15a 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,8 +3,8 @@
def external_plugin_deps():
maven_jar(
name = "javamelody-core",
- artifact = "net.bull.javamelody:javamelody-core:1.74.0",
- sha1 = "208ab93932b32be209d264502ed153f18034500f",
+ artifact = "net.bull.javamelody:javamelody-core:1.75.0",
+ sha1 = "0568dded8ec5c7780cc5eab15bc39c0d6b643913",
)
maven_jar(
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 60ebf86..6e1b0a1 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringTopMenu.java
@@ -29,7 +29,7 @@
if (capabilityChecker.canMonitor()) {
menuEntries.add(
new MenuEntry(
- "Monitoring", Collections.singletonList(new MenuItem("JavaMelody", "monitoring"))));
+ "Monitoring", Collections.singletonList(new MenuItem("JavaMelody", "/monitoring"))));
}
}
diff --git a/tools/bzl/BUILD b/tools/bzl/BUILD
index e69de29..c5ed0b7 100644
--- a/tools/bzl/BUILD
+++ b/tools/bzl/BUILD
@@ -0,0 +1 @@
+# Empty file required by Bazel
