Merge branch 'main' into update/aws

.scala-steward.conf

@@ -25,4 +25,8 @@ updates.pin = [
 
 # A separate task to bump sbt-native-packager.  A lot of changes are required
   { groupId = "com.typesafe.sbt", artifactId = "sbt-native-packager", version = "1.8.1" },
+
+# the play-json library 3 is not compatible with version 2
+  { groupId = "com.typesafe.play", artifactId = "play-json", version = "2.10.3" },
+  { groupId = "com.typesafe.play", artifactId = "play-json-joda", version = "2.10.3" },
 ]

build.sbt

@@ -32,8 +32,9 @@ val jacksonCbor: String = "2.16.0"
 val jacksonScalaModule: String = "2.16.0"
 val simpleConfigurationVersion: String = "1.5.7"
 val googleOAuthClient: String = "1.34.1"
-val nettyVersion: String = "4.1.101.Final"
+val nettyVersion: String = "4.1.104.Final"
 val slf4jVersion: String = "1.7.36"
+val logbackVersion: String = "1.4.14"
 
 val standardSettings = Seq[Setting[_]](
   // We should remove this when all transitive dependencies use the same version of scala-xml
@@ -107,7 +108,9 @@ lazy val common = project
       "io.netty" % "netty-codec-http" % nettyVersion,
       "io.netty" % "netty-codec-http2" % nettyVersion,
       "io.netty" % "netty-common" % nettyVersion,
-      "org.postgresql" % "postgresql" % "42.7.0",
+      "org.postgresql" % "postgresql" % "42.7.1",
+      "ch.qos.logback" % "logback-core" % logbackVersion,
+      "ch.qos.logback" % "logback-classic" % logbackVersion,
     ),
     fork := true,
     startDynamoDBLocal := startDynamoDBLocal.dependsOn(Test / compile).value,
@@ -259,7 +262,7 @@ def lambda(projectName: String, directoryName: String, mainClassName: Option[Str
       "org.slf4j" % "slf4j-api" % slf4jVersion,
       "com.gu" %% "simple-configuration-core" % simpleConfigurationVersion,
       "com.gu" %% "simple-configuration-ssm" % simpleConfigurationVersion,
-      "ch.qos.logback" % "logback-classic" % "1.4.13",
+      "ch.qos.logback" % "logback-classic" % logbackVersion,
       "net.logstash.logback" % "logstash-logback-encoder" % "7.4",
       specs2 % Test
     ),
@@ -304,7 +307,7 @@ lazy val football = lambda("football", "football")
     libraryDependencies ++= Seq(
       "org.scanamo" %% "scanamo" % "1.0.0-M12-1",
       "org.scanamo" %% "scanamo-testkit" % "1.0.0-M12-1" % "test",
-      "com.gu" %% "content-api-client-default" % "19.4.1",
+      "com.gu" %% "content-api-client-default" % "20.0.0",
       "com.amazonaws" % "aws-java-sdk-dynamodb" % awsSdkVersion,
       "com.gu" %% "pa-client" % paClientVersion,
       "com.squareup.okhttp3" % "okhttp" % okHttpVersion,

project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.7
+sbt.version=1.9.8

project/plugins.sbt

@@ -5,7 +5,7 @@ libraryDependencies ++= Seq(
 
 resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.1")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")