commit 640b969f048498adf08987e24a1078d5001cb325
author Marco Miller <marco.miller@ericsson.com> Sat Oct 13 14:27:13 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Sat Oct 13 14:27:28 2018 -0400
tree 4a273aa6b443dd32df28beae77e4fecdee12472e
parent 7fbef7a087cf7a43ac5ca63c9db9b12f3eb2092a
parent 36e0d43538180d4bcc25cffdbde3009275987e14

Merge branch 'stable-2.15'

* stable-2.15:
  bazlets: Replace native.git_repository with skylark rule
  Upgrade mockito to 2.23.0
  Upgrade bazlets to latest stable-2.15 to build with 2.15.5 API
  Upgrade bazlets to latest stable-2.14 to build with 2.14.15 API
  Update bazlets to latest stable-2.15 to build with 2.15.4 API

Change-Id: Id2441ce1bb0b3ef0a6fe1c2bd155ced8218e0a32

WORKSPACE

diff --git a/WORKSPACE b/WORKSPACE
index 3b6c64c..3983599 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
 load("//:bazlets.bzl", "load_bazlets")
 
 load_bazlets(
-    commit = "d7597f93ef70e3fdcb95684287816735344242ba",
+    commit = "6d3fd710ea4ca44805bb8c858d72b53bd3a500f3",
 )
 
 # Release Plugin API

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 e01b976..6bb1ec6 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,18 +3,27 @@
 def external_plugin_deps():
     maven_jar(
         name = "mockito",
-        artifact = "org.mockito:mockito-core:2.16.0",
-        sha1 = "a022ee494c753789a1e7cae75099de81d8a5cea6",
+        artifact = "org.mockito:mockito-core:2.23.0",
+        sha1 = "497ddb32fd5d01f9dbe99a2ec790aeb931dff1b1",
         deps = [
             "@byte-buddy//jar",
+            "@byte-buddy-agent//jar",
             "@objenesis//jar",
         ],
     )
 
+    BYTE_BUDDY_VERSION = "1.9.0"
+
     maven_jar(
         name = "byte-buddy",
-        artifact = "net.bytebuddy:byte-buddy:1.7.9",
-        sha1 = "51218a01a882c04d0aba8c028179cce488bbcb58",
+        artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION,
+        sha1 = "8cb0d5baae526c9df46ae17693bbba302640538b",
+    )
+
+    maven_jar(
+        name = "byte-buddy-agent",
+        artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION,
+        sha1 = "37b5703b4a6290be3fffc63ae9c6bcaaee0ff856",
     )
 
     maven_jar(