This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-management.git
The following commit(s) were added to refs/heads/main by this push:
new abf29930 use mockito4 (#261)
abf29930 is described below
commit abf2993008517d79bb72319637c3ba00e7e39e3b
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Jun 18 11:28:43 2024 +0100
use mockito4 (#261)
---
.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 447b4ea1..d56343bc 100644
--- a/.scala-steward.conf
+++ b/.scala-steward.conf
@@ -7,6 +7,8 @@ updates.pin = [
{ groupId = "ch.qos.logback", version = "1.3." }
# Pin wiremock to v2.x because v3.x needs JDK11
{ groupId = "com.github.tomakehurst", artifactId = "2.", version="1.3." }
+ # Pin mockito to v4.x because v5.x needs JDK11
+ { groupId = "org.mockito", artifactId = "mockito-core", version = "4." }
# jetty 10.+ requires Java 11 (only used in tests - via wiremock)
{ groupId = "org.eclipse.jetty", version = "9." }
{ groupId = "org.eclipse.jetty.http2", version = "9." }
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 624cafea..2e2e9b21 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -155,7 +155,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]
