From 77efc1381a19eedd3590b57a0f50bfe24d89707c Mon Sep 17 00:00:00 2001
From: Patrik Nordwall <patrik.nordwall@gmail.com>
Date: Wed, 25 Oct 2023 10:54:32 +0200
Subject: [PATCH] bump: Akka 2.9.0

* and swithching other milestone versions to final
---
 project/Dependencies.scala                             | 10 +++++-----
 project/plugins.sbt                                    |  2 +-
 samples/grpc/iot-service-scala/build.sbt               |  8 ++++----
 samples/grpc/iot-service-scala/project/plugins.sbt     |  2 +-
 samples/grpc/local-drone-control-java/pom.xml          | 10 +++++-----
 samples/grpc/local-drone-control-scala/build.sbt       |  8 ++++----
 .../grpc/local-drone-control-scala/project/plugins.sbt |  2 +-
 .../restaurant-drone-deliveries-service-java/pom.xml   | 10 +++++-----
 .../build.sbt                                          |  8 ++++----
 .../project/plugins.sbt                                |  2 +-
 samples/grpc/shopping-analytics-service-java/pom.xml   | 10 +++++-----
 .../grpc/shopping-analytics-service-scala/build.sbt    |  8 ++++----
 .../project/plugins.sbt                                |  2 +-
 samples/grpc/shopping-cart-service-java/pom.xml        | 10 +++++-----
 samples/grpc/shopping-cart-service-scala/build.sbt     |  8 ++++----
 .../shopping-cart-service-scala/project/plugins.sbt    |  2 +-
 samples/replicated/shopping-cart-service-java/pom.xml  | 10 +++++-----
 .../replicated/shopping-cart-service-scala/build.sbt   |  8 ++++----
 .../shopping-cart-service-scala/project/plugins.sbt    |  2 +-
 19 files changed, 61 insertions(+), 61 deletions(-)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 352b1853e..0fe370bf1 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -20,11 +20,11 @@ object Dependencies {
 
   object Versions {
     val akka = sys.props.getOrElse("build.akka.version", "2.9.0")
-    val akkaPersistenceCassandra = "1.2.0-M1"
-    val akkaPersistenceJdbc = "5.3.0-M1"
-    val akkaPersistenceR2dbc = "1.2.0-M7"
-    val alpakka = "7.0.0-M2"
-    val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "5.0.0-M1")
+    val akkaPersistenceCassandra = "1.2.0"
+    val akkaPersistenceJdbc = "5.3.0"
+    val akkaPersistenceR2dbc = "1.2.0"
+    val alpakka = "7.0.0"
+    val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "5.0.0")
     val slick = "3.4.1"
     val scalaTest = "3.2.17"
     val testContainers = "1.19.1"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f5befb1e6..1c0f3f177 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -7,7 +7,7 @@ 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.0-M2")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
 
 // Documentation
 addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.53")
diff --git a/samples/grpc/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt
index fe6b8ec66..8c27fa510 100644
--- a/samples/grpc/iot-service-scala/build.sbt
+++ b/samples/grpc/iot-service-scala/build.sbt
@@ -29,12 +29,12 @@ run / javaOptions ++= sys.props
 Global / cancelable := false // ctrl-c
 
 val AkkaVersion = "2.9.0"
-val AkkaHttpVersion = "10.6.0-M2"
-val AkkaManagementVersion = "1.5.0-M1"
-val AkkaPersistenceR2dbcVersion = "1.2.0-M7"
+val AkkaHttpVersion = "10.6.0"
+val AkkaManagementVersion = "1.5.0"
+val AkkaPersistenceR2dbcVersion = "1.2.0"
 val AkkaProjectionVersion =
   sys.props.getOrElse("akka-projection.version", "1.5.0-M5")
-val AkkaDiagnosticsVersion = "2.1.0-M1"
+val AkkaDiagnosticsVersion = "2.1.0"
 
 enablePlugins(AkkaGrpcPlugin)
 
