From 8b06168db6a2762f3f8a8fab7556212bb879386f Mon Sep 17 00:00:00 2001 From: Mikhail Limansky Date: Fri, 17 Jan 2020 13:01:28 +0300 Subject: [PATCH] Remove ScalaTestJUnit from provided dependencies. --- .../28473-upgrade-ScalaTest-to-3-1-0.excludes | 0 project/Dependencies.scala | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) rename akka-actor-testkit-typed/src/main/mima-filters/{2.6.2.backwards.excludes => 2.6.1.backwards.excludes}/28473-upgrade-ScalaTest-to-3-1-0.excludes (100%) diff --git a/akka-actor-testkit-typed/src/main/mima-filters/2.6.2.backwards.excludes/28473-upgrade-ScalaTest-to-3-1-0.excludes b/akka-actor-testkit-typed/src/main/mima-filters/2.6.1.backwards.excludes/28473-upgrade-ScalaTest-to-3-1-0.excludes similarity index 100% rename from akka-actor-testkit-typed/src/main/mima-filters/2.6.2.backwards.excludes/28473-upgrade-ScalaTest-to-3-1-0.excludes rename to akka-actor-testkit-typed/src/main/mima-filters/2.6.1.backwards.excludes/28473-upgrade-ScalaTest-to-3-1-0.excludes diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4fd6366cfa..5bdea33a16 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -157,7 +157,6 @@ object Dependencies { val junit = Compile.junit % "optional;provided;test" val scalatest = Def.setting { "org.scalatest" %% "scalatest" % scalaTestVersion.value % "optional;provided;test" } // ApacheV2 - val scalatestJUnit = Def.setting { "org.scalatestplus" %% "junit-4-12" % scalaTestPlusVersion.value % "optional;provided;test" } // ApacheV2 val logback = Compile.logback % "optional;provided;test" // EPL 1.0 @@ -192,7 +191,7 @@ object Dependencies { Provided.activation // dockerClient needs javax.activation.DataSource in JDK 11+ ) - val actorTestkitTyped = l ++= Seq(Provided.logback, Provided.junit, Provided.scalatest.value, Provided.scalatestJUnit.value) + val actorTestkitTyped = l ++= Seq(Provided.logback, Provided.junit, Provided.scalatest.value, Test.scalatestJUnit.value) val remoteDependencies = Seq(netty, aeronDriver, aeronClient) val remoteOptionalDependencies = remoteDependencies.map(_ % "optional")