Upgrade Play Framework projects to Play 2.8 (#5486)

frameworks/Java/play2-java/play2-java-ebean-hikaricp-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java-ebean-hikaricp .
 

frameworks/Java/play2-java/play2-java-ebean-hikaricp.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java-ebean-hikaricp .
 

frameworks/Java/play2-java/play2-java-ebean-hikaricp/app/models/World.java

@@ -6,6 +6,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Id;
 
+import io.ebean.DB;
 import io.ebean.Finder;
 import io.ebean.Model;
 import io.ebean.Transaction;
@@ -29,12 +30,12 @@ public class World extends Model {
         final int batchSize = 25;
         final int batches = ((worlds.size() / batchSize) + 1);
         for ( int i = 0 ; i < batches ; ++i ) {
-            final Transaction transaction = World.db().beginTransaction();
+            final Transaction transaction = DB.getDefault().beginTransaction();
             try {
                 transaction.setBatchMode(true);
                 transaction.setBatchSize(batchSize);
                 for(int j = i * batchSize ; j < Math.min((i + 1) * batchSize, worlds.size()); ++j) {
-                    World.db().update(worlds.get(j), transaction);
+                    DB.getDefault().update(worlds.get(j), transaction);
                 }
                 transaction.commit();
             } finally {

frameworks/Java/play2-java/play2-java-ebean-hikaricp/build.sbt

@@ -4,10 +4,10 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayMinimalJava, PlayEbean, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 libraryDependencies ++= Seq(
   guice,
   javaJdbc,
-  "mysql" % "mysql-connector-java" % "8.0.18"
+  "mysql" % "mysql-connector-java" % "8.0.19"
 )

frameworks/Java/play2-java/play2-java-ebean-hikaricp/conf/application.conf

@@ -13,11 +13,6 @@ play.i18n.langs = [ "en" ]
 # Disable default filters
 play.filters.enabled = [ ]
 
-# Disable thread local, it's not used by this application
-# ~~~~~
-play.allowHttpContext = false
-play.jpa.allowJPAEntityManagerContext = false
-
 play.modules {
   enabled += "startup.StartupModule"
 }

frameworks/Java/play2-java/play2-java-ebean-hikaricp/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Java/play2-java/play2-java-ebean-hikaricp/project/plugins.sbt

@@ -1,3 +1,3 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")
 
-addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "5.0.1")
+addSbtPlugin("com.typesafe.sbt" % "sbt-play-ebean" % "6.0.0")

frameworks/Java/play2-java/play2-java-jooq-hikaricp-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java-jooq-hikaricp .
 

frameworks/Java/play2-java/play2-java-jooq-hikaricp.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java-jooq-hikaricp .
 

frameworks/Java/play2-java/play2-java-jooq-hikaricp/build.sbt

@@ -4,13 +4,13 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayMinimalJava, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 val jOOQVersion = "3.10.3"
 
 libraryDependencies ++= Seq(
   guice,
   javaJdbc,
-  "mysql" % "mysql-connector-java" % "8.0.18",
+  "mysql" % "mysql-connector-java" % "8.0.19",
   "org.jooq" % "jooq" % jOOQVersion,
 )

frameworks/Java/play2-java/play2-java-jooq-hikaricp/conf/application.conf

@@ -13,11 +13,6 @@ play.i18n.langs = [ "en" ]
 # Disable default filters
 play.filters.enabled = [ ]
 
-# Disable thread local, it's not used by this application
-# ~~~~~
-play.allowHttpContext = false
-play.jpa.allowJPAEntityManagerContext = false
-
 play.modules {
   enabled += "startup.StartupModule"
 }

frameworks/Java/play2-java/play2-java-jooq-hikaricp/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Java/play2-java/play2-java-jooq-hikaricp/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")

frameworks/Java/play2-java/play2-java-jpa-hikaricp-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java-jpa-hikaricp .
 

frameworks/Java/play2-java/play2-java-jpa-hikaricp.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java-jpa-hikaricp .
 

frameworks/Java/play2-java/play2-java-jpa-hikaricp/build.sbt

@@ -4,13 +4,13 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayMinimalJava, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 libraryDependencies ++= Seq(
   guice,
   javaJpa,
-  "mysql" % "mysql-connector-java" % "8.0.18",
-  "org.hibernate" % "hibernate-core" % "5.4.1.Final"
+  "mysql" % "mysql-connector-java" % "8.0.19",
+  "org.hibernate" % "hibernate-core" % "5.4.12.Final"
 )
 
 PlayKeys.externalizeResourcesExcludes += baseDirectory.value / "conf" / "META-INF" / "persistence.xml"

frameworks/Java/play2-java/play2-java-jpa-hikaricp/conf/application.conf

@@ -13,11 +13,6 @@ play.i18n.langs = [ "en" ]
 # Disable default filters
 play.filters.enabled = [ ]
 
-# Disable thread local, it's not used by this application
-# ~~~~~
-play.allowHttpContext = false
-play.jpa.allowJPAEntityManagerContext = false
-
 play.modules {
   enabled += "startup.StartupModule"
 }

frameworks/Java/play2-java/play2-java-jpa-hikaricp/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Java/play2-java/play2-java-jpa-hikaricp/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")

frameworks/Java/play2-java/play2-java-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java .
 

frameworks/Java/play2-java/play2-java.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-java .
 

frameworks/Java/play2-java/play2-java/build.sbt

@@ -4,6 +4,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayMinimalJava, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 libraryDependencies += guice

frameworks/Java/play2-java/play2-java/conf/application.conf

@@ -13,11 +13,6 @@ play.i18n.langs = [ "en" ]
 # Disable default filters
 play.filters.enabled = [ ]
 
-# Disable thread local, it's not used by this application
-# ~~~~~
-play.allowHttpContext = false
-play.jpa.allowJPAEntityManagerContext = false
-
 play.modules {
   enabled += "startup.StartupModule"
 }

frameworks/Java/play2-java/play2-java/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Java/play2-java/play2-java/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")

frameworks/Scala/play2-scala/play2-scala-anorm-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala-anorm .
 

frameworks/Scala/play2-scala/play2-scala-anorm.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala-anorm .
 

frameworks/Scala/play2-scala/play2-scala-anorm/app/controllers/Application.scala

@@ -59,7 +59,7 @@ class Application @Inject() (fortunesDAO: FortunesDAO, worldDAO: WorldDAO, dbOpe
 
   def fortunes() = Action.async {
     getFortunes.map { dbFortunes =>
-      val appendedFortunes =  Fortune(0, "Additional fortune added at request time.") :: dbFortunes.to[List]
+      val appendedFortunes = List(Fortune(0, "Additional fortune added at request time.")) ++ dbFortunes
       Ok(views.html.fortune(appendedFortunes))
     }
   }

frameworks/Scala/play2-scala/play2-scala-anorm/app/models/World.scala

@@ -29,7 +29,7 @@ class WorldDAO @Inject()(protected val db: Database) {
     SQL"SELECT * FROM World WHERE id = $id".as(simpleRowParser.single)
   }
 
-  def updateRandom(world: World)(implicit connection: Connection) {
+  def updateRandom(world: World)(implicit connection: Connection): Unit = {
     SQL"UPDATE World SET randomNumber = ${world.randomNumber} WHERE id = ${world.id}".executeUpdate()
   }
 }

frameworks/Scala/play2-scala/play2-scala-anorm/build.sbt

@@ -4,11 +4,11 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 libraryDependencies ++= Seq(
   guice,
   jdbc,
-  "com.typesafe.play" %% "anorm" % "2.5.3",
-  "mysql" % "mysql-connector-java" % "8.0.18"
+  "org.playframework.anorm" %% "anorm" % "2.6.5",
+  "mysql" % "mysql-connector-java" % "8.0.19"
 )

frameworks/Scala/play2-scala/play2-scala-anorm/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Scala/play2-scala/play2-scala-anorm/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")

frameworks/Scala/play2-scala/play2-scala-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala .
 

frameworks/Scala/play2-scala/play2-scala-reactivemongo-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala-reactivemongo .
 

frameworks/Scala/play2-scala/play2-scala-reactivemongo.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala-reactivemongo .
 

frameworks/Scala/play2-scala/play2-scala-reactivemongo/build.sbt

@@ -4,11 +4,11 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 libraryDependencies ++= Seq(
-  "org.reactivemongo" %% "play2-reactivemongo" % "0.16.6-play27",
-  "org.reactivemongo" %% "reactivemongo-play-json" % "0.16.6-play27",
-  "com.softwaremill.macwire" %% "macros" % "2.3.0",
-  "com.softwaremill.macwire" %% "util" % "2.3.0"
+  "org.reactivemongo" %% "play2-reactivemongo" % "0.20.3-play28",
+  "org.reactivemongo" %% "reactivemongo-play-json" % "0.20.3-play28",
+  "com.softwaremill.macwire" %% "macros" % "2.3.3",
+  "com.softwaremill.macwire" %% "util" % "2.3.3"
 )

frameworks/Scala/play2-scala/play2-scala-reactivemongo/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Scala/play2-scala/play2-scala-reactivemongo/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")

frameworks/Scala/play2-scala/play2-scala-slick-netty.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala-slick .
 

frameworks/Scala/play2-scala/play2-scala-slick.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala-slick .
 

frameworks/Scala/play2-scala/play2-scala-slick/app/controllers/Application.scala

@@ -58,7 +58,7 @@ class Application @Inject() (fortunesDAO: FortunesDAO, worldDAO: WorldDAO, val c
 
   def fortunes() = Action.async {
     getFortunes.map { dbFortunes =>
-      val appendedFortunes =  Fortune(0, "Additional fortune added at request time.") :: dbFortunes.to[List]
+      val appendedFortunes = List(Fortune(0, "Additional fortune added at request time.")) ++ dbFortunes
       Ok(views.html.fortune(appendedFortunes))
     }
   }

frameworks/Scala/play2-scala/play2-scala-slick/build.sbt

@@ -4,11 +4,11 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 libraryDependencies ++= Seq(
   guice,
-  "com.typesafe.play" %% "play-slick" % "3.0.3",
-  "mysql" % "mysql-connector-java" % "8.0.18",
+  "com.typesafe.play" %% "play-slick" % "5.0.0",
+  "mysql" % "mysql-connector-java" % "8.0.19",
   filters
 )

frameworks/Scala/play2-scala/play2-scala-slick/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Scala/play2-scala/play2-scala-slick/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")

frameworks/Scala/play2-scala/play2-scala.dockerfile

@@ -1,4 +1,4 @@
-FROM hseeberger/scala-sbt:8u181_2.12.8_1.2.8
+FROM hseeberger/scala-sbt:8u242_1.3.8_2.13.1
 WORKDIR /play2
 COPY play2-scala .
 

frameworks/Scala/play2-scala/play2-scala/build.sbt

@@ -4,6 +4,6 @@ version := "1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala, PlayNettyServer).disablePlugins(PlayFilters)
 
-scalaVersion := "2.12.8"
+scalaVersion := "2.13.1"
 
 libraryDependencies += guice

frameworks/Scala/play2-scala/play2-scala/project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.8

frameworks/Scala/play2-scala/play2-scala/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.7.2")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.1")