diff --git a/samples/grpc/iot-service-scala/project/plugins.sbt b/samples/grpc/iot-service-scala/project/plugins.sbt
index 74b196a28..6acc4f98f 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.0-M2")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.13")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
diff --git a/samples/grpc/local-drone-control-java/pom.xml b/samples/grpc/local-drone-control-java/pom.xml
index 48adfd8e7..4b16c3d74 100644
--- a/samples/grpc/local-drone-control-java/pom.xml
+++ b/samples/grpc/local-drone-control-java/pom.xml
@@ -19,12 +19,12 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.0</akka.version>
         <akka-projection.version>1.5.0-M5</akka-projection.version>
-        <akka-persistence-r2dbc.version>1.2.0-M7</akka-persistence-r2dbc.version>
-        <akka-management.version>1.5.0-M1</akka-management.version>
-        <akka-diagnostics.version>2.1.0-M1</akka-diagnostics.version>
+        <akka-persistence-r2dbc.version>1.2.0</akka-persistence-r2dbc.version>
+        <akka-management.version>1.5.0</akka-management.version>
+        <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
         <akka-http.version>10.5.1</akka-http.version>
-        <akka-grpc.version>2.4.0-M2</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.0-M2</akka-grpc-maven-plugin.version>
+        <akka-grpc.version>2.4.0</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.0</akka-grpc-maven-plugin.version>
         <logback.version>1.3.11</logback.version>
         <prometheus.client.version>0.16.0</prometheus.client.version>
         <junit.version>4.13.1</junit.version>
diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt
index e5a652e2c..991099d69 100644
--- a/samples/grpc/local-drone-control-scala/build.sbt
+++ b/samples/grpc/local-drone-control-scala/build.sbt
@@ -32,12 +32,12 @@ run / javaOptions ++= sys.props
 Global / cancelable := false // ctrl-c
 
 val AkkaVersion = "2.9.0"
-val AkkaHttpVersion = "10.6.0-M2"
-val AkkaManagementVersion = "1.5.0-M1"
-val AkkaPersistenceR2dbcVersion = "1.2.0-M7"
+val AkkaHttpVersion = "10.6.0"
+val AkkaManagementVersion = "1.5.0"
+val AkkaPersistenceR2dbcVersion = "1.2.0"
 val AkkaProjectionVersion =
   sys.props.getOrElse("akka-projection.version", "1.5.0-M5")
-val AkkaDiagnosticsVersion = "2.1.0-M1"
+val AkkaDiagnosticsVersion = "2.1.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 f207e0896..f754830c7 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.0-M2")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
diff --git a/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml b/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
index e8fe78fcf..05215b96a 100644
--- a/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
+++ b/samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
@@ -19,11 +19,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.0</akka.version>
         <akka-projection.version>1.5.0-M5</akka-projection.version>
-        <akka-persistence-r2dbc.version>1.2.0-M6</akka-persistence-r2dbc.version>
-        <akka-management.version>1.5.0-M1</akka-management.version>
-        <akka-diagnostics.version>2.1.0-M1</akka-diagnostics.version>
-        <akka-grpc.version>2.4.0-M2</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.0-M2</akka-grpc-maven-plugin.version>
+        <akka-persistence-r2dbc.version>1.2.0</akka-persistence-r2dbc.version>
+        <akka-management.version>1.5.0</akka-management.version>
+        <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
+        <akka-grpc.version>2.4.0</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.0</akka-grpc-maven-plugin.version>
         <logback.version>1.3.6</logback.version>
         <junit.version>4.13.1</junit.version>
         <scala.binary.version>2.13</scala.binary.version>
diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
index f337693f0..e0587f2cb 100644
--- a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
+++ b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
@@ -29,12 +29,12 @@ run / javaOptions ++= sys.props
 Global / cancelable := false // ctrl-c
 
 val AkkaVersion = "2.9.0"
