APIS-6764: play 3.0 upgrade (#85)

* APIS-6764: play 3.0 upgrade

* APIS-6764:PR Bot Comments

* APIS-6764:More PR Bot Comments

Author: mattclark-zerogravit

conf/app.routes

@@ -4,4 +4,4 @@ POST        /scope             uk.gov.hmrc.apiscope.controllers.ScopeController.
 GET         /scope             uk.gov.hmrc.apiscope.controllers.ScopeController.fetchScopes(keys ?= "*")
 GET         /scope/:key        uk.gov.hmrc.apiscope.controllers.ScopeController.fetchScope(key)
 
-POST        /scope/validate    uk.gov.hmrc.apiscope.controllers.ScopeController.validate()
+POST        /scope/validate    uk.gov.hmrc.apiscope.controllers.ScopeController.validate()

conf/application.conf

@@ -20,25 +20,8 @@ appUrl="http://localhost:9690"
 
 include "backend.conf"
 
-# An ApplicationLoader that uses Guice to bootstrap the application.
-play.application.loader = "uk.gov.hmrc.play.bootstrap.ApplicationLoader"
-
-# Primary entry point for all HTTP requests on Play applications
-play.http.requestHandler = "uk.gov.hmrc.play.bootstrap.http.RequestHandler"
-
-# Provides an implementation of AuditConnector. Use `uk.gov.hmrc.play.audit.AuditModule` or create your own.
-# An audit connector must be provided.
-play.modules.enabled += "uk.gov.hmrc.play.audit.AuditModule"
-
-# Provides an implementation of MetricsFilter. Use `uk.gov.hmrc.play.bootstrap.graphite.GraphiteMetricsModule` or create your own.
-# A metric filter must be provided
-play.modules.enabled += "uk.gov.hmrc.play.bootstrap.graphite.GraphiteMetricsModule"
-
 play.modules.enabled += "uk.gov.hmrc.apiscope.module.ScopeJsonFileReaderModule"
 
-# Provides an implementation and configures all filters required by a Platform backend microservice.
-play.modules.enabled += "uk.gov.hmrc.play.bootstrap.backend.BackendModule"
-
 # Json error handler
 play.http.errorHandler = "uk.gov.hmrc.play.bootstrap.backend.http.JsonErrorHandler"
 
@@ -91,30 +74,6 @@ controllers {
     }
 }
 
-metrics {
-    name = ${appName}
-    rateUnit = SECONDS
-    durationUnit = SECONDS
-    showSamples = true
-    jvm = true
-    enabled = true
-}
-
-auditing {
-    enabled = false
-}
-
 mongodb {
     uri = "mongodb://localhost:27017/api-scope-test"
 }
-
-microservice {
-    metrics {
-        graphite {
-            host = graphite
-            port = 2003
-            prefix = play.${appName}.
-            enabled = false
-        }
-    }
-}

conf/logback.xml

@@ -44,6 +44,7 @@
     </logger>
 
     <logger name="com.google.inject" level="INFO"/>
+    <logger name="org.apache.pekko" level="ERROR"/>
     <logger name="org.asynchttpclient.netty.channel.DefaultChannelPool" level="INFO"/>
     <logger name="io.netty" level="INFO"/>
 

conf/prod.routes

@@ -1,4 +1,3 @@
 # Add all the application routes to the app.routes file
 ->         /                          app.Routes
 ->         /                          health.Routes
-GET        /admin/metrics             com.kenshoo.play.metrics.MetricsController.metrics

project/AppDependencies.scala

@@ -5,21 +5,21 @@ object AppDependencies {
 
   lazy val libraryDependencies = compile ++ test
 
-  private lazy val bootstrapVersion = "7.12.0"
+  private lazy val bootstrapVersion = "8.4.0"
   private lazy val hmrcMongoVersion = "1.7.0"
   private lazy val scalaJVersion    = "2.4.2"
   val commonDomainVersion           = "0.10.0"
 
   private lazy val compile = Seq(
-    "uk.gov.hmrc"       %% "bootstrap-backend-play-28"  % bootstrapVersion,
-    "uk.gov.hmrc.mongo" %% "hmrc-mongo-play-28"         % hmrcMongoVersion,
+    "uk.gov.hmrc"       %% "bootstrap-backend-play-30"  % bootstrapVersion,
+    "uk.gov.hmrc.mongo" %% "hmrc-mongo-play-30"         % hmrcMongoVersion,
     "uk.gov.hmrc"       %% "api-platform-common-domain" % commonDomainVersion
   )
 
   private lazy val test = Seq(
-    "uk.gov.hmrc.mongo" %% "hmrc-mongo-test-play-28"         % hmrcMongoVersion,
+    "uk.gov.hmrc.mongo" %% "hmrc-mongo-test-play-30"         % hmrcMongoVersion,
     "org.scalaj"        %% "scalaj-http"                     % scalaJVersion,
-    "uk.gov.hmrc"       %% "bootstrap-test-play-28"          % bootstrapVersion,
+    "uk.gov.hmrc"       %% "bootstrap-test-play-30"          % bootstrapVersion,
     "org.mockito"       %% "mockito-scala-scalatest"         % "1.17.29",
     "uk.gov.hmrc"       %% "api-platform-test-common-domain" % commonDomainVersion
   ).map(_ % "test, it")

project/plugins.sbt

@@ -1,13 +1,13 @@
 resolvers += "HMRC-open-artefacts-maven" at "https://open.artefacts.tax.service.gov.uk/maven2"
 resolvers += Resolver.url("HMRC-open-artefacts-ivy", url("https://open.artefacts.tax.service.gov.uk/ivy2"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("uk.gov.hmrc"        %  "sbt-auto-build"         % "3.18.0")
-addSbtPlugin("uk.gov.hmrc"        %  "sbt-distributables"     % "2.4.0")
-addSbtPlugin("org.scoverage"      %% "sbt-scoverage"          % "2.0.9")
+addSbtPlugin("uk.gov.hmrc"        %  "sbt-auto-build"         % "3.20.0")
+addSbtPlugin("uk.gov.hmrc"        %  "sbt-distributables"     % "2.5.0")
+addSbtPlugin("org.playframework"  %  "sbt-plugin"             % "3.0.1")
+addSbtPlugin("org.scoverage"      %  "sbt-scoverage"          % "2.0.9")
 addSbtPlugin("org.scalastyle"     %% "scalastyle-sbt-plugin"  % "1.0.0")
-addSbtPlugin("com.typesafe.play"  %  "sbt-plugin"             % "2.8.20")
-addSbtPlugin("ch.epfl.scala"      %  "sbt-bloop"              % "1.5.11")
 addSbtPlugin("org.scalameta"      %  "sbt-scalafmt"           % "2.5.2")
+addSbtPlugin("ch.epfl.scala"      %  "sbt-bloop"              % "1.5.13")
 addSbtPlugin("ch.epfl.scala"      %  "sbt-scalafix"           % "0.11.1")
 
 ThisBuild / libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always

test/uk/gov/hmrc/apiscope/controllers/ScopeControllerSpec.scala

@@ -19,7 +19,7 @@ package uk.gov.hmrc.apiscope.controllers
 import scala.concurrent.ExecutionContext.Implicits.global
 import scala.concurrent.Future.{failed, successful}
 
-import akka.stream.Materializer
+import org.apache.pekko.stream.Materializer
 import org.scalatest.prop.TableDrivenPropertyChecks._
 import org.scalatest.prop.TableFor2
 import org.scalatest.prop.Tables.Table