DDCE-5531 (#137)

* Dep upgrades * platops fixes * Update logback.xml * Update logback.xml
hmrc · Jun 21, 2024 · 8a9f3c1 · 8a9f3c1
1 parent 5b1f49a
commit 8a9f3c1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 47 deletions.
diff --git a/app/views/MainTemplate.scala.html b/app/views/MainTemplate.scala.html
@@ -76,7 +76,7 @@
 }
 
 @scripts = {
-    <script @{CSPNonce.attr} src='@controllers.routes.Assets.versioned("javascripts/requestcorporationtaxnumberfrontend-app.js")'></script>
+    <script type="module" @{CSPNonce.attr} src='@controllers.routes.Assets.versioned("javascripts/requestcorporationtaxnumberfrontend-app.js")'></script>
 }
 
 @content = {

diff --git a/build.sbt b/build.sbt
@@ -3,9 +3,7 @@ import scoverage.ScoverageKeys
 import uk.gov.hmrc.DefaultBuildSettings.{defaultSettings, scalaSettings}
 import uk.gov.hmrc.versioning.SbtGitVersioning.autoImport.majorVersion
 
-val appName = "request-corporation-tax-number-frontend"
-
-scalaVersion := "2.13.13"
+scalaVersion := "2.13.14"
 
 lazy val scoverageSettings =
   Seq(ScoverageKeys.coverageExcludedFiles := "<empty>;Reverse.*;.*filters.*;.*handlers.*;.*components.*;.*models.*;.*repositories.*;" +
@@ -15,7 +13,7 @@ lazy val scoverageSettings =
     ScoverageKeys.coverageHighlighting := true
   )
 
-lazy val microservice = Project(appName, file("."))
+lazy val microservice = Project("request-corporation-tax-number-frontend", file("."))
   .enablePlugins(play.sbt.PlayScala, SbtDistributablesPlugin)
   .settings(
     RoutesKeys.routesImport ++= Seq("models._"),

diff --git a/conf/application-json-logger.xml b/conf/application-json-logger.xml
diff --git a/conf/logback.xml b/conf/logback.xml
@@ -14,28 +14,12 @@
         </encoder>
     </appender>
 
-    <appender name="STDOUT_IGNORE_NETTY" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <pattern>%date{ISO8601} level=[%level] logger=[%logger] thread=[%thread] rid=[not-available] user=[not-available] message=[%message] %replace(exception=[%xException]){'^exception=\[\]$',''}%n</pattern>
-        </encoder>
-    </appender>
-
-    <logger name="com.ning.http.client.providers.netty" additivity="false">
-        <appender-ref ref="STDOUT_IGNORE_NETTY" />
-    </logger>
-
     <logger name="com.google.inject" level="INFO"/>
-
     <logger name="uk.gov" level="INFO"/>
 
     <logger name="connectors" level="INFO"/>
     <logger name="services" level="INFO"/>
 
-    <logger name="org.asynchttpclient.netty" level="INFO"/>
-    <logger name="io.netty.buffer" level="INFO"/>
-    <logger name="play.core.netty" level="INFO"/>
-
-
     <logger name="akka" level="INFO"/>
     <logger name="play" level="INFO"/>
     <logger name="org.jose4j" level="INFO"/>
@@ -48,7 +32,6 @@
     <logger name="org.apache.http" level="INFO"/>
 
     <logger name="org.jboss" level="INFO"/>
-    <logger name="io.netty" level="INFO"/>
     <logger name="sun.net.www.protocol.http" level="INFO"/>
 
     <logger name="connector" level="TRACE">

diff --git a/project/AppDependencies.scala b/project/AppDependencies.scala
@@ -2,22 +2,22 @@ import sbt.{ModuleID, *}
 
 object AppDependencies {
 
-  private val bootstrapVersion: String = "8.5.0"
+  private val bootstrapVersion: String = "8.6.0"
 
   val compile: Seq[ModuleID] = Seq(
-    "uk.gov.hmrc.mongo" %% "hmrc-mongo-play-30"            % "1.8.0",
+    "uk.gov.hmrc.mongo" %% "hmrc-mongo-play-30"            % "1.9.0",
     "uk.gov.hmrc"       %% "play-conditional-form-mapping-play-30" % "2.0.0",
     "uk.gov.hmrc"       %% "bootstrap-frontend-play-30"    % bootstrapVersion,
-    "uk.gov.hmrc"       %% "play-allowlist-filter"         % "1.2.0",
-    "uk.gov.hmrc"       %% "play-frontend-hmrc-play-30"    % "9.6.0"
+    "uk.gov.hmrc"       %% "play-allowlist-filter"         % "1.3.0",
+    "uk.gov.hmrc"       %% "play-frontend-hmrc-play-30"    % "9.11.0"
   )
 
   val test: Seq[ModuleID] = Seq(
     "org.scalatest"          %% "scalatest"              % "3.2.18",
     "org.scalatestplus"      %% "mockito-5-10"           % "3.2.18.0",
     "org.scalatestplus"      %% "scalacheck-1-17"        % "3.2.18.0",
     "org.jsoup"              %  "jsoup"                  % "1.17.2",
-    "org.scalacheck"         %% "scalacheck"             % "1.17.0",
+    "org.scalacheck"         %% "scalacheck"             % "1.18.0",
     "com.vladsch.flexmark"   %  "flexmark-all"           % "0.64.8",
     "uk.gov.hmrc"            %% "bootstrap-test-play-30" % bootstrapVersion
   ).map(_ % "test")

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,11 +1,11 @@
 resolvers += MavenRepository("HMRC-open-artefacts-maven2", "https://open.artefacts.tax.service.gov.uk/maven2")
 resolvers += Resolver.url("HMRC-open-artefacts-ivy2", url("https://open.artefacts.tax.service.gov.uk/ivy2"))(Resolver.ivyStylePatterns)
 
-addSbtPlugin("uk.gov.hmrc"          % "sbt-auto-build"            % "3.21.0")
+addSbtPlugin("uk.gov.hmrc"          % "sbt-auto-build"            % "3.22.0")
 addSbtPlugin("uk.gov.hmrc"          % "sbt-distributables"        % "2.5.0")
-addSbtPlugin("org.playframework"    % "sbt-plugin"                % "3.0.2")
+addSbtPlugin("org.playframework"    % "sbt-plugin"                % "3.0.3")
 addSbtPlugin("org.scalastyle"       %% "scalastyle-sbt-plugin"    % "1.0.0" exclude("org.scala-lang.modules", "scala-xml_2.12"))
-addSbtPlugin("org.scoverage"        % "sbt-scoverage"             % "2.0.11" exclude("org.scala-lang.modules", "scala-xml_2.12"))
+addSbtPlugin("org.scoverage"        % "sbt-scoverage"             % "2.0.12")
 addSbtPlugin("io.github.irundaia"   % "sbt-sassify"               % "1.5.2")
 addSbtPlugin("net.ground5hark.sbt"  % "sbt-concat"                % "0.2.0")
 addSbtPlugin("com.typesafe.sbt"     % "sbt-uglify"                % "2.0.0")