commit 7a12f5b71cac0718f3479f0a3d9321c420eee04a
author Marco Miller <marco.miller@ericsson.com> Sat Oct 13 13:55:10 2018 -0400
committer Marco Miller <marco.miller@ericsson.com> Sat Oct 13 13:55:10 2018 -0400
tree 03761bef6eb4cba7f223e64e2e00cc569492d7ca
parent f3f897ccbd407766a30660b4adf17262572480e6
parent c12ec2088a71da446f576eb024142824ca2634e1

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
  Upgrade 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: I642de13da2725a7dbba6ee08795ba302c5273b97

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 53fbc09..6bb1ec6 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -3,22 +3,31 @@
 def external_plugin_deps():
     maven_jar(
         name = "mockito",
-        artifact = "org.mockito:mockito-core:2.5.0",
-        sha1 = "be28d46a52c7f2563580adeca350145e9ce916f8",
+        artifact = "org.mockito:mockito-core:2.23.0",
+        sha1 = "497ddb32fd5d01f9dbe99a2ec790aeb931dff1b1",
         deps = [
-            "@byte_buddy//jar",
+            "@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.5.12",
-        sha1 = "b1ba1d15f102b36ed43b826488114678d6d413da",
+        name = "byte-buddy",
+        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(
         name = "objenesis",
-        artifact = "org.objenesis:objenesis:2.4",
-        sha1 = "2916b6c96b50c5b3ec4452ed99401db745aabb27",
+        artifact = "org.objenesis:objenesis:2.6",
+        sha1 = "639033469776fd37c08358c6b92a4761feb2af4b",
     )