Merge pull request #11076 from playframework/mergify/bp/2.8.x/pr-11050

Bump versions (backport #11050)

.travis.yml

@@ -12,9 +12,9 @@ env:
     - secure: "NS2hMbBcmi6EF4QxtcNs4A2ZuNmIdLYQRJUWWejgnD4YtcsmoVjxrHRedqrnDdui4DyvaxWhg/3Uds23jEKTSbbh3ZphLO77BVgM2nUGUvVoa4i6qGF2eZFlIhq2G1gM700GPV7X4KmyjYi2HtH8CWBTkqP3g0An63mCZw/Gnlk="
     # These are the versions used for (scripted) tests. The versions Play is build with however are defined in interplay.
     - SCRIPTED_SBT_1_3: "1.3.13"
-    - SCRIPTED_SBT_1_5: "1.5.5"
-    - TEST_SCALA_2_12: "2.12.14"
-    - TEST_SCALA_2_13: "2.13.6"
+    - SCRIPTED_SBT_1_5: "1.5.8"
+    - TEST_SCALA_2_12: "2.12.15"
+    - TEST_SCALA_2_13: "2.13.7"
   jobs:
     - TRAVIS_JDK=8
 

core/play-logback/src/main/scala/play/api/libs/logback/LogbackLoggerConfigurator.scala

@@ -58,7 +58,6 @@ class LogbackLoggerConfigurator extends LoggerConfigurator {
         case _         => Stream.empty
       }
       (testConfigs ++ Stream(
-        GROOVY_AUTOCONFIG_FILE,
         AUTOCONFIG_FILE,
         if (env.mode == Mode.Dev) "logback-play-dev.xml" else "logback-play-default.xml"
       )).flatMap(env.resource).headOption

dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/http-backend-netty-channel-options/conf/application.conf

@@ -9,8 +9,8 @@ play.server {
         SO_KEEPALIVE = true
         TCP_NODELAY = true
         TCP_FASTOPEN_CONNECT = true
+        "io.netty.channel.ChannelOption#TCP_FASTOPEN" = 3
         "io.netty.channel.unix.UnixChannelOption#SO_REUSEPORT" = false
-        "io.netty.channel.epoll.EpollChannelOption#TCP_FASTOPEN" = 3
         bar = "xyz"
       }
     }

dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/http-backend-netty-channel-options/expected-application-log.txt

@@ -11,5 +11,5 @@
 [DEBUG] play.core.server.NettyServer - Setting Netty channel option SO_KEEPALIVE to true
 [WARN] play.core.server.NettyServer - Ignoring unknown Netty channel option: bar
 [WARN] play.core.server.NettyServer - Valid values can be found at http://netty.io/4.1/api/io/netty/channel/ChannelOption.html
-[DEBUG] play.core.server.NettyServer - Setting Netty channel option io.netty.channel.epoll.EpollChannelOption#TCP_FASTOPEN to 3
+[DEBUG] play.core.server.NettyServer - Setting Netty channel option io.netty.channel.ChannelOption#TCP_FASTOPEN to 3
 [DEBUG] play.core.server.NettyServer - Setting Netty channel option io.netty.channel.unix.UnixChannelOption#SO_REUSEPORT to false

documentation/build.sbt

@@ -77,8 +77,8 @@ lazy val main = Project("Play-Documentation", file("."))
     unmanagedResourceDirectories in Test ++= (baseDirectory.value / "manual" / "detailedTopics" ** "code").get,
     // Don't include sbt files in the resources
     excludeFilter in (Test, unmanagedResources) := (excludeFilter in (Test, unmanagedResources)).value || "*.sbt",
-    crossScalaVersions := Seq("2.13.6", "2.12.14"),
-    scalaVersion := "2.13.6",
+    crossScalaVersions := Seq("2.13.7", "2.12.15"),
+    scalaVersion := "2.13.7",
     fork in Test := true,
     javaOptions in Test ++= Seq("-Xmx512m", "-Xms128m"),
     headerLicense := Some(HeaderLicense.Custom("Copyright (C) Lightbend Inc. <https://www.lightbend.com>")),

documentation/manual/hacking/BuildingFromSource.md