-val AkkaHttpVersion = "10.6.0-M2"
-val AkkaManagementVersion = "1.5.0-M1"
-val AkkaPersistenceR2dbcVersion = "1.2.0-M6"
+val AkkaHttpVersion = "10.6.0"
+val AkkaManagementVersion = "1.5.0"
+val AkkaPersistenceR2dbcVersion = "1.2.0"
 val AkkaProjectionVersion =
   sys.props.getOrElse("akka-projection.version", "1.5.0-M5")
-val AkkaDiagnosticsVersion = "2.1.0-M1"
+val AkkaDiagnosticsVersion = "2.1.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 a67d93487..088153b07 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.4.0-M2")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
diff --git a/samples/grpc/shopping-analytics-service-java/pom.xml b/samples/grpc/shopping-analytics-service-java/pom.xml
index f6401d7bf..83225b1c0 100644
--- a/samples/grpc/shopping-analytics-service-java/pom.xml
+++ b/samples/grpc/shopping-analytics-service-java/pom.xml
@@ -19,11 +19,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.0</akka.version>
         <akka-projection.version>1.5.0-M5</akka-projection.version>
-        <akka-persistence-r2dbc.version>1.2.0-M7</akka-persistence-r2dbc.version>
-        <akka-management.version>1.5.0-M1</akka-management.version>
-        <akka-diagnostics.version>2.1.0-M1</akka-diagnostics.version>
-        <akka-grpc.version>2.4.0-M2</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.0-M2</akka-grpc-maven-plugin.version>
+        <akka-persistence-r2dbc.version>1.2.0</akka-persistence-r2dbc.version>
+        <akka-management.version>1.5.0</akka-management.version>
+        <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
+        <akka-grpc.version>2.4.0</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.0</akka-grpc-maven-plugin.version>
         <logback.version>1.3.6</logback.version>
         <junit.version>4.13.1</junit.version>
         <scala.binary.version>2.13</scala.binary.version>
diff --git a/samples/grpc/shopping-analytics-service-scala/build.sbt b/samples/grpc/shopping-analytics-service-scala/build.sbt
index 496155f56..3f441b88f 100644
--- a/samples/grpc/shopping-analytics-service-scala/build.sbt
+++ b/samples/grpc/shopping-analytics-service-scala/build.sbt
@@ -29,12 +29,12 @@ run / javaOptions ++= sys.props
 Global / cancelable := false // ctrl-c
 
 val AkkaVersion = "2.9.0"
-val AkkaHttpVersion = "10.6.0-M2"
-val AkkaManagementVersion = "1.5.0-M1"
-val AkkaPersistenceR2dbcVersion = "1.2.0-M7"
+val AkkaHttpVersion = "10.6.0"
+val AkkaManagementVersion = "1.5.0"
+val AkkaPersistenceR2dbcVersion = "1.2.0"
 val AkkaProjectionVersion =
   sys.props.getOrElse("akka-projection.version", "1.5.0-M5")
-val AkkaDiagnosticsVersion = "2.1.0-M1"
+val AkkaDiagnosticsVersion = "2.1.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 a67d93487..088153b07 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.0-M2")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
diff --git a/samples/grpc/shopping-cart-service-java/pom.xml b/samples/grpc/shopping-cart-service-java/pom.xml
index 5a215b321..d785da0fa 100644
--- a/samples/grpc/shopping-cart-service-java/pom.xml
+++ b/samples/grpc/shopping-cart-service-java/pom.xml
@@ -19,11 +19,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.0</akka.version>
         <akka-projection.version>1.5.0-M5</akka-projection.version>
-        <akka-persistence-r2dbc.version>1.2.0-M7</akka-persistence-r2dbc.version>
-        <akka-management.version>1.5.0-M1</akka-management.version>
-        <akka-diagnostics.version>2.1.0-M1</akka-diagnostics.version>
-        <akka-grpc.version>2.4.0-M2</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.0-M2</akka-grpc-maven-plugin.version>
+        <akka-persistence-r2dbc.version>1.2.0</akka-persistence-r2dbc.version>
+        <akka-management.version>1.5.0</akka-management.version>
+        <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
+        <akka-grpc.version>2.4.0</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.0</akka-grpc-maven-plugin.version>
         <logback.version>1.3.6</logback.version>
         <junit.version>4.13.1</junit.version>
         <scala.binary.version>2.13</scala.binary.version>
