Update dependencies before Release Candidate 4 (playframework#8838)

marcospereira · web-flow · commit af3f5ce070ab · 2018-11-28T21:00:25.000-05:00
* Update dependencies before Release Candidate 4

* Update play json

* Remove deprecated API usage

* Twirl 1.4.0-RC3

* Twirl 1.4.0-RC4
diff --git a/framework/project/Dependencies.scala b/framework/project/Dependencies.scala
@@ -14,11 +14,11 @@ object Dependencies {
 
   val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.3.7"
 
-  val playJsonVersion = "2.7.0-RC1"
+  val playJsonVersion = "2.7.0-RC2"
 
   val logback = "ch.qos.logback" % "logback-classic" % "1.2.3"
 
-  val specs2Version = "4.2.0"
+  val specs2Version = "4.3.5"
   val specs2Deps = Seq(
     "specs2-core",
     "specs2-junit",
@@ -55,7 +55,7 @@ object Dependencies {
 
   val guava = "com.google.guava" % "guava" % "27.0-jre"
   val findBugs = "com.google.code.findbugs" % "jsr305" % "3.0.2" // Needed by guava
-  val mockitoAll = "org.mockito" % "mockito-core" % "2.23.0"
+  val mockitoAll = "org.mockito" % "mockito-core" % "2.23.4"
 
   val h2database = "com.h2database" % "h2" % "1.4.197"
   val derbyDatabase = "org.apache.derby" % "derby" % "10.13.1.1"
@@ -85,13 +85,13 @@ object Dependencies {
     "org.hibernate" % "hibernate-core" % "5.3.7.Final" % "test"
   )
 
-  val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.8.0"
+  val scalaJava8Compat = "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.0"
   def scalaParserCombinators(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
-    case Some((2, major)) if major >= 11 => Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.0")
+    case Some((2, major)) if major >= 11 => Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.1")
     case _ => Nil
   }
 
-  val springFrameworkVersion = "5.1.2.RELEASE"
+  val springFrameworkVersion = "5.1.3.RELEASE"
 
   val javaDeps = Seq(
     scalaJava8Compat,
@@ -175,7 +175,7 @@ object Dependencies {
 
   val jimfs = "com.google.jimfs" % "jimfs" % "1.1"
 
-  val okHttp = "com.squareup.okhttp3" % "okhttp" % "3.11.0"
+  val okHttp = "com.squareup.okhttp3" % "okhttp" % "3.12.0"
 
   def routesCompilerDependencies(scalaVersion: String) = {
     val deps = CrossVersion.partialVersion(scalaVersion) match {
@@ -243,18 +243,18 @@ object Dependencies {
     logback % Test
   )
 
-  val fluentleniumVersion = "3.7.0"
+  val fluentleniumVersion = "3.7.1"
   // This is the selenium version compatible with the FluentLenium version declared above.
   // See http://mvnrepository.com/artifact/org.fluentlenium/fluentlenium-core/3.5.2
-  val seleniumVersion = "3.14.0"
+  val seleniumVersion = "3.141.59"
 
   val testDependencies = Seq(junit, junitInterface, guava, findBugs, logback) ++ Seq(
     "org.fluentlenium" % "fluentlenium-core" % fluentleniumVersion exclude("org.jboss.netty", "netty"),
     // htmlunit-driver uses an open range to selenium dependencies. This is slightly
     // slowing down the build. So the open range deps were removed and we can re-add
     // them using a specific version. Using an open range is also not good for the
     // local cache.
-    "org.seleniumhq.selenium" % "htmlunit-driver" % "2.33.0" excludeAll(
+    "org.seleniumhq.selenium" % "htmlunit-driver" % "2.33.3" excludeAll(
       ExclusionRule("org.seleniumhq.selenium", "selenium-api"),
       ExclusionRule("org.seleniumhq.selenium", "selenium-support")
     ),
@@ -281,7 +281,7 @@ object Dependencies {
     "com.github.ben-manes.caffeine" % "jcache" % caffeineVersion
   ) ++ jcacheApi
 
-  val playWsStandaloneVersion = "2.0.0-RC1"
+  val playWsStandaloneVersion = "2.0.0-RC2"
   val playWsDeps = Seq(
     "com.typesafe.play" %% "play-ws-standalone" % playWsStandaloneVersion,
     "com.typesafe.play" %% "play-ws-standalone-xml" % playWsStandaloneVersion,
diff --git a/framework/project/plugins.sbt b/framework/project/plugins.sbt
@@ -13,7 +13,7 @@ val Versions = new {
   val sbtDoge = "0.1.5"
   val webjarsLocatorCore = "0.36"
   val sbtHeader = "5.0.0"
-  val sbtTwirl: String = sys.props.getOrElse("twirl.version", "1.4.0-RC1")
+  val sbtTwirl: String = sys.props.getOrElse("twirl.version", "1.4.0-RC4")
   val interplay: String = sys.props.getOrElse("interplay.version", "2.0.4")
 }
 
diff --git a/framework/src/play-test/src/main/java/play/test/TestBrowser.java b/framework/src/play-test/src/main/java/play/test/TestBrowser.java
@@ -8,6 +8,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.support.ui.FluentWait;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
@@ -84,7 +85,7 @@ public <T>T waitUntil(FluentWait<WebDriver> wait, Function<WebDriver, T> f) {
      * @return the return value.
      */
     public <T>T waitUntil(Function<WebDriver, T> f) {
-        FluentWait<WebDriver> wait = fluentWait().withTimeout(3000, TimeUnit.MILLISECONDS);
+        FluentWait<WebDriver> wait = fluentWait().withTimeout(Duration.ofMillis(3000));
         return waitUntil(wait,f);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ val Versions = new {`
`13`	`13`	`val sbtDoge = "0.1.5"`
`14`	`14`	`val webjarsLocatorCore = "0.36"`
`15`	`15`	`val sbtHeader = "5.0.0"`
`16`		`- val sbtTwirl: String = sys.props.getOrElse("twirl.version", "1.4.0-RC1")`
	`16`	`+ val sbtTwirl: String = sys.props.getOrElse("twirl.version", "1.4.0-RC4")`
`17`	`17`	`val interplay: String = sys.props.getOrElse("interplay.version", "2.0.4")`
`18`	`18`	`}`
`19`	`19`