commit 83885b669f41de01bc0485b2eb236579284722cb
author David Pursehouse <dpursehouse@collab.net> Mon Jun 18 10:23:07 2018 +0900
committer David Pursehouse <dpursehouse@collab.net> Mon Jun 18 10:23:07 2018 +0900
tree 6d580264167ecc8d4ae09303becb0e656e91d6c6
parent 6ecf2a422789a1a22241a890026ccd35d5faa50e
parent 0c0f55671f6200d2ae7e0dd914783f7ae65cbdfa

Merge branch 'stable-2.15'

* stable-2.15:
  Update bazlets to latest revision on stable-2.15
  Bazel: Harmonize names of external repositories
  Update javamelody-core to 1.72.0
  Update bazlets to latest revision on stable-2.14

Change-Id: Ibd7cdddc7d30f7d57c9d4de571fe65d9c39fea7a

BUILD

diff --git a/BUILD b/BUILD
index e7686ad..2bb92e7 100644
--- a/BUILD
+++ b/BUILD
@@ -21,7 +21,7 @@
         "Implementation-URL: https://gerrit-review.googlesource.com/#/admin/projects/plugins/javamelody",
     ],
     resources = glob(["src/main/resources/**/*"]),
-    deps = ["@javamelody_lib//jar:neverlink"],
+    deps = ["@javamelody-core//jar:neverlink"],
 )
 
 java_binary(
@@ -35,8 +35,8 @@
     srcs = ["src/main/java/com/googlesource/gerrit/plugins/javamelody/MonitoringDataSourceInterceptor.java"],
     visibility = ["//visibility:public"],
     deps = PLUGIN_DEPS_NEVERLINK + [
-        "@javamelody_lib//jar",
-        "@jrobin_lib//jar",
+        "@javamelody-core//jar",
+        "@jrobin//jar",
     ],
 )
 
@@ -55,6 +55,6 @@
     visibility = ["//visibility:public"],
     exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
         ":javamelody__plugin",
-        "@javamelody_lib//jar",
+        "@javamelody-core//jar",
     ],
 )

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 8e9f6fa..3076a09 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "42bffc66c0e92753133e4cea2debe65abc359c4d",
+    commit = "7ce9a3f58f030635b3a1229b7fb4c62ee7979bc8",
     #local_path = "/home/<user>/projects/bazlets",
 )
 

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index bb82907..28ca83b 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -2,13 +2,13 @@
 
 def external_plugin_deps():
   maven_jar(
-    name = 'javamelody_lib',
-    artifact = 'net.bull.javamelody:javamelody-core:1.71.0',
-    sha1 = '21b25741016ec135b7294fbd3cb5f41ace83b9ab',
+    name = 'javamelody-core',
+    artifact = 'net.bull.javamelody:javamelody-core:1.72.0',
+    sha1 = '199beaab8db0abb45b9c3bad58bf2659d2f96499',
   )
 
   maven_jar(
-    name = 'jrobin_lib',
+    name = 'jrobin',
     artifact = 'org.jrobin:jrobin:1.5.9',
     sha1 = 'bd9a84484c67de930fa841f23cd6a93108b05cd0',
   )