Merge branch 'main' into dependabot/github_actions/guardian/actions-r…

…iff-raff-3

build.sbt

@@ -19,9 +19,9 @@ val compilerOptions = Seq(
 
 ThisBuild / scalacOptions ++= compilerOptions
 
-val playJsonVersion = "2.10.2"
+val playJsonVersion = "3.0.0"
 val specsVersion: String = "4.8.3"
-val awsSdkVersion: String = "1.12.577"
+val awsSdkVersion: String = "1.12.588"
 val doobieVersion: String = "0.13.4"
 val catsVersion: String = "2.10.0"
 val okHttpVersion: String = "4.12.0"
@@ -58,7 +58,7 @@ lazy val commoneventconsumer = project
     libraryDependencies ++= Seq(
       "org.slf4j" % "slf4j-api" % slf4jVersion,
       "com.amazonaws" % "aws-java-sdk-athena" % awsSdkVersion,
-      "com.typesafe.play" %% "play-json" % playJsonVersion,
+      "org.playframework" %% "play-json" % playJsonVersion,
       "org.specs2" %% "specs2-core" % specsVersion % "test",
       "com.fasterxml.jackson.core" % "jackson-databind" % jacksonDatabind,
       "com.fasterxml.jackson.dataformat" % "jackson-dataformat-cbor" % jacksonCbor,
@@ -87,8 +87,8 @@ lazy val common = project
       ws,
       "org.typelevel" %% "cats-core" % catsVersion,
       "joda-time" % "joda-time" % "2.12.5",
-      "com.typesafe.play" %% "play-json" % playJsonVersion,
-      "com.typesafe.play" %% "play-json-joda" % playJsonVersion,
+      "org.playframework" %% "play-json" % playJsonVersion,
+      "org.playframework" %% "play-json-joda" % playJsonVersion,
       "com.gu" %% "pa-client" % paClientVersion,
       "com.amazonaws" % "aws-java-sdk-dynamodb" % awsSdkVersion,
       "com.amazonaws" % "aws-java-sdk-cloudwatch" % awsSdkVersion,
@@ -201,7 +201,7 @@ lazy val apiModels = {
   Project("api-models", file("api-models")).settings(Seq(
     name := "mobile-notifications-api-models",
     libraryDependencies ++= Seq(
-      "com.typesafe.play" %% "play-json" % playJsonVersion,
+      "org.playframework" %% "play-json" % playJsonVersion,
       "org.specs2" %% "specs2-core" % specsVersion % "test",
       "org.specs2" %% "specs2-mock" % specsVersion % "test",
       "com.fasterxml.jackson.core" % "jackson-databind" % jacksonDatabind,
@@ -327,7 +327,7 @@ lazy val eventconsumer = lambda("eventconsumer", "eventconsumer", Some("com.gu.n
     Seq(
       description := "Consumes events produced when an app receives a notification",
       libraryDependencies ++= Seq(
-        "com.typesafe.play" %% "play-json" % playJsonVersion,
+        "org.playframework" %% "play-json" % playJsonVersion,
         "com.amazonaws" % "aws-java-sdk-dynamodb" % awsSdkVersion,
         "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2",
         "io.netty" % "netty-codec-http2" % nettyVersion
@@ -414,7 +414,7 @@ lazy val notificationworkerlambda = lambda("notificationworkerlambda", "notifica
       "com.amazonaws" % "aws-java-sdk-s3" % awsSdkVersion,
       "com.amazonaws" % "amazon-sqs-java-messaging-lib" % "2.1.1",
       "com.squareup.okhttp3" % "okhttp" % okHttpVersion,
-      "com.typesafe.play" %% "play-json" % playJsonVersion,
+      "org.playframework" %% "play-json" % playJsonVersion,
       "com.google.oauth-client" % "google-oauth-client" % googleOAuthClient,
     ),
     excludeDependencies ++= Seq(

project/plugins.sbt

@@ -1,15 +1,15 @@
 libraryDependencies ++= Seq(
-  "com.github.docker-java" % "docker-java-core" % "3.3.3",
-  "com.github.docker-java" % "docker-java-transport-httpclient5" % "3.3.3"
+  "com.github.docker-java" % "docker-java-core" % "3.3.4",
+  "com.github.docker-java" % "docker-java-transport-httpclient5" % "3.3.4"
 )
 
 resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
 
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.0")
 
 addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.8.1")
 
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.4")
 
 addSbtPlugin("com.localytics" % "sbt-dynamodb" % "2.0.3")