bump: Akka gRPC 2.4.4, Akka 2.9.6 (#1213)

* silence warnings in generated code from akka-grpc * protobuf-java version in samples
akka · Oct 2, 2024 · c3b447e · c3b447e
1 parent 605cab4
commit c3b447e
Show file tree

Hide file tree

Showing 28 changed files with 41 additions and 40 deletions.
diff --git a/.github/workflows/integration-tests-cassandra.yml b/.github/workflows/integration-tests-cassandra.yml
@@ -48,7 +48,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-cassandra-integration/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-cassandra-integration/test" ${{ matrix.extraOpts }} -Dakka.warn-on-no-license-key=false
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-grpc.yml b/.github/workflows/integration-tests-grpc.yml
@@ -48,7 +48,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-grpc-integration/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-grpc-integration/test" ${{ matrix.extraOpts }} -Dakka.warn-on-no-license-key=false
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-jdbc.yml b/.github/workflows/integration-tests-jdbc.yml
@@ -51,7 +51,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-jdbc-integration/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-jdbc-integration/test" ${{ matrix.extraOpts }} -Dakka.warn-on-no-license-key=false
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml
@@ -47,7 +47,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-kafka-integration/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-kafka-integration/test" ${{ matrix.extraOpts }} -Dakka.warn-on-no-license-key=false
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/integration-tests-r2dbc-mssql.yml b/.github/workflows/integration-tests-r2dbc-mssql.yml
@@ -51,4 +51,4 @@ jobs:
 
       - name: Run integration tests with with Scala and Java ${{ matrix.jdkVersion }}
         run: |-
-          sbt -Dconfig.resource=application-sqlserver.conf akka-projection-r2dbc-integration/test
+          sbt -Dconfig.resource=application-sqlserver.conf -Dakka.warn-on-no-license-key=false akka-projection-r2dbc-integration/test
diff --git a/.github/workflows/integration-tests-r2dbc.yml b/.github/workflows/integration-tests-r2dbc.yml
@@ -53,7 +53,7 @@ jobs:
       - name: Run integration tests with with Scala and Java ${{ matrix.jdkVersion }}
         # -Dconf.resource=application-postgres.conf but it's the default through application.conf as well
         run: |-
-          sbt akka-projection-r2dbc-integration/test
+          sbt akka-projection-r2dbc-integration/test -Dakka.warn-on-no-license-key=false
 
   test-r2dbc-yugabyte:
     name: Run r2dbc tests with Yugabyte

diff --git a/.github/workflows/integration-tests-slick.yml b/.github/workflows/integration-tests-slick.yml
@@ -51,7 +51,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run all integration tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "akka-projection-slick-integration/test" ${{ matrix.extraOpts }}
+        run: sbt "akka-projection-slick-integration/test" ${{ matrix.extraOpts }} -Dakka.warn-on-no-license-key=false
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -48,7 +48,7 @@ jobs:
           jvm: ${{ matrix.jvmName }}
 
       - name: Run tests with default Scala and Java ${{ matrix.jdkVersion }}
-        run: sbt "test" ${{ matrix.extraOpts }}
+        run: sbt "test" ${{ matrix.extraOpts }} -Dakka.warn-on-no-license-key=false
 
       - name: Print logs on failure
         if: ${{ failure() }}

diff --git a/project/AkkaDisciplinePlugin.scala b/project/AkkaDisciplinePlugin.scala
@@ -76,6 +76,7 @@ object AkkaDisciplinePlugin extends AutoPlugin {
     "-Ywarn-nullary-unit",
     "-Ywarn-unused:_",
     "-Ypartial-unification",
-    "-Ywarn-extra-implicit")
+    "-Ywarn-extra-implicit",
+    "-Wconf:src=.*.txt.*:silent,src=.*target.*akka-grpc.*:silent")
 
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -19,7 +19,7 @@ object Dependencies {
   val AkkaProjectionVersionInDocs = "1.5"
 
   object Versions {
-    val akka = sys.props.getOrElse("build.akka.version", "2.9.5")
+    val akka = sys.props.getOrElse("build.akka.version", "2.9.6")
     val akkaPersistenceCassandra = "1.2.1"
     val akkaPersistenceJdbc = "5.4.1"
     val akkaPersistenceR2dbc = "1.2.4"

diff --git 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.6.1")
 
 // remember to bump in samples/grpc/ projects as well if changing
-addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.3")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.4")
 
 // Documentation
 addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.57")

diff --git a/samples/grpc/iot-service-java/pom.xml b/samples/grpc/iot-service-java/pom.xml
@@ -17,13 +17,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <akka.version>2.9.5</akka.version>
+        <akka.version>2.9.6</akka.version>
         <akka-projection.version>1.5.6</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.2</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
-        <akka-grpc.version>2.4.3</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.3</akka-grpc-maven-plugin.version>
+        <akka-grpc.version>2.4.4</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.4</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/iot-service-scala/build.sbt b/samples/grpc/iot-service-scala/build.sbt
@@ -28,7 +28,7 @@ run / javaOptions ++= sys.props
   .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
 Global / cancelable := false // ctrl-c
 
-val AkkaVersion = "2.9.5"
+val AkkaVersion = "2.9.6"
 val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"

diff --git 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.3")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.4")
 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
