Generating self-signed certificate works again, no more --add-exports + small fixes

.github/workflows/build-test.yml

@@ -154,8 +154,7 @@ jobs:
     needs: changes
     if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'java-grpc')}}
     with:
-      # Can't test with Java 21+ currently because of https://github.com/lightbend/ssl-config/issues/367
-      java: 17
+      java: 17, 21
       scala: 2.13.x, 3.x
       gradle-build-root: java/grpc
       add-dimensions: >-
@@ -337,8 +336,7 @@ jobs:
     needs: changes
     if: ${{ (github.event_name != 'pull_request' && !failure() && !cancelled()) || contains(fromJSON(needs.changes.outputs.samples), 'scala-grpc')}}
     with:
-      # Can't test with Java 21+ currently because of https://github.com/lightbend/ssl-config/issues/367
-      java: 17
+      java: 17, 21
       scala: 2.13.x, 3.x
       gradle-build-root: scala/grpc
       add-dimensions: >-

java/chatroom/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 webjars-play = "3.1.0-M1"
 flot = "0.8.3-1"

java/chatroom/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/compile-di/gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 
 [libraries]

java/compile-di/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/dagger2/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 dagger = "2.51.1"
 

java/dagger2/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/ebean/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 play-ebean = "9.0.0-M1"
 ebean = "15.11.0" # Sync with Play Ebean version https://github.com/playframework/play-ebean/blob/main/project/Dependencies.scala#L19
 h2 = "2.3.232"

java/ebean/project/plugins.sbt

@@ -1,5 +1,5 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
 
 addSbtPlugin("org.playframework" % "sbt-play-ebean" % "9.0.0-M1")

java/fileupload/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 
 [libraries]

java/fileupload/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/forms/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 
 [libraries]

java/forms/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/grpc/build.sbt

@@ -56,8 +56,6 @@ scalaVersion := "2.13.16"
 crossScalaVersions := Seq("2.13.16", "3.3.6")
 scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
 javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation")
-// Needed for ssl-config to create self signed certificated under Java 17
-Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED")
 
 val CompileDeps = Seq(
   guice,

java/grpc/conf/application.conf

@@ -44,9 +44,7 @@ play.modules {
 #         +------------ (HTTP/2) -------+
 #
 # The settings below configure the client that consumes "helloworld.GreeterService". Because a `host` and `port`
-# are used, the client will directly point there. The `ssl-config` section of the settings is required because when
-# running this example application we use a self-signed certificate. Therefore we need to tell the client to trust
-# the invalid certificate.
+# are used, the client will directly point there.
 pekko.grpc.client {
 
   "helloworld.GreeterService" {
@@ -56,17 +54,8 @@ pekko.grpc.client {
     host = ${?DEPLOYMENT_SERVICE_NAME}
     port = ${play.server.https.port}
     use-tls = true
-    # The Authority on the requests must match the CN on the server certificate. The certificate on
+    # The Authority on the requests must match the CN on the server certificate. The self-signed certificate certificate on
     # `conf/selfsigned.keystore` was issued to `localhost` so we must override the authority.
     override-authority = "localhost"
-
-    # configure ssl to trust our fake certificate chain.
-    ssl-config {
-      trustManager = {
-        stores = [
-          {type = "JKS", path = ${user.dir}/conf/selfsigned.keystore}
-        ]
-      }
-    }
   }
 }

java/grpc/project/plugins.sbt

@@ -4,7 +4,7 @@ buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.java.grpc.sample"
 
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
 
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 

java/hello-world/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 
 [libraries]

java/hello-world/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/jpa/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 node = "7.1.0"
 h2 = "2.3.232"
 hibernate = "6.6.19.Final"

java/jpa/project/plugins.sbt

@@ -1,6 +1,6 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
 
 // Web plugins
 addSbtPlugin("com.github.sbt" % "sbt-coffeescript" % "2.0.1")

java/pekko-cluster/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 pekko = "1.0.3"
 

java/pekko-cluster/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/rest-api/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 failsafe = "2.4.4"
 url-builder = "1.1.5"
 h2 = "2.3.232"

java/rest-api/project/plugins.sbt

@@ -1,6 +1,6 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
 
 // Load testing tool:
 // https://gatling.io/docs/gatling/reference/current/extensions/sbt_plugin/

java/starter/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 h2 = "2.3.232"
 assertj = "3.27.3"

java/starter/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/streaming/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 junit = "4.13.2"
 
 [libraries]

java/streaming/project/plugins.sbt

@@ -1,3 +1,3 @@
 // Use the Play sbt plugin for Play projects
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

java/websocket/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 node = "7.1.0"
 webjars-play = "3.1.0-M1"
 flot = "0.8.3-1"

java/websocket/project/plugins.sbt

@@ -1,5 +1,5 @@
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
 
 addSbtPlugin("com.github.sbt" % "sbt-less" % "2.0.1")
 

scala/anorm/build.sbt

@@ -18,6 +18,4 @@ lazy val root = (project in file("."))
     ),
     scalacOptions ++= List("-feature", "-Werror"),
     javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation", "-Werror"),
-    // Needed for ssl-config to create self signed certificated under Java 17
-    Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
   )

scala/anorm/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

scala/chatroom/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 webjars-play = "3.1.0-M1"
 jsoup = "1.21.1"
 flot = "0.8.3-1"

scala/chatroom/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

scala/compile-di/build.sbt

@@ -16,6 +16,4 @@ lazy val root = (project in file("."))
       "-feature",
       "-Werror"
     ),