@@ -38,7 +38,7 @@ This will build and publish Play for the default Scala version. If you want to p
 Or to publish for a specific Scala version:
 
 ```bash
-> ++ 2.13.6 publishLocal
+> ++ 2.13.7 publishLocal
 ```
 
 ## Build the documentation

documentation/manual/hacking/Translations.md

@@ -39,7 +39,7 @@ translation-project
 `build.properties` should contain the sbt version, ie:
 
 ```
-sbt.version=0.13.16
+sbt.version=0.13.18
 ```
 
 `plugins.sbt` should include the Play docs sbt plugin, ie:

documentation/manual/releases/release26/Highlights26.md

@@ -12,7 +12,7 @@ You can select which version of Scala you would like to use by setting the `scal
 For Scala 2.12:
 
 ```scala
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 ```
 
 For Scala 2.11:
@@ -30,7 +30,7 @@ lazy val root = (project in file("."))
   .enablePlugins(PlayService)
   .enablePlugins(RoutesCompiler) // place routes in src/main/resources, or remove if using SIRD/RoutingDsl
   .settings(
-    scalaVersion := "2.12.14",
+    scalaVersion := "2.12.15",
     libraryDependencies ++= Seq(
       guice, // remove if not using Play's Guice loader
       akkaHttpServer, // or use nettyServer for Netty

documentation/manual/releases/release27/Highlights27.md

@@ -12,7 +12,7 @@ You can select which version of Scala you would like to use by setting the `scal
 For Scala 2.12:
 
 ```scala
-scalaVersion := "2.12.14"
+scalaVersion := "2.12.15"
 ```
 
 For Scala 2.11:
@@ -24,7 +24,7 @@ scalaVersion := "2.11.12"
 For Scala 2.13:
 
 ```scala
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.7"
 ```
 
 ## Lifecycle managed by Akka's Coordinated Shutdown

documentation/manual/releases/release28/migration28/Migration28.md

@@ -47,14 +47,14 @@ Play 2.8 support Scala 2.12 and 2.13, but not 2.11, which has reached its end of
 To set the Scala version in sbt, simply set the `scalaVersion` key, for example:
 
 ```scala
-scalaVersion := "2.13.6"
+scalaVersion := "2.13.7"
 ```
 
 If you have a single project build, then this setting can just be placed on its own line in `build.sbt`.  However, if you have a multi-project build, then the scala version setting must be set on each project.  Typically, in a multi-project build, you will have some common settings shared by every project, this is the best place to put the setting, for example:
 
 ```scala
 def commonSettings = Seq(
-  scalaVersion := "2.13.6"
+  scalaVersion := "2.13.7"
 )
 
 val projectA = (project in file("projectA"))

documentation/manual/working/commonGuide/build/code/dependencies.sbt

@@ -13,7 +13,7 @@ libraryDependencies += "org.apache.derby" % "derby" % "10.13.1.1" % "test"
 //#multi-deps
 libraryDependencies ++= Seq(
   "org.apache.derby" % "derby"          % "10.13.1.1",
-  "org.hibernate"    % "hibernate-core" % "5.4.30.Final"
+  "org.hibernate"    % "hibernate-core" % "5.4.32.Final"
 )
 //#multi-deps
 

documentation/manual/working/commonGuide/build/sbtDependencies.md

@@ -37,7 +37,7 @@ If you use `groupID %% artifactID % revision` rather than `groupID % artifactID
 
 @[explicit-scala-version-dep](code/dependencies.sbt)
 
-Assuming the `scalaVersion` for your build is `2.13.6`, the following is identical (note the double `%%` after `"org.scala-tools"`):
+Assuming the `scalaVersion` for your build is `2.13.7`, the following is identical (note the double `%%` after `"org.scala-tools"`):
 
 @[auto-scala-version-dep](code/dependencies.sbt)
 

documentation/manual/working/javaGuide/main/sql/code/jpa.sbt

@@ -5,7 +5,7 @@
 //#jpa-sbt-dependencies
 libraryDependencies ++= Seq(
   javaJpa,
-  "org.hibernate" % "hibernate-core" % "5.4.30.Final" // replace by your jpa implementation
+  "org.hibernate" % "hibernate-core" % "5.4.32.Final" // replace by your jpa implementation
 )
 //#jpa-sbt-dependencies
 