@@ -17,19 +17,19 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <akka.version>2.9.5</akka.version>
+        <akka.version>2.9.6</akka.version>
         <akka-projection.version>1.5.6</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.2</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
         <akka-http.version>10.6.3</akka-http.version>
-        <akka-grpc.version>2.4.3</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.3</akka-grpc-maven-plugin.version>
+        <akka-grpc.version>2.4.4</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.4</akka-grpc-maven-plugin.version>
         <logback.version>1.2.13</logback.version>
         <prometheus.client.version>0.16.0</prometheus.client.version>
         <junit.version>4.13.1</junit.version>
         <scala.binary.version>2.13</scala.binary.version>
-        <protobuf-java.version>3.22.2</protobuf-java.version>
+        <protobuf-java.version>3.25.5</protobuf-java.version>
         <native.maven.plugin.version>0.9.26</native.maven.plugin.version>
         <mainClass>local.drones.Main</mainClass>
         <!-- needs to be defined to allow for overriding through mvn exec:exec -DAPP_CONFIG=local1.conf -->

diff --git a/samples/grpc/local-drone-control-scala/build.sbt b/samples/grpc/local-drone-control-scala/build.sbt
@@ -30,7 +30,7 @@ run / javaOptions ++= sys.props
   .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
 Global / cancelable := false // ctrl-c
 
-val AkkaVersion = "2.9.5"
+val AkkaVersion = "2.9.6"
 val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"

diff --git 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.3")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.4")
 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
@@ -17,17 +17,17 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <akka.version>2.9.5</akka.version>
+        <akka.version>2.9.6</akka.version>
         <akka-projection.version>1.5.2</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.1</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
-        <akka-grpc.version>2.4.3</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.3</akka-grpc-maven-plugin.version>
+        <akka-grpc.version>2.4.4</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.4</akka-grpc-maven-plugin.version>
         <logback.version>1.2.13</logback.version>
         <junit.version>4.13.1</junit.version>
         <scala.binary.version>2.13</scala.binary.version>
-        <protobuf-java.version>3.22.2</protobuf-java.version>
+        <protobuf-java.version>3.25.5</protobuf-java.version>
         <!-- needs to be defined to allow for overriding through mvn exec:exec -DAPP_CONFIG=local1.conf -->
         <APP_CONFIG>application.conf</APP_CONFIG>
         <!-- Version of the Docker image is derived from git commit.

diff --git a/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt b/samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
@@ -28,7 +28,7 @@ run / javaOptions ++= sys.props
   .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
 Global / cancelable := false // ctrl-c
 
-val AkkaVersion = "2.9.5"
+val AkkaVersion = "2.9.6"
 val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"

diff --git 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.3")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.4")
 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
@@ -17,13 +17,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <akka.version>2.9.5</akka.version>
+        <akka.version>2.9.6</akka.version>
         <akka-projection.version>1.5.6</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.1</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
-        <akka-grpc.version>2.4.3</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.3</akka-grpc-maven-plugin.version>
+        <akka-grpc.version>2.4.4</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.4</akka-grpc-maven-plugin.version>
         <logback.version>1.2.13</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
@@ -28,7 +28,7 @@ run / javaOptions ++= sys.props
   .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
 Global / cancelable := false // ctrl-c
 
-val AkkaVersion = "2.9.5"
+val AkkaVersion = "2.9.6"
 val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.1"
 val AkkaPersistenceR2dbcVersion = "1.2.5"

diff --git 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.3")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.4")
 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
@@ -17,13 +17,13 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <akka.version>2.9.5</akka.version>
+        <akka.version>2.9.6</akka.version>
         <akka-projection.version>1.5.6</akka-projection.version>
         <akka-persistence-r2dbc.version>1.2.5</akka-persistence-r2dbc.version>
         <akka-management.version>1.5.1</akka-management.version>
         <akka-diagnostics.version>2.1.0</akka-diagnostics.version>
-        <akka-grpc.version>2.4.3</akka-grpc.version>
-        <akka-grpc-maven-plugin.version>2.4.3</akka-grpc-maven-plugin.version>
+        <akka-grpc.version>2.4.4</akka-grpc.version>
+        <akka-grpc-maven-plugin.version>2.4.4</akka-grpc-maven-plugin.version>
         <logback.version>1.2.13</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
@@ -28,7 +28,7 @@ run / javaOptions ++= sys.props
   .fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
 Global / cancelable := false // ctrl-c
 
-val AkkaVersion = "2.9.5"
+val AkkaVersion = "2.9.6"
 val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"

diff --git 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.3")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.4")
 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-scala/build.sbt b/samples/replicated/shopping-cart-service-scala/build.sbt
@@ -29,7 +29,7 @@ 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.9.5")
+val AkkaVersion = sys.props.getOrElse("akka.version", "2.9.6")
 val AkkaHttpVersion = "10.6.3"
 val AkkaManagementVersion = "1.5.2"
 val AkkaPersistenceR2dbcVersion = "1.2.5"

diff --git 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.3")
+addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.4")
 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")