commit 57d37f58e4ff9c595e0de1789c6b5d0415dd153b
author Marco Miller <marco.miller@ericsson.com> Sat Oct 13 13:34:50 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Sat Oct 13 13:34:50 2018 -0400
tree 7036445fcbb3ef5f3a394eed3215016263bfd353
parent 2c89e5214534e8cd0a0ba1594de37956fae91f4c
parent db0ca69e11eec55e942d28f70b1ef91b877fd844

Merge branch 'stable-2.15'

* stable-2.15:
  bazlets: Replace native.git_repository with skylark rule
  Harmonize external dependency names to use hyphen
  Upgrade mockito to 2.23.0
  Upgrade bazlets to latest stable-2.15 to build with 2.15.5 API
  Update bazlets to latest stable-2.14 to build with 2.14.15 API
  Update bazlets to latest stable-2.15 and build with released 2.15.4 API

Change-Id: I00c23d075ea1282f6745010e2b1644bae90ea8d7

bazlets.bzl

diff --git a/bazlets.bzl b/bazlets.bzl
index f97b72c..f089af4 100644
--- a/bazlets.bzl
+++ b/bazlets.bzl
@@ -1,10 +1,12 @@
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
 NAME = "com_googlesource_gerrit_bazlets"
 
 def load_bazlets(
         commit,
         local_path = None):
     if not local_path:
-        native.git_repository(
+        git_repository(
             name = NAME,
             remote = "https://gerrit.googlesource.com/bazlets",
             commit = commit,

external_plugin_deps.bzl

diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 4ca722d..32937d4 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,27 +3,27 @@
 def external_plugin_deps():
     maven_jar(
         name = "mockito",
-        artifact = "org.mockito:mockito-core:2.21.0",
-        sha1 = "cdd1d0d5b2edbd2a7040735ccf88318c031f458b",
+        artifact = "org.mockito:mockito-core:2.23.0",
+        sha1 = "497ddb32fd5d01f9dbe99a2ec790aeb931dff1b1",
         deps = [
-            "@byte_buddy//jar",
-            "@byte_buddy_agent//jar",
+            "@byte-buddy//jar",
+            "@byte-buddy-agent//jar",
             "@objenesis//jar",
         ],
     )
 
-    BYTE_BUDDY_VER = "1.8.15"
+    BYTE_BUDDY_VER = "1.9.0"
 
     maven_jar(
-        name = "byte_buddy",
+        name = "byte-buddy",
         artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VER,
-        sha1 = "cb36fe3c70ead5fcd016856a7efff908402d86b8",
+        sha1 = "8cb0d5baae526c9df46ae17693bbba302640538b",
     )
 
     maven_jar(
-        name = "byte_buddy_agent",
+        name = "byte-buddy-agent",
         artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VER,
-        sha1 = "a2dbe3457401f65ad4022617fbb3fc0e5f427c7d",
+        sha1 = "37b5703b4a6290be3fffc63ae9c6bcaaee0ff856",
     )
 
     maven_jar(