Skip to content

Commit

Permalink
loudwatch: attempt mockito fix for Netflix-Skunkworks#462
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
manolama committed Jun 9, 2023
1 parent 7e7d45a commit caff814
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
1 change: 0 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
))
Expand Down
3 changes: 1 addition & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit caff814

Please sign in to comment.