Remove Play dependencies on UT

project/TestCommon.scala

@@ -1,17 +1,19 @@
 import play.sbt.PlayImport
 import play.sbt.PlayImport.javaWs
-import sbt.Keys.{javaOptions, _}
+import sbt.Keys._
 import sbt._
 
 object TestCommon {
 
   lazy val PlayTest: sbt.Configuration = config("pt") extend Test
 
-  lazy val defaultSettings: Def.SettingsDefinition = itBaseTestSettings ++ ptBaseTestSettings ++ configCommonTestSettings("test,it,pt")
+  lazy val defaultSettings: Def.SettingsDefinition = itBaseTestSettings ++ ptBaseTestSettings ++ configCommonTestSettings("test,it,pt") ++ configPlayDependencies("it,pt")
+
+  lazy val settingsWithoutPlayTest: Def.SettingsDefinition = itBaseTestSettings ++ configCommonTestSettings("test,it") ++ configPlayDependencies("it")
 
   private val itBaseTestSettings = Defaults.itSettings ++ configTestDirs(IntegrationTest, "it")
 
-  private val ptBaseTestSettings = inConfig(PlayTest)(Defaults.testSettings) ++ configTestDirs(PlayTest, "pt") ++ configJavaWsDependency("pt")
+  private val ptBaseTestSettings = inConfig(PlayTest)(Defaults.testSettings) ++ configTestDirs(PlayTest, "pt")
 
   def configTestDirs(config: Configuration, folderName: String) = Seq(
     javaSource in config := baseDirectory.value / folderName,
@@ -21,24 +23,26 @@ object TestCommon {
 
   def configCommonTestSettings(scopes: String) = Seq(
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-v"),
-    javaOptions in PlayTest += "-Dlogger.resource=logback-test.xml",
-    testOptions in IntegrationTest += Tests.Setup(() =>
+    // Tests that start Play apps do not take into account logback-test.xml, it can only be overridden by java options
+    javaOptions in Test += "-Dlogger.resource=logback-test.xml",
+    // Tests that do not fork the JVM ignore java options, it can only be overridden by system properties
+    testOptions in Test += Tests.Setup(() =>
       if (sys.props.get("logger.resource").isEmpty)
         sys.props.put("logger.resource", "logback-test.xml")
     ),
     libraryDependencies ++= Seq (
       "org.assertj" % "assertj-core" % "3.6.2" % scopes,
-      "org.mockito" % "mockito-core" % "2.7.9" % scopes,
-      PlayImport.component("play-test") % scopes
+      "org.mockito" % "mockito-core" % "2.7.9" % scopes
     ),
     dependencyOverrides ++= Set (
       "junit" % "junit" % "4.12" % scopes
     )
   )
 
-  def configJavaWsDependency(scopes: String) = Seq(
+  def configPlayDependencies(scopes: String) = Seq(
     libraryDependencies ++= Seq (
-      javaWs % scopes
+      javaWs % scopes,
+      PlayImport.component("play-test") % scopes
     )
   )
 }

project/plugins.sbt

@@ -5,7 +5,7 @@ logLevel := Level.Warn
 resolvers += "Typesafe repository" at "http://repo.typesafe.com/typesafe/releases/"
 
 // Play framework integration
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.13")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.5.14")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-less" % "1.1.0")