From d8cf9d88b3689b4eeb588db5ab919dcbbb07ac13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Andr=C3=A9n?= Date: Wed, 15 May 2024 11:20:05 +0200 Subject: [PATCH] bump: Akka umbrella (#1156) * Akka 2.9.3 * Akka HTTP 10.6.3 * Akka gRPC 2.4.3 * Akka Persistence JDBC 5.4.1 * Akka Persistence R2DB 1.2.4 * Alpakka 8.0.0 * Alpakka Kafka 6.0.0 * Akka Paradox Theme 0.57 Some transitives: * Slick 3.5.1 * H2 (for tests) 2.2.224 --- project/Dependencies.scala | 20 +++++++++---------- project/plugins.sbt | 4 ++-- samples/grpc/iot-service-java/pom.xml | 6 +++--- samples/grpc/iot-service-scala/build.sbt | 4 ++-- .../iot-service-scala/project/plugins.sbt | 2 +- samples/grpc/local-drone-control-java/pom.xml | 8 ++++---- .../grpc/local-drone-control-scala/build.sbt | 4 ++-- .../project/plugins.sbt | 2 +- .../pom.xml | 6 +++--- .../build.sbt | 4 ++-- .../shopping-analytics-service-java/pom.xml | 6 +++--- .../build.sbt | 4 ++-- .../project/plugins.sbt | 2 +- .../grpc/shopping-cart-service-java/pom.xml | 6 +++--- .../shopping-cart-service-scala/build.sbt | 4 ++-- .../project/plugins.sbt | 2 +- 16 files changed, 42 insertions(+), 42 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 11c19125f..93a7f2ae1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -12,20 +12,20 @@ object Dependencies { val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3 val AkkaVersionInDocs = "2.9" - val AlpakkaVersionInDocs = "7.0" - val AlpakkaKafkaVersionInDocs = "5.0" + val AlpakkaVersionInDocs = "8.0" + val AlpakkaKafkaVersionInDocs = "6.0" val AkkaGrpcVersionInDocs = "2.4" val AkkaPersistenceR2dbcVersionInDocs = Versions.akkaPersistenceR2dbc val AkkaProjectionVersionInDocs = "1.5" object Versions { - val akka = sys.props.getOrElse("build.akka.version", "2.9.2") - val akkaPersistenceCassandra = "1.2.0" - val akkaPersistenceJdbc = "5.4.0" - val akkaPersistenceR2dbc = "1.2.3" - val alpakka = "7.0.0" - val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "5.0.0") - val slick = "3.5.0" + val akka = sys.props.getOrElse("build.akka.version", "2.9.3") + val akkaPersistenceCassandra = "1.2.1" + val akkaPersistenceJdbc = "5.4.1" + val akkaPersistenceR2dbc = "1.2.4" + val alpakka = "8.0.0" + val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "6.0.0") + val slick = "3.5.1" val scalaTest = "3.2.18" val testContainers = "1.19.3" val junit = "4.13.2" @@ -51,7 +51,7 @@ object Dependencies { val akkaPersistenceR2dbcState = "com.lightbend.akka" %% "akka-persistence-r2dbc" % Versions.akkaPersistenceR2dbc - val h2 = "com.h2database" % "h2" % "2.1.210" % Provided // EPL 1.0 + val h2 = "com.h2database" % "h2" % "2.2.224" % Provided // EPL 1.0 val r2dbcH2 = "io.r2dbc" % "r2dbc-h2" % "1.0.0.RELEASE" % Provided // ApacheV2 val r2dbcSqlServer = "io.r2dbc" % "r2dbc-mssql" % "1.0.2.RELEASE" % Provided // ApacheV2 diff --git a/project/plugins.sbt b/project/plugins.sbt index 049cbd72e..37c79bd7c 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,10 +7,10 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") // remember to bump in samples/grpc/ projects as well if changing -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.2") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.3") // Documentation -addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.55") +addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.57") addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.4") addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") diff --git a/samples/grpc/iot-service-java/pom.xml b/samples/grpc/iot-service-java/pom.xml index 7f421bacf..6705269bd 100644 --- a/samples/grpc/iot-service-java/pom.xml +++ b/samples/grpc/iot-service-java/pom.xml @@ -17,13 +17,13 @@ UTF-8 - 2.9.2 + 2.9.3 1.2.3 1.5.1 2.1.0 - 2.4.2 - 2.4.2 + 2.4.3 + 2.4.3 1.3.6 4.13.1 2.13 diff --git a/samples/grpc/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt index 43dc4abc2..4486de002 100644 --- a/samples/grpc/iot-service-scala/build.sbt +++ b/samples/grpc/iot-service-scala/build.sbt @@ -28,8 +28,8 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.9.2" -val AkkaHttpVersion = "10.6.1" +val AkkaVersion = "2.9.3" +val AkkaHttpVersion = "10.6.3" val AkkaManagementVersion = "1.5.1" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = diff --git a/samples/grpc/iot-service-scala/project/plugins.sbt b/samples/grpc/iot-service-scala/project/plugins.sbt index c55fbc029..565ef073d 100644 --- a/samples/grpc/iot-service-scala/project/plugins.sbt +++ b/samples/grpc/iot-service-scala/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven") -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.2") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.13") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") diff --git a/samples/grpc/local-drone-control-java/pom.xml b/samples/grpc/local-drone-control-java/pom.xml index 841993eaa..270167d19 100644 --- a/samples/grpc/local-drone-control-java/pom.xml +++ b/samples/grpc/local-drone-control-java/pom.xml @@ -17,14 +17,14 @@ UTF-8 - 2.9.2 + 2.9.3 1.2.3 1.5.1 2.1.0 - 10.6.1 - 2.4.2 - 2.4.2 + 10.6.3 + 2.4.3 + 2.4.3 1.2.13 0.16.0 4.13.1 diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt index 542cf5710..c70954b35 100644 --- a/samples/grpc/local-drone-control-scala/build.sbt +++ b/samples/grpc/local-drone-control-scala/build.sbt @@ -30,8 +30,8 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.9.2" -val AkkaHttpVersion = "10.6.1" +val AkkaVersion = "2.9.3" +val AkkaHttpVersion = "10.6.3" val AkkaManagementVersion = "1.5.1" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = diff --git a/samples/grpc/local-drone-control-scala/project/plugins.sbt b/samples/grpc/local-drone-control-scala/project/plugins.sbt index 700995b45..2b1df325b 100644 --- a/samples/grpc/local-drone-control-scala/project/plugins.sbt +++ b/samples/grpc/local-drone-control-scala/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven") -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.2") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") diff --git a/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml b/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml index d7d07a64a..15c155f6e 100644 --- a/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml +++ b/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml @@ -17,13 +17,13 @@ UTF-8 - 2.9.2 + 2.9.3 1.5.2 1.2.3 1.5.1 2.1.0 - 2.4.2 - 2.4.2 + 2.4.3 + 2.4.3 1.2.13 4.13.1 2.13 diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt index 76a4761c5..1f8f4a03d 100644 --- a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt +++ b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt @@ -28,8 +28,8 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.9.2" -val AkkaHttpVersion = "10.6.1" +val AkkaVersion = "2.9.3" +val AkkaHttpVersion = "10.6.3" val AkkaManagementVersion = "1.5.1" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = diff --git a/samples/grpc/shopping-analytics-service-java/pom.xml b/samples/grpc/shopping-analytics-service-java/pom.xml index 972c928bb..31abd889d 100644 --- a/samples/grpc/shopping-analytics-service-java/pom.xml +++ b/samples/grpc/shopping-analytics-service-java/pom.xml @@ -17,13 +17,13 @@ UTF-8 - 2.9.2 + 2.9.3 1.5.2 1.2.3 1.5.1 2.1.0 - 2.4.2 - 2.4.2 + 2.4.3 + 2.4.3 1.2.13 4.13.1 2.13 diff --git a/samples/grpc/shopping-analytics-service-scala/build.sbt b/samples/grpc/shopping-analytics-service-scala/build.sbt index b120d3d1b..c085382f4 100644 --- a/samples/grpc/shopping-analytics-service-scala/build.sbt +++ b/samples/grpc/shopping-analytics-service-scala/build.sbt @@ -28,8 +28,8 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.9.2" -val AkkaHttpVersion = "10.6.1" +val AkkaVersion = "2.9.3" +val AkkaHttpVersion = "10.6.3" val AkkaManagementVersion = "1.5.1" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = diff --git a/samples/grpc/shopping-analytics-service-scala/project/plugins.sbt b/samples/grpc/shopping-analytics-service-scala/project/plugins.sbt index 614d3e912..a2be489ed 100644 --- a/samples/grpc/shopping-analytics-service-scala/project/plugins.sbt +++ b/samples/grpc/shopping-analytics-service-scala/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven") -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.2") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1") diff --git a/samples/grpc/shopping-cart-service-java/pom.xml b/samples/grpc/shopping-cart-service-java/pom.xml index 77cfcf702..56cc672be 100644 --- a/samples/grpc/shopping-cart-service-java/pom.xml +++ b/samples/grpc/shopping-cart-service-java/pom.xml @@ -17,13 +17,13 @@ UTF-8 - 2.9.2 + 2.9.3 1.5.2 1.2.3 1.5.1 2.1.0 - 2.4.2 - 2.4.2 + 2.4.3 + 2.4.3 1.2.13 4.13.1 2.13 diff --git a/samples/grpc/shopping-cart-service-scala/build.sbt b/samples/grpc/shopping-cart-service-scala/build.sbt index 17c7e097e..bc04c0d52 100644 --- a/samples/grpc/shopping-cart-service-scala/build.sbt +++ b/samples/grpc/shopping-cart-service-scala/build.sbt @@ -28,8 +28,8 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.9.2" -val AkkaHttpVersion = "10.6.1" +val AkkaVersion = "2.9.3" +val AkkaHttpVersion = "10.6.3" val AkkaManagementVersion = "1.5.1" val AkkaPersistenceR2dbcVersion = "1.2.3" val AkkaProjectionVersion = diff --git a/samples/grpc/shopping-cart-service-scala/project/plugins.sbt b/samples/grpc/shopping-cart-service-scala/project/plugins.sbt index 614d3e912..a2be489ed 100644 --- a/samples/grpc/shopping-cart-service-scala/project/plugins.sbt +++ b/samples/grpc/shopping-cart-service-scala/project/plugins.sbt @@ -1,6 +1,6 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven") -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.2") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2") addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")