From 6bc8f1466fe9bfd2105d988f4ed57fdd4ce37ac5 Mon Sep 17 00:00:00 2001 From: Sebastian Alfers Date: Sat, 26 Oct 2024 13:57:22 +0200 Subject: [PATCH] chore: Pre 24.10 release (#1236) * chore: pre 24.10 release items --- LICENSE | 4 ++-- .../consumer/scaladsl/GrpcReadJournal.scala | 2 +- build.sbt | 5 ++--- docs/src/main/paradox/slick.md | 3 +-- project/Common.scala | 2 +- project/Dependencies.scala | 18 +++++++++--------- project/plugins.sbt | 4 ++-- project/project-info.conf | 2 +- samples/grpc/iot-service-java/pom.xml | 14 +++++++------- samples/grpc/iot-service-scala/build.sbt | 12 ++++++------ .../grpc/iot-service-scala/project/plugins.sbt | 2 +- samples/grpc/local-drone-control-java/pom.xml | 16 ++++++++-------- .../grpc/local-drone-control-scala/build.sbt | 12 ++++++------ .../project/plugins.sbt | 2 +- .../pom.xml | 14 +++++++------- .../build.sbt | 12 ++++++------ .../project/plugins.sbt | 2 +- .../shopping-analytics-service-java/pom.xml | 14 +++++++------- .../shopping-analytics-service-scala/build.sbt | 12 ++++++------ .../project/plugins.sbt | 2 +- .../grpc/shopping-cart-service-java/pom.xml | 14 +++++++------- .../grpc/shopping-cart-service-scala/build.sbt | 12 ++++++------ .../project/plugins.sbt | 2 +- .../shopping-cart-service-java/pom.xml | 14 +++++++------- .../shopping-cart-service-scala/build.sbt | 12 ++++++------ .../project/plugins.sbt | 2 +- 26 files changed, 104 insertions(+), 106 deletions(-) diff --git a/LICENSE b/LICENSE index 9280d938d..773c1c682 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Business Source License 1.1 Parameters Licensor: Lightbend, Inc. -Licensed Work: Akka Projection 1.5.7 +Licensed Work: Akka Projection 1.6.0 This license applies to all sub directories and files UNLESS another license file is present in a sub directory, then that other license applies to all files @@ -19,7 +19,7 @@ Additional Use Grant: Connecting to a Play Framework websocket and/or Play Framework request/response bodies for server and play-ws client. -Change Date: 2027-10-02 +Change Date: 2027-10-26 Change License: Apache License, Version 2.0 diff --git a/akka-projection-grpc/src/main/scala/akka/projection/grpc/consumer/scaladsl/GrpcReadJournal.scala b/akka-projection-grpc/src/main/scala/akka/projection/grpc/consumer/scaladsl/GrpcReadJournal.scala index e6ee9f375..686c7f325 100644 --- a/akka-projection-grpc/src/main/scala/akka/projection/grpc/consumer/scaladsl/GrpcReadJournal.scala +++ b/akka-projection-grpc/src/main/scala/akka/projection/grpc/consumer/scaladsl/GrpcReadJournal.scala @@ -330,7 +330,7 @@ final class GrpcReadJournal private ( ReplayPersistenceId(Some(PersistenceIdSeqNr(pid, seqNr)), filterAfterSeqNr) }.toVector - // need this for compatibility with 1.5.2 + // need this for compatibility with 1.6.0 val protoPersistenceIdOffsets = protoReplayPersistenceIds.map(_.fromPersistenceIdOffset.get) if (log.isDebugEnabled() && protoReplayPersistenceIds.nonEmpty) diff --git a/build.sbt b/build.sbt index 9cbef7c0f..62a2e8606 100644 --- a/build.sbt +++ b/build.sbt @@ -231,7 +231,7 @@ lazy val commonParadoxProperties = Def.settings( // Akka Persistence DynamoDB plugin "extref.akka-persistence-dynamodb.base_url" -> s"https://doc.akka.io/libraries/akka-persistence-dynamodb/${Dependencies.Versions.AkkaPersistenceDynamodbVersionInDocs}/%s", // Akka Guide - "extref.akka-guide.base_url" -> "https://developer.lightbend.com/docs/akka-guide/microservices-tutorial/", + "extref.akka-guide.base_url" -> "https://doc.akka.io/guide/microservices-tutorial/", // Java "javadoc.base_url" -> "https://docs.oracle.com/javase/8/docs/api/", // Scala @@ -239,8 +239,7 @@ lazy val commonParadoxProperties = Def.settings( "scaladoc.akka.projection.base_url" -> s"/${(Preprocess / siteSubdirName).value}/", "javadoc.akka.projection.base_url" -> "", // no Javadoc is published // Misc - "extref.samples.base_url" -> "https://developer.lightbend.com/start/?group=akka&project=%s", - "extref.platform-guide.base_url" -> "https://developer.lightbend.com/docs/akka-guide/%s")) + "extref.platform-guide.base_url" -> "https://doc.akka.io/guide/%s")) lazy val docs = project .enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, SitePreviewPlugin, PreprocessPlugin, PublishRsyncPlugin) diff --git a/docs/src/main/paradox/slick.md b/docs/src/main/paradox/slick.md index 5a429e622..d9d538cc0 100644 --- a/docs/src/main/paradox/slick.md +++ b/docs/src/main/paradox/slick.md @@ -6,8 +6,7 @@ The @apidoc[SlickProjection$] has support for storing the offset in a relational used with Scala. @@@ warning -The Slick module in Akka Projections is [community-driven](https://developer.lightbend.com/docs/introduction/getting-help/support-terminology.html#community-driven) -and not included in Lightbend support. +The Slick module in Akka Projections is community-driven and not included in Lightbend support. Prefer using the @ref[JDBC module](jdbc.md) to implement your projection handler. Slick support in Akka Projections is meant for users migrating from [`Lagom's Slick ReadSideProcessor`](https://www.lagomframework.com/documentation/1.6.x/scala/ReadSideSlick.html). @@@ diff --git a/project/Common.scala b/project/Common.scala index cca5b8ef2..05ade30d6 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -26,7 +26,7 @@ object Common extends AutoPlugin { developers += Developer( "contributors", "Contributors", - "https://gitter.im/akka/dev", + "akka.official@gmail.com", url("https://github.com/akka/akka-projection/graphs/contributors")), licenses := { val tagOrBranch = diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c041e83f7..6577aa59e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -16,36 +16,36 @@ object Dependencies { val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3 object Versions { - val Akka = sys.props.getOrElse("build.akka.version", "2.10.0-M1") + val Akka = sys.props.getOrElse("build.akka.version", "2.10.0") val AkkaVersionInDocs = VersionNumber(Akka).numbers match { case Seq(major, minor, _*) => s"$major.$minor" } - val Alpakka = "9.0.0-M1" + val Alpakka = "9.0.0" val AlpakkaVersionInDocs = VersionNumber(Alpakka).numbers match { case Seq(major, minor, _*) => s"$major.$minor" } - val AlpakkaKafka = "7.0.0-M1" + val AlpakkaKafka = "7.0.0" val AlpakkaKafkaVersionInDocs = VersionNumber(AlpakkaKafka).numbers match { case Seq(major, minor, _*) => s"$major.$minor" } - val AkkaGrpcVersionInDocs = "2.5.0-M1" + val AkkaGrpcVersionInDocs = "2.5.0" val AkkaProjectionVersionInDocs = "1.6.0" - val AkkaPersistenceCassandra = "1.2.1" - val AkkaPersistenceJdbc = "5.5.0-M1" + val AkkaPersistenceCassandra = "1.3.0" + val AkkaPersistenceJdbc = "5.5.0" - val AkkaPersistenceR2dbc = "1.3.0-M1" + val AkkaPersistenceR2dbc = "1.3.0" val AkkaPersistenceR2dbcVersionInDocs = VersionNumber(AkkaPersistenceR2dbc).numbers match { case Seq(major, minor, _*) => s"$major.$minor" } - val AkkaPersistenceDynamodb = "2.0.0-M1" + val AkkaPersistenceDynamodb = "2.0.0" val AkkaPersistenceDynamodbVersionInDocs = VersionNumber(AkkaPersistenceDynamodb).numbers match { case Seq(major, minor, _*) => s"$major.$minor" } val DynamodbSdk = "2.25.59" - val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "7.0.0-M1") + val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "7.0.0") val slick = "3.5.2" val scalaTest = "3.2.18" val testContainers = "1.19.3" diff --git a/project/plugins.sbt b/project/plugins.sbt index 5488d321c..a2b20a88e 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.6.1") // remember to bump in Dependencies.scala and samples/grpc/ projects as well if changing -addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0-M1") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0") // Documentation -addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.57") +addSbtPlugin("io.akka" % "sbt-paradox-akka" % "24.10.3") 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/project/project-info.conf b/project/project-info.conf index 1a40bd0f8..66ea2ab35 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -25,7 +25,7 @@ project-info { forums: [ { text: "Lightbend Discuss" - url: "https://discuss.lightbend.com/c/akka/" + url: "https://discuss.akka.io/c/akka/" } ] } diff --git a/samples/grpc/iot-service-java/pom.xml b/samples/grpc/iot-service-java/pom.xml index c4a47d78c..84f71991c 100644 --- a/samples/grpc/iot-service-java/pom.xml +++ b/samples/grpc/iot-service-java/pom.xml @@ -17,13 +17,13 @@ UTF-8 - 2.10.0-M1 - 1.5.7 - 1.3.0-M1 - 1.5.2 - 2.1.0 - 2.5.0-M1 - 2.5.0-M1 + 2.10.0 + 1.6.0 + 1.3.0 + 1.6.0 + 2.2.0 + 2.5.0 + 2.5.0 1.3.6 4.13.2 2.13 diff --git a/samples/grpc/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt index 61d47f611..9d443f15f 100644 --- a/samples/grpc/iot-service-scala/build.sbt +++ b/samples/grpc/iot-service-scala/build.sbt @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.10.0-M1" -val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.5.2" -val AkkaPersistenceR2dbcVersion = "1.3.0-M1" +val AkkaVersion = "2.10.0" +val AkkaHttpVersion = "10.7.0" +val AkkaManagementVersion = "1.6.0" +val AkkaPersistenceR2dbcVersion = "1.3.0" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.7") -val AkkaDiagnosticsVersion = "2.1.1" + sys.props.getOrElse("akka-projection.version", "1.6.0") +val AkkaDiagnosticsVersion = "2.2.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/iot-service-scala/project/plugins.sbt b/samples/grpc/iot-service-scala/project/plugins.sbt index a1502271b..14b8a94c6 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.5.0-M1") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0") 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 c3241b249..e0a4278f6 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.10.0-M1 - 1.5.7 - 1.3.0-M1 - 1.5.2 - 2.1.0 - 10.6.3 - 2.5.0-M1 - 2.5.0-M1 + 2.10.0 + 1.6.0 + 1.3.0 + 1.6.0 + 2.2.0 + 10.7.0 + 2.5.0 + 2.5.0 1.5.7 0.16.0 4.13.2 diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt index a0a1aad57..0af39758b 100644 --- a/samples/grpc/local-drone-control-scala/build.sbt +++ b/samples/grpc/local-drone-control-scala/build.sbt @@ -30,13 +30,13 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.10.0-M1" -val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.5.2" -val AkkaPersistenceR2dbcVersion = "1.3.0-M1" +val AkkaVersion = "2.10.0" +val AkkaHttpVersion = "10.7.0" +val AkkaManagementVersion = "1.6.0" +val AkkaPersistenceR2dbcVersion = "1.3.0" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.7") -val AkkaDiagnosticsVersion = "2.1.0" + sys.props.getOrElse("akka-projection.version", "1.6.0") +val AkkaDiagnosticsVersion = "2.2.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/local-drone-control-scala/project/plugins.sbt b/samples/grpc/local-drone-control-scala/project/plugins.sbt index 7e8e71ab9..d78302cfb 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.5.0-M1") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0") 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 f0cd2adce..cf1013055 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.10.0-M1 - 1.5.2 - 1.3.0-M1 - 1.6.0-M1 - 2.1.0 - 2.5.0-M1 - 2.5.0-M1 + 2.10.0 + 1.6.0 + 1.3.0 + 1.6.0 + 2.2.0 + 2.5.0 + 2.5.0 1.5.7 4.13.2 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 304fbfad4..5fac44035 100644 --- a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt +++ b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.10.0-M1" -val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.5.2" -val AkkaPersistenceR2dbcVersion = "1.3.0-M1" +val AkkaVersion = "2.10.0" +val AkkaHttpVersion = "10.7.0" +val AkkaManagementVersion = "1.6.0" +val AkkaPersistenceR2dbcVersion = "1.3.0" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.7") -val AkkaDiagnosticsVersion = "2.1.1" + sys.props.getOrElse("akka-projection.version", "1.6.0") +val AkkaDiagnosticsVersion = "2.2.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/project/plugins.sbt b/samples/grpc/restaurant-drone-deliveries-service-scala/project/plugins.sbt index c789fba83..711cb8a37 100644 --- a/samples/grpc/restaurant-drone-deliveries-service-scala/project/plugins.sbt +++ b/samples/grpc/restaurant-drone-deliveries-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.5.0-M1") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0") 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-analytics-service-java/pom.xml b/samples/grpc/shopping-analytics-service-java/pom.xml index 1196cc387..368b68f0a 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.10.0-M1 - 1.5.7 - 1.3.0-M1 - 1.6.0-M1 - 2.1.0 - 2.5.0-M1 - 2.5.0-M1 + 2.10.0 + 1.6.0 + 1.3.0 + 1.6.0 + 2.2.0 + 2.5.0 + 2.5.0 1.5.7 4.13.2 2.13 diff --git a/samples/grpc/shopping-analytics-service-scala/build.sbt b/samples/grpc/shopping-analytics-service-scala/build.sbt index 6c64f664e..36bfe5a89 100644 --- a/samples/grpc/shopping-analytics-service-scala/build.sbt +++ b/samples/grpc/shopping-analytics-service-scala/build.sbt @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.10.0-M1" -val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.6.0-M1" -val AkkaPersistenceR2dbcVersion = "1.3.0-M1" +val AkkaVersion = "2.10.0" +val AkkaHttpVersion = "10.7.0" +val AkkaManagementVersion = "1.6.0" +val AkkaPersistenceR2dbcVersion = "1.3.0" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.7") -val AkkaDiagnosticsVersion = "2.1.0" + sys.props.getOrElse("akka-projection.version", "1.6.0") +val AkkaDiagnosticsVersion = "2.2.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/shopping-analytics-service-scala/project/plugins.sbt b/samples/grpc/shopping-analytics-service-scala/project/plugins.sbt index c789fba83..711cb8a37 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.5.0-M1") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0") 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 75d4f35bf..ca6d19ccc 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.10.0-M1 - 1.5.7 - 1.3.0-M1 - 1.6.0-M1 - 2.1.0 - 2.5.0-M1 - 2.5.0-M1 + 2.10.0 + 1.6.0 + 1.3.0 + 1.6.0 + 2.2.0 + 2.5.0 + 2.5.0 1.5.7 4.13.2 2.13 diff --git a/samples/grpc/shopping-cart-service-scala/build.sbt b/samples/grpc/shopping-cart-service-scala/build.sbt index c82b3af4c..d56a6152a 100644 --- a/samples/grpc/shopping-cart-service-scala/build.sbt +++ b/samples/grpc/shopping-cart-service-scala/build.sbt @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = "2.10.0-M1" -val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.5.2" -val AkkaPersistenceR2dbcVersion = "1.3.0-M1" +val AkkaVersion = "2.10.0" +val AkkaHttpVersion = "10.7.0" +val AkkaManagementVersion = "1.6.0" +val AkkaPersistenceR2dbcVersion = "1.3.0" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.7") -val AkkaDiagnosticsVersion = "2.1.1" + sys.props.getOrElse("akka-projection.version", "1.6.0") +val AkkaDiagnosticsVersion = "2.2.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/grpc/shopping-cart-service-scala/project/plugins.sbt b/samples/grpc/shopping-cart-service-scala/project/plugins.sbt index c789fba83..711cb8a37 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.5.0-M1") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0") 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/replicated/shopping-cart-service-java/pom.xml b/samples/replicated/shopping-cart-service-java/pom.xml index d433c0997..3a61be4d9 100644 --- a/samples/replicated/shopping-cart-service-java/pom.xml +++ b/samples/replicated/shopping-cart-service-java/pom.xml @@ -17,13 +17,13 @@ UTF-8 - 2.9.1 - 1.5.7 - 1.2.2 - 1.5.0 - 2.1.0 - 2.4.2 - 2.4.2 + 2.10.0 + 1.6.0 + 1.3.0 + 1.6.0 + 2.2.0 + 2.5.0 + 2.5.0 1.5.7 4.13.2 2.13 diff --git a/samples/replicated/shopping-cart-service-scala/build.sbt b/samples/replicated/shopping-cart-service-scala/build.sbt index 3182e63a6..8d6972a05 100644 --- a/samples/replicated/shopping-cart-service-scala/build.sbt +++ b/samples/replicated/shopping-cart-service-scala/build.sbt @@ -29,13 +29,13 @@ run / javaOptions ++= sys.props .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res")) Global / cancelable := false // ctrl-c -val AkkaVersion = sys.props.getOrElse("akka.version", "2.10.0-M1") -val AkkaHttpVersion = "10.6.3" -val AkkaManagementVersion = "1.5.2" -val AkkaPersistenceR2dbcVersion = "1.3.0-M1" +val AkkaVersion = sys.props.getOrElse("akka.version", "2.10.0") +val AkkaHttpVersion = "10.7.0" +val AkkaManagementVersion = "1.6.0" +val AkkaPersistenceR2dbcVersion = "1.3.0" val AkkaProjectionVersion = - sys.props.getOrElse("akka-projection.version", "1.5.7") -val AkkaDiagnosticsVersion = "2.1.1" + sys.props.getOrElse("akka-projection.version", "1.6.0") +val AkkaDiagnosticsVersion = "2.2.0" enablePlugins(AkkaGrpcPlugin) diff --git a/samples/replicated/shopping-cart-service-scala/project/plugins.sbt b/samples/replicated/shopping-cart-service-scala/project/plugins.sbt index c789fba83..711cb8a37 100644 --- a/samples/replicated/shopping-cart-service-scala/project/plugins.sbt +++ b/samples/replicated/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.5.0-M1") +addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0") 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")