-    // Needed for ssl-config to create self signed certificated under Java 17
-    Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
   )

scala/compile-di/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 scalatestplus = "3.2.19.1"
 scalatestplus-play = "8.0.0-M2"
 

scala/compile-di/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

scala/fileupload/build.sbt

@@ -17,6 +17,4 @@ lazy val root = (project in file("."))
       "-feature",
       "-Werror"
     ),
-    // Needed for ssl-config to create self signed certificated under Java 17
-    Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
   )

scala/fileupload/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 scalatestplus = "3.2.19.1"
 scalatestplus-play = "8.0.0-M2"
 

scala/fileupload/project/plugins.sbt

@@ -1,3 +1,3 @@
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

scala/forms/build.sbt

@@ -16,6 +16,4 @@ lazy val root = (project in file("."))
       "-feature",
       "-Werror"
     ),
-    // Needed for ssl-config to create self signed certificated under Java 17
-    Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
   )

scala/forms/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 scalatestplus = "3.2.19.1"
 scalatestplus-play = "8.0.0-M2"
 

scala/forms/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

scala/grpc/build.sbt

@@ -75,8 +75,6 @@ val TestDeps = Seq(
 scalaVersion := "2.13.16"
 crossScalaVersions := Seq("2.13.16", "3.3.6")
 scalacOptions ++= List("-encoding", "utf8", "-deprecation", "-feature", "-unchecked")
-// Needed for ssl-config to create self signed certificated under Java 17
-Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED")
 
 // Make verbose tests
 (Test / testOptions) := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v"))

scala/grpc/conf/application.conf

@@ -44,9 +44,7 @@ play.modules {
 #         +------------ (HTTP/2) -------+
 #
 # The settings below configure the client that consumes "helloworld.GreeterService". Because a `host` and `port`
-# are used, the client will directly point there. The `ssl-config` section of the settings is required because when
-# running this example application we use a self-signed certificate. Therefore we need to tell the client to trust
-# the invalid certificate.
+# are used, the client will directly point there.
 pekko.grpc.client {
 
   "helloworld.GreeterService" {
@@ -56,17 +54,8 @@ pekko.grpc.client {
     host = ${?DEPLOYMENT_SERVICE_NAME}
     port = ${play.server.https.port}
     use-tls = true
-    # The Authority on the requests must match the CN on the server certificate. The certificate on
+    # The Authority on the requests must match the CN on the server certificate. The self-signed certificate certificate on
     # `conf/selfsigned.keystore` was issued to `localhost` so we must override the authority.
     override-authority = "localhost"
-
-    # configure ssl to trust our fake certificate chain.
-    ssl-config {
-      trustManager = {
-        stores = [
-          {type = "JKS", path = ${user.dir}/conf/selfsigned.keystore}
-        ]
-      }
-    }
   }
 }

scala/grpc/project/plugins.sbt

@@ -4,7 +4,7 @@ buildInfoKeys := Seq[BuildInfoKey]("playGrpcVersion" -> playGrpcV)
 buildInfoPackage := "play.scala.grpc.sample"
 
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")
 
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 

scala/hello-world/gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 [versions]
 twirl = "2.0.9"
-play = "3.1.0-M2-573139bb-SNAPSHOT"
+play = "3.1.0-M3"
 scalatestplus = "3.2.19.1"
 scalatestplus-play = "8.0.0-M2"
 

scala/hello-world/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

scala/isolated-slick/project/plugins.sbt

@@ -10,4 +10,4 @@ addSbtPlugin("com.github.tototoshi" % "sbt-slick-codegen" % "2.2.0")
 
 // The Play plugin
 resolvers += Resolver.sonatypeCentralSnapshots
-addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M2-573139bb-SNAPSHOT")
+addSbtPlugin("org.playframework" % "sbt-plugin" % "3.1.0-M3")

scala/log4j2/build.sbt

@@ -22,6 +22,4 @@ lazy val root = (project in file("."))
       "-feature",
       "-Werror"
     ),
-    // Needed for ssl-config to create self signed certificated under Java 17
-    Test / javaOptions ++= List("--add-exports=java.base/sun.security.x509=ALL-UNNAMED"),
   )