Merge branch 'stable-3.0'
* stable-3.0:
Update bazlets to latest stable-3.0
Upgrade mockito-core to 2.28.2
Don't import Id/Key/NameKey directly
Bazel: Consume mockito library from plugin API
Upgrade bazlets to latest master.
Change-Id: I5f90f2be3f1c72b7766ac68febbe697b9fbf7703
diff --git a/BUILD b/BUILD
index 7d5fad8..b5eba83 100644
--- a/BUILD
+++ b/BUILD
@@ -40,7 +40,6 @@
visibility = ["//visibility:public"],
exports = PLUGIN_DEPS + PLUGIN_TEST_DEPS + [
":high-availability__plugin",
- "@mockito//jar",
"@wiremock//jar",
],
)
diff --git a/WORKSPACE b/WORKSPACE
index eb65a79..df5e7b5 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,7 +3,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "d826d85285bb22d3fe817fe165a7e1d3472f65fa",
+ commit = "c797c5352094a802c224028ed4e6facc87e197fd",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/external_plugin_deps.bzl b/external_plugin_deps.bzl
index 1f65ede..3ac2f8b 100644
--- a/external_plugin_deps.bzl
+++ b/external_plugin_deps.bzl
@@ -8,37 +8,6 @@
)
maven_jar(
- name = "mockito",
- artifact = "org.mockito:mockito-core:2.27.0",
- sha1 = "835fc3283b481f4758b8ef464cd560c649c08b00",
- deps = [
- "@byte-buddy//jar",
- "@byte-buddy-agent//jar",
- "@objenesis//jar",
- ],
- )
-
- BYTE_BUDDY_VERSION = "1.9.10"
-
- maven_jar(
- name = "byte-buddy",
- artifact = "net.bytebuddy:byte-buddy:" + BYTE_BUDDY_VERSION,
- sha1 = "211a2b4d3df1eeef2a6cacf78d74a1f725e7a840",
- )
-
- maven_jar(
- name = "byte-buddy-agent",
- artifact = "net.bytebuddy:byte-buddy-agent:" + BYTE_BUDDY_VERSION,
- sha1 = "9674aba5ee793e54b864952b001166848da0f26b",
- )
-
- maven_jar(
- name = "objenesis",
- artifact = "org.objenesis:objenesis:2.6",
- sha1 = "639033469776fd37c08358c6b92a4761feb2af4b",
- )
-
- maven_jar(
name = "jgroups",
artifact = "org.jgroups:jgroups:3.6.15.Final",
sha1 = "755afcfc6c8a8ea1e15ef0073417c0b6e8c6d6e4",