This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch 1.0.x
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/1.0.x by this push:
new d61c25db use mockito4 (#261) (#262)
d61c25db is described below
commit d61c25dbda75310998186b08e136cb4633f38674
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Jun 18 12:19:28 2024 +0100
use mockito4 (#261) (#262)
---
.scala-steward.conf | 2 ++
.../http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala | 2 +-
project/Dependencies.scala | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/.scala-steward.conf b/.scala-steward.conf
index b5f3bf25..2a3e5ba0 100644
--- a/.scala-steward.conf
+++ b/.scala-steward.conf
@@ -4,6 +4,8 @@ updates.pin = [
# To be updated in tandem with upstream Pekko
{groupId = "com.fasterxml.jackson.core", version = "2.11."}
{groupId = "org.scalatest", artifactId = "scalatest", version = "3.1."}
+ # Pin mockito to v4.x because v5.x needs JDK11
+ { groupId = "org.mockito", artifactId = "mockito-core", version = "4." }
]
updates.ignore = [
diff --git
a/management-cluster-http/src/test/scala/org/apache/pekko/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
b/management-cluster-http/src/test/scala/org/apache/pekko/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
index 9b733549..86b426bb 100644
---
a/management-cluster-http/src/test/scala/org/apache/pekko/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
+++
b/management-cluster-http/src/test/scala/org/apache/pekko/cluster/http/management/scaladsl/ClusterHttpManagementRoutesSpec.scala
@@ -33,7 +33,7 @@ import pekko.management.cluster._
import pekko.management.scaladsl.ManagementRouteProviderSettings
import pekko.stream.scaladsl.Sink
import pekko.util.{ ByteString, Timeout, Version }
-import org.mockito.Matchers._
+import org.mockito.ArgumentMatchers._
import org.mockito.Mockito._
import org.scalatest.concurrent.PatienceConfiguration.{ Timeout =>
ScalatestTimeout }
import org.scalatest.concurrent.{ Eventually, ScalaFutures }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 348029d2..f30e0f39 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -153,7 +153,7 @@ object Dependencies {
"org.apache.pekko" %% "pekko-http-core" % pekkoHttpVersion,
"org.apache.pekko" %% "pekko-http-spray-json" % pekkoHttpVersion,
"org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test,
- "org.mockito" % "mockito-all" % "1.10.19" % Test,
+ "org.mockito" % "mockito-core" % "4.11.0" % Test,
"org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % Test,
"org.apache.pekko" %% "pekko-distributed-data" % pekkoVersion % Test,
"org.scalatest" %% "scalatest" % scalaTestVersion % Test,
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