diff --git a/samples/grpc/shopping-cart-service-scala/build.sbt b/samples/grpc/shopping-cart-service-scala/build.sbt
index 5b75beb20..6454abf20 100644
--- a/samples/grpc/shopping-cart-service-scala/build.sbt
+++ b/samples/grpc/shopping-cart-service-scala/build.sbt
@@ -29,12 +29,12 @@ run / javaOptions ++= sys.props
 Global / cancelable := false // ctrl-c
 
 val AkkaVersion = "2.9.0"
-val AkkaHttpVersion = "10.6.0-M2"
-val AkkaManagementVersion = "1.5.0-M1"
-val AkkaPersistenceR2dbcVersion = "1.2.0-M7"
+val AkkaHttpVersion = "10.6.0"
+val AkkaManagementVersion = "1.5.0"
+val AkkaPersistenceR2dbcVersion = "1.2.0"
 val AkkaProjectionVersion =
   sys.props.getOrElse("akka-projection.version", "1.5.0-M5")
-val AkkaDiagnosticsVersion = "2.1.0-M1"
+val AkkaDiagnosticsVersion = "2.1.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 a67d93487..088153b07 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.0-M2")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
diff --git a/samples/replicated/shopping-cart-service-java/pom.xml b/samples/replicated/shopping-cart-service-java/pom.xml
index 16f68f3c3..5a254dadc 100644
--- a/samples/replicated/shopping-cart-service-java/pom.xml
+++ b/samples/replicated/shopping-cart-service-java/pom.xml
@@ -19,11 +19,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <akka.version>2.9.0</akka.version>
         <akka-projection.version>1.5.0-M5</akka-projection.version>
-        <akka-persistence-r2dbc.version>1.2.0-M7</akka-persistence-r2dbc.version>
-        <akka-management.version>1.5.0-M1</akka-management.version>
-        <akka-diagnostics.version>2.1.0-M1</akka-diagnostics.version>
-        <akka-grpc.version>2.4.0-M2</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.0-M2</akka-grpc-maven-plugin.version>
+        <akka-persistence-r2dbc.version>1.2.0</akka-persistence-r2dbc.version>
+        <akka-management.version>1.5.0</akka-management.version>
+        <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
+        <akka-grpc.version>2.4.0</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.0</akka-grpc-maven-plugin.version>
         <logback.version>1.3.6</logback.version>
         <junit.version>4.13.1</junit.version>
         <scala.binary.version>2.13</scala.binary.version>
diff --git a/samples/replicated/shopping-cart-service-scala/build.sbt b/samples/replicated/shopping-cart-service-scala/build.sbt
index 3315ce651..ea873a018 100644
--- a/samples/replicated/shopping-cart-service-scala/build.sbt
+++ b/samples/replicated/shopping-cart-service-scala/build.sbt
@@ -30,12 +30,12 @@ run / javaOptions ++= sys.props
 Global / cancelable := false // ctrl-c
 
 val AkkaVersion = sys.props.getOrElse("akka.version", "2.9.0")
-val AkkaHttpVersion = "10.6.0-M2"
-val AkkaManagementVersion = "1.5.0-M1"
-val AkkaPersistenceR2dbcVersion = "1.2.0-M7"
+val AkkaHttpVersion = "10.6.0"
+val AkkaManagementVersion = "1.5.0"
+val AkkaPersistenceR2dbcVersion = "1.2.0"
 val AkkaProjectionVersion =
   sys.props.getOrElse("akka-projection.version", "1.5.0-M5")
-val AkkaDiagnosticsVersion = "2.1.0-M1"
+val AkkaDiagnosticsVersion = "2.1.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 a67d93487..088153b07 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.4.0-M2")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
 addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")