project/Dependencies.scala

@@ -7,14 +7,14 @@ import Keys._
 import buildinfo.BuildInfo
 
 object Dependencies {
-  val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.17")
+  val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.18")
   val akkaHttpVersion     = sys.props.getOrElse("akka.http.version", "10.1.15")
 
   val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.4.2"
 
   val playJsonVersion = "2.8.2"
 
-  val logback = "ch.qos.logback" % "logback-classic" % "1.2.3"
+  val logback = "ch.qos.logback" % "logback-classic" % "1.2.10"
 
   val specs2Version = "4.8.3"
   val specs2Deps = Seq(
@@ -49,7 +49,7 @@ object Dependencies {
 
   val playJson = "com.typesafe.play" %% "play-json" % playJsonVersion
 
-  val slf4jVersion = "1.7.30"
+  val slf4jVersion = "1.7.32"
   val slf4j        = Seq("slf4j-api", "jul-to-slf4j", "jcl-over-slf4j").map("org.slf4j" % _ % slf4jVersion)
   val slf4jSimple  = "org.slf4j" % "slf4j-simple" % slf4jVersion
 
@@ -82,7 +82,7 @@ object Dependencies {
 
   val jpaDeps = Seq(
     "org.hibernate.javax.persistence" % "hibernate-jpa-2.1-api" % "1.0.2.Final",
-    "org.hibernate"                   % "hibernate-core"        % "5.4.30.Final" % "test"
+    "org.hibernate"                   % "hibernate-core"        % "5.4.32.Final" % "test"
   )
 
   def scalaReflect(scalaVersion: String) = "org.scala-lang" % "scala-reflect" % scalaVersion % "provided"
@@ -96,7 +96,7 @@ object Dependencies {
     case _                               => Nil
   }
 
-  val springFrameworkVersion = "5.2.13.RELEASE"
+  val springFrameworkVersion = "5.2.19.RELEASE"
 
   def javaDeps(scalaVersion: String) =
     Seq(
@@ -106,8 +106,8 @@ object Dependencies {
     ) ++ specs2Deps.map(_ % Test)
 
   val joda = Seq(
-    "joda-time" % "joda-time"    % "2.10.10",
-    "org.joda"  % "joda-convert" % "2.2.1"
+    "joda-time" % "joda-time"    % "2.10.13",
+    "org.joda"  % "joda-convert" % "2.2.2"
   )
 
   val javaFormsDeps = Seq(
@@ -162,7 +162,7 @@ object Dependencies {
         sslConfig
       ) ++ scalaParserCombinators(scalaVersion) ++ specs2Deps.map(_ % Test) ++ javaTestDeps
 
-  val nettyVersion = "4.1.63.Final"
+  val nettyVersion = "4.1.72.Final"
 
   val netty = Seq(
     "com.typesafe.netty" % "netty-reactive-streams-http" % "2.0.5",
@@ -276,7 +276,7 @@ object Dependencies {
     "javax.cache" % "cache-api" % "1.1.1"
   )
 
-  val ehcacheVersion = "2.10.6"
+  val ehcacheVersion = "2.10.9.2"
   val playEhcacheDeps = Seq(
     "net.sf.ehcache" % "ehcache" % ehcacheVersion,
     "org.ehcache"    % "jcache"  % "1.0.1"
@@ -319,8 +319,8 @@ object Dependencies {
  * How to use this:
  *    $ sbt -J-XX:+UnlockCommercialFeatures -J-XX:+FlightRecorder -Dakka-http.sources=$HOME/code/akka-http '; project Play-Akka-Http-Server; test:run'
  *
- * Make sure Akka-HTTP has 2.12 as the FIRST version (or that scalaVersion := "2.12.14", otherwise it won't find the artifact
- *    crossScalaVersions := Seq("2.12.14", "2.11.12"),
+ * Make sure Akka-HTTP has 2.12 as the FIRST version (or that scalaVersion := "2.12.15", otherwise it won't find the artifact
+ *    crossScalaVersions := Seq("2.12.15", "2.11.12"),
  */
 object AkkaDependency {
   // Needs to be a URI like git://github.com/akka/akka.git#master or file:///xyz/akka