Merge pull request #723 from ihostage/bump-play

Update `org.playframework.play` to `v3.1.0-4009e5a0-SNAPSHOT` (was `3.0.*`)
playframework · Jun 29, 2024 · 73948d2 · 73948d2
2 parents e75a20a + eacfb91
commit 73948d2
Show file tree

Hide file tree

Showing 85 changed files with 190 additions and 66 deletions.
diff --git a/java/chatroom/build.sbt b/java/chatroom/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/java/chatroom/gradle/libs.versions.toml b/java/chatroom/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
 junit = "4.13.2"
 webjars-play = "3.0.0"
 flot = "0.8.3-1"

diff --git a/java/chatroom/project/plugins.sbt b/java/chatroom/project/plugins.sbt
@@ -1,2 +1,3 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/compile-di/build.sbt b/java/compile-di/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 name := """play-java-compile-di-example"""
 
 version := "1.0-SNAPSHOT"

diff --git a/java/compile-di/project/plugins.sbt b/java/compile-di/project/plugins.sbt
@@ -1 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/dagger2/build.gradle.kts b/java/dagger2/build.gradle.kts
@@ -1,3 +1,4 @@
+import play.TemplateImports
 import play.gradle.plugin.PlayPlugin
 
 plugins {
@@ -22,6 +23,14 @@ dependencies {
     testImplementation("org.playframework:play-test_$scalaVersion")
 }
 
+sourceSets {
+    main {
+        twirl {
+            templateImports.set(TemplateImports.defaultJavaTemplateImports)
+        }
+    }
+}
+
 tasks.withType<ScalaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"))
 }

diff --git a/java/dagger2/build.sbt b/java/dagger2/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/java/dagger2/gradle/libs.versions.toml b/java/dagger2/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
 junit = "4.13.2"
 dagger = "2.51.1"
 

diff --git a/java/dagger2/project/plugins.sbt b/java/dagger2/project/plugins.sbt
@@ -1,2 +1,3 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/ebean/build.gradle.kts b/java/ebean/build.gradle.kts
@@ -1,3 +1,4 @@
+import play.TemplateImports
 import play.gradle.plugin.PlayPlugin
 
 plugins {
@@ -27,6 +28,14 @@ dependencies {
     testImplementation(libs.awaitility)
 }
 
+sourceSets {
+    main {
+        twirl {
+            templateImports.set(TemplateImports.defaultJavaTemplateImports)
+        }
+    }
+}
+
 tasks.withType<ScalaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"))
 }

diff --git a/java/ebean/build.sbt b/java/ebean/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava, PlayEbean)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/java/ebean/gradle/libs.versions.toml b/java/ebean/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
 play-ebean = "8.3.0"
 ebean = "15.1.0" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19
 h2 = "2.2.224"

diff --git a/java/ebean/project/plugins.sbt b/java/ebean/project/plugins.sbt
@@ -1,4 +1,5 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
 
 addSbtPlugin("org.playframework" % "sbt-play-ebean" % "8.3.0")
diff --git a/java/fileupload/build.gradle.kts b/java/fileupload/build.gradle.kts
@@ -1,3 +1,4 @@
+import play.TemplateImports
 import play.gradle.plugin.PlayPlugin
 
 plugins {
@@ -20,6 +21,14 @@ dependencies {
     testImplementation("org.playframework:play-test_$scalaVersion")
 }
 
+sourceSets {
+    main {
+        twirl {
+            templateImports.set(TemplateImports.defaultJavaTemplateImports)
+        }
+    }
+}
+
 tasks.withType<ScalaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"))
 }

diff --git a/java/fileupload/build.sbt b/java/fileupload/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/java/fileupload/project/plugins.sbt b/java/fileupload/project/plugins.sbt
@@ -1,2 +1,3 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/forms/build.gradle.kts b/java/forms/build.gradle.kts
@@ -1,3 +1,4 @@
+import play.TemplateImports
 import play.gradle.plugin.PlayPlugin
 
 plugins {
@@ -20,6 +21,14 @@ dependencies {
     testImplementation("org.playframework:play-test_$scalaVersion")
 }
 
+sourceSets {
+    main {
+        twirl {
+            templateImports.set(TemplateImports.defaultJavaTemplateImports)
+        }
+    }
+}
+
 tasks.withType<ScalaCompile>().configureEach {
     options.compilerArgs.addAll(listOf("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"))
 }

diff --git a/java/forms/build.sbt b/java/forms/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 name := """play-java-forms-example"""
 
 version := "1.0-SNAPSHOT"
@@ -18,4 +20,4 @@ javacOptions ++= Seq(
   "-Xlint:unchecked",
   "-Xlint:deprecation",
   "-Werror"
-) 
+)
diff --git a/java/forms/gradle/libs.versions.toml b/java/forms/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
 junit = "4.13.2"
 
 [libraries]

