From 9f0525244048202ba54930a71357f7f0e0089836 Mon Sep 17 00:00:00 2001 From: Chris Larsen Date: Fri, 9 Jun 2023 12:30:12 -0700 Subject: [PATCH] loudwatch: attempt mockito fix for #462 Mockito-scala docs excplicity ask to not declare a dependency on mockito-core, instead let mockito-scala bring it in. I was likely including a much older version than needed and could have caused load ordering issues. --- build.sbt | 1 - project/Dependencies.scala | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 9110988f..c9872b95 100644 --- a/build.sbt +++ b/build.sbt @@ -64,7 +64,6 @@ lazy val `atlas-cloudwatch` = project Dependencies.atlasWebApi % "test", Dependencies.akkaHttpTestkit % "test", Dependencies.akkaTestkit % "test", - Dependencies.mockitoCore % "test", Dependencies.mockitoScala % "test", Dependencies.munit % "test" )) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 502adcdb..44b4b298 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -71,8 +71,7 @@ object Dependencies { val log4jJcl = "org.apache.logging.log4j" % "log4j-jcl" % log4j val log4jJul = "org.apache.logging.log4j" % "log4j-jul" % log4j val log4jSlf4j = "org.apache.logging.log4j" % "log4j-slf4j-impl" % log4j - val mockitoCore = "org.mockito" % "mockito-core" % "3.12.4" - val mockitoScala = "org.mockito" % "mockito-scala_2.13" % "1.10.4" + val mockitoScala = "org.mockito" % "mockito-scala_2.13" % "1.17.4" val munit = "org.scalameta" %% "munit" % "0.7.29" val openHFT = "net.openhft" % "zero-allocation-hashing" % "0.16" val protobuf = "com.google.protobuf" % "protobuf-java" % "3.22.2"