[mockito] remove/normalize scalatestplus:mockito-3-3

Problem / Solution `3rdparty/jvm/org/scalatestplus:mockito-3-3` is an alias to `3rdparty/jvm/org/scalatestplus:mockito` (which itself a reference to `3rdparty/src/jvm/org/scalatestplus/mockito`). This confuses people since they are all the same. Continue to normalize the dependencies. JIRA Issues: DEAD-3 Differential Revision: https://phabricator.twitter.biz/D939691
twitter · Jul 22, 2022 · 0b11e3a · 0b11e3a
1 parent d486a7d
commit 0b11e3a
Show file tree

Hide file tree

Showing 12 changed files with 12 additions and 12 deletions.
diff --git a/util-app/src/test/scala/BUILD b/util-app/src/test/scala/BUILD
@@ -12,7 +12,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-app/src/main/scala",
         "util/util-app/src/test/resources",
         "util/util-core:util-core-util",

diff --git a/util-cache/src/test/scala/com/twitter/cache/BUILD b/util-cache/src/test/scala/com/twitter/cache/BUILD
@@ -18,7 +18,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-cache/src/main/scala/com/twitter/cache",
         "util/util-cache/src/main/scala/com/twitter/cache/caffeine",
         "util/util-core:util-core-util",

diff --git a/util-cache/src/test/scala/com/twitter/cache/caffeine/BUILD b/util-cache/src/test/scala/com/twitter/cache/caffeine/BUILD
@@ -14,7 +14,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-cache/src/main/scala/com/twitter/cache",
         "util/util-cache/src/main/scala/com/twitter/cache/caffeine",
         "util/util-cache/src/test/scala/com/twitter/cache:abstract_tests",

diff --git a/util-core/src/test/scala/com/twitter/concurrent/BUILD b/util-core/src/test/scala/com/twitter/concurrent/BUILD
@@ -13,7 +13,7 @@ junit_tests(
         "3rdparty/jvm/org/scalacheck",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "3rdparty/jvm/org/scalatestplus:scalacheck",
         "util/util-core:util-core-util",
         "util/util-core/src/main/scala/com/twitter/concurrent",

diff --git a/util-core/src/test/scala/com/twitter/io/BUILD b/util-core/src/test/scala/com/twitter/io/BUILD
@@ -13,7 +13,7 @@ junit_tests(
         "3rdparty/jvm/org/scalacheck",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "3rdparty/jvm/org/scalatestplus:scalacheck",
         "util/util-core:util-core-util",
         "util/util-core/src/main/scala/com/twitter/concurrent",

diff --git a/util-core/src/test/scala/com/twitter/util/BUILD b/util-core/src/test/scala/com/twitter/util/BUILD
@@ -13,7 +13,7 @@ junit_tests(
         "3rdparty/jvm/org/scalacheck",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "3rdparty/jvm/org/scalatestplus:scalacheck",
         "util/util-core:util-core-util",
         "util/util-core/src/main/scala/com/twitter/conversions",

diff --git a/util-jvm/src/test/scala/BUILD b/util-jvm/src/test/scala/BUILD
@@ -2,7 +2,7 @@ COMMON_DEPS = [
     "3rdparty/jvm/junit",
     "3rdparty/jvm/org/mockito:mockito-core",
     "3rdparty/jvm/org/scalatest",
-    "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+    "3rdparty/jvm/org/scalatestplus:mockito",
     "util/util-app/src/main/scala",
     "util/util-core:util-core-util",
     "util/util-jvm/src/main/scala/com/twitter/jvm",

diff --git a/util-lint/src/test/scala/com/twitter/util/lint/BUILD b/util-lint/src/test/scala/com/twitter/util/lint/BUILD
@@ -12,7 +12,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-lint/src/main/scala/com/twitter/util/lint",
     ],
 )
diff --git a/util-registry/src/test/scala/BUILD b/util-registry/src/test/scala/BUILD
@@ -12,7 +12,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-registry/src/main/scala/com/twitter/util/registry",
     ],
 )
diff --git a/util-routing/src/test/scala/com/twitter/util/routing/BUILD b/util-routing/src/test/scala/com/twitter/util/routing/BUILD
@@ -12,7 +12,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-routing/src/main/scala/com/twitter/util/routing",
         "util/util-routing/src/test/scala/com/twitter/util/routing/dynamic",
         "util/util-routing/src/test/scala/com/twitter/util/routing/simple",

diff --git a/util-zk/src/test/scala/com/twitter/zk/BUILD b/util-zk/src/test/scala/com/twitter/zk/BUILD
@@ -13,7 +13,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-core:util-core-util",
         "util/util-core/src/main/scala/com/twitter/conversions",
         "util/util-logging/src/main/scala/com/twitter/logging",

diff --git a/util-zk/src/test/scala/com/twitter/zk/coordination/BUILD b/util-zk/src/test/scala/com/twitter/zk/coordination/BUILD
@@ -13,7 +13,7 @@ junit_tests(
         "3rdparty/jvm/org/mockito:mockito-core",
         "3rdparty/jvm/org/scalatest",
         "3rdparty/jvm/org/scalatestplus:junit",
-        "3rdparty/jvm/org/scalatestplus:mockito-3-3",
+        "3rdparty/jvm/org/scalatestplus:mockito",
         "util/util-core:util-core-util",
         "util/util-core/src/main/scala/com/twitter/conversions",
         "util/util-zk/src/main/scala/com/twitter/zk",