diff --git a/java/forms/project/plugins.sbt b/java/forms/project/plugins.sbt
@@ -1,2 +1,3 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/grpc/build.sbt b/java/grpc/build.sbt
@@ -4,6 +4,8 @@ import play.grpc.gen.javadsl.{PlayJavaClientCodeGenerator, PlayJavaServerCodeGen
 import com.typesafe.sbt.packager.docker.{Cmd, CmdLike, DockerAlias, ExecCmd}
 import play.java.grpc.sample.BuildInfo
 
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 name := "play-java-grpc-example"
 version := "1.0-SNAPSHOT"
 

diff --git a/java/grpc/project/plugins.sbt b/java/grpc/project/plugins.sbt
@@ -3,7 +3,8 @@ val playGrpcV = "0.12.1"
 buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.java.grpc.sample"
 
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
 
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 

diff --git a/java/hello-world/build.sbt b/java/hello-world/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 name := """play-java-hello-world-tutorial"""
 organization := "com.example"
 

diff --git a/java/hello-world/gradle/libs.versions.toml b/java/hello-world/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
 junit = "4.13.2"
 
 [libraries]

diff --git a/java/hello-world/project/plugins.sbt b/java/hello-world/project/plugins.sbt
@@ -1 +1,2 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/jpa/build.sbt b/java/jpa/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/java/jpa/gradle/libs.versions.toml b/java/jpa/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
+#play = "3.0.1-03969c1e-SNAPSHOT"
 play-ws = "3.0.0"
 node = "7.0.2"
 h2 = "2.2.224"

diff --git a/java/jpa/project/plugins.sbt b/java/jpa/project/plugins.sbt
@@ -1,5 +1,6 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
 
 // Web plugins
 addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.0.1")

diff --git a/java/jpa/test/UnitTest.java b/java/jpa/test/UnitTest.java
@@ -1,6 +1,8 @@
 import com.typesafe.config.Config;
 import com.typesafe.config.ConfigFactory;
 import controllers.PersonController;
+import jakarta.validation.Validation;
+import jakarta.validation.ValidatorFactory;
 import models.Person;
 import models.PersonRepository;
 import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
@@ -18,8 +20,6 @@
 import play.test.Helpers;
 import play.twirl.api.Content;
 
-import javax.validation.Validation;
-import javax.validation.ValidatorFactory;
 import java.util.concurrent.CompletionStage;
 import java.util.concurrent.ForkJoinPool;
 

diff --git a/java/pekko-cluster/build.sbt b/java/pekko-cluster/build.sbt
@@ -1,5 +1,7 @@
 import play.core.PlayVersion
 
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 name := """play-java-pekko-cluster-example"""
 organization := "com.example"
 

diff --git a/java/pekko-cluster/gradle/libs.versions.toml b/java/pekko-cluster/gradle/libs.versions.toml
@@ -1,8 +1,8 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
 junit = "4.13.2"
-pekko = "1.0.2"
+pekko = "1.0.3"
 
 [libraries]
 junit = { group = "junit", name = "junit", version.ref = "junit" }

diff --git a/java/pekko-cluster/project/plugins.sbt b/java/pekko-cluster/project/plugins.sbt
@@ -1,2 +1,3 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/rest-api/build.sbt b/java/rest-api/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val scala213 = "2.13.14"
 lazy val scala3 = "3.3.3"
 

diff --git a/java/rest-api/project/plugins.sbt b/java/rest-api/project/plugins.sbt
@@ -1,5 +1,6 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
 
 // Load testing tool:
 // https://gatling.io/docs/gatling/reference/current/extensions/sbt_plugin/

diff --git a/java/starter/build.sbt b/java/starter/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/java/starter/gradle/libs.versions.toml b/java/starter/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.7"
-play = "3.0.1-03969c1e-SNAPSHOT"
+play = "3.1.0-4009e5a0-SNAPSHOT"
 junit = "4.13.2"
 h2 = "2.2.224"
 assertj = "3.26.0"

diff --git a/java/starter/project/plugins.sbt b/java/starter/project/plugins.sbt
@@ -1,2 +1,3 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/streaming/build.sbt b/java/streaming/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 name := "play-java-streaming-example"
 
 version := "1.0-SNAPSHOT"

diff --git a/java/streaming/project/plugins.sbt b/java/streaming/project/plugins.sbt
@@ -1,2 +1,3 @@
 // Use the Play sbt plugin for Play projects
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
diff --git a/java/websocket/build.sbt b/java/websocket/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayJava)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/java/websocket/package-lock.json b/java/websocket/package-lock.json
diff --git a/java/websocket/project/plugins.sbt b/java/websocket/project/plugins.sbt
@@ -1,4 +1,5 @@
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")
 
 addSbtPlugin("com.github.sbt" % "sbt-less" % "2.0.1")
 

diff --git a/scala/anorm/build.sbt b/scala/anorm/build.sbt
@@ -1,3 +1,5 @@
+resolvers ++= Resolver.sonatypeOssRepos("snapshots")
+
 lazy val root = (project in file("."))
   .enablePlugins(PlayScala)
   //.enablePlugins(PlayNettyServer).disablePlugins(PlayPekkoHttpServer) // uncomment to use the Netty backend

diff --git a/scala/anorm/project/plugins.sbt b/scala/anorm/project/plugins.sbt
@@ -1,2 +1,2 @@
 // The Play plugin
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.0.3")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-4009e5a0-SNAPSHOT")