chore: Pre release 24.10 (#1995)

* chore: bump license for 24.10 * chore: bump version in samples * bump: akka to 2.10.0 * bump: sbt-paradox-akka to 24.10.3 * chore: remove reference to gitter * docs: remove link to kubernetes grpc sample * docs: remove link to support terminology * bump: akka-http to 10.7.0
akka · Oct 23, 2024 · 4337aba · 4337aba
1 parent da18232
commit 4337aba
Show file tree

Hide file tree

Showing 20 changed files with 40 additions and 42 deletions.
diff --git a/LICENSE b/LICENSE
@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Lightbend, Inc.
-Licensed Work:        Akka gRPC 2.4.3
+Licensed Work:        Akka gRPC 2.5.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-05-08
+Change Date:          2027-10-23
 
 Change License:       Apache License, Version 2.0
 

diff --git a/docs/src/main/paradox/deploy.md b/docs/src/main/paradox/deploy.md
@@ -8,10 +8,6 @@ Remember that the cleartext HTTP/2 "h2c with prior knowledge" protocol is not co
 
 To deploy your gRPC service over a HTTPS connection you will have to use an @apidoc[akka.http.(javadsl|scaladsl).HttpsConnectionContext] as described in the @extref[Akka-HTTP documentation](akka-http:server-side/server-https-support.html).
 
-## Example: Kubernetes
-
-As an example, [here](https://developer.lightbend.com/start/?group=akka&project=akka-grpc-sample-kubernetes-scala) is a complete project consisting of two applications (a gRPC service and an HTTP service that consumes the gRPC service) that can be deployed together in Kubernetes.
-
 ## Building Native Images
 
 Building native images with Akka gRPC is supported. None of the functionality requires any special concerns, metadata

diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md
@@ -30,8 +30,7 @@ It features:
 
 ## Project Status
 
-Akka gRPC is [Supported](https://developer.lightbend.com/docs/introduction/getting-help/support-terminology.html)
-for users with an [Akka license](https://www.lightbend.com/akka#pricing).
+Akka gRPC is supported for users with an [Akka license](https://www.lightbend.com/akka#pricing).
 
 Both client- and server-side APIs are based on Akka Streams.
 

diff --git a/native-image-tests/grpc-scala/build.sbt b/native-image-tests/grpc-scala/build.sbt
@@ -4,7 +4,7 @@ version := "1.0"
 
 scalaVersion := "2.13.15"
 
-lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.0-M1")
+lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.0")
 lazy val akkaGrpcVersion = sys.props.getOrElse("akka.grpc.version", "2.4.0")
 
 enablePlugins(AkkaGrpcPlugin)

diff --git a/plugin-tester-java/build.gradle b/plugin-tester-java/build.gradle
@@ -37,7 +37,7 @@ repositories {
 
 def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.13")
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
-def akkaVersion = "2.10.0-M1"
+def akkaVersion = "2.10.0"
 
 tasks.named("processResources") {
  duplicatesStrategy = DuplicatesStrategy.EXCLUDE

diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
@@ -15,7 +15,7 @@
     <maven-dependency-plugin.version>3.1.2</maven-dependency-plugin.version>
     <maven-exec-plugin.version>3.0.0</maven-exec-plugin.version>
     <akka.http.cors.version>1.1.0</akka.http.cors.version>
-    <akka.version>2.10.0-M1</akka.version>
+    <akka.version>2.10.0</akka.version>
     <grpc.version>1.63.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>
     <build-helper-maven-plugin>3.3.0</build-helper-maven-plugin>

diff --git a/plugin-tester-scala/build.gradle b/plugin-tester-scala/build.gradle
@@ -33,7 +33,7 @@ repositories {
 
 def scalaVersion = org.gradle.util.VersionNumber.parse(System.getenv("TRAVIS_SCALA_VERSION") ?: "2.13")
 def scalaBinaryVersion = "${scalaVersion.major}.${scalaVersion.minor}"
-def akkaVersion = "2.10.0-M1"
+def akkaVersion = "2.10.0"
 def protoGoogleCommonVersion = "2.22.0"
 
 tasks.named("processResources") {

diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
@@ -12,7 +12,7 @@
 
   <properties>
     <maven.compiler.release>11</maven.compiler.release>
-    <akka.version>2.10.0-M1</akka.version>
+    <akka.version>2.10.0</akka.version>
     <akka.http.cors.version>0.4.2</akka.http.cors.version>
     <grpc.version>1.63.2</grpc.version> <!-- checked synced by VersionSyncCheckPlugin -->
     <project.encoding>UTF-8</project.encoding>

diff --git a/project/Common.scala b/project/Common.scala
@@ -27,7 +27,7 @@ object Common extends AutoPlugin {
       developers += Developer(
         "contributors",
         "Contributors",
-        "https://gitter.im/akka/dev",
+        "akka[email protected]",
         url("https://github.com/akka/akka-grpc/graphs/contributors")),
       releaseNotesURL := (
         // can't use isSnapshot for some reason related to the trixery we do with benchmark-java including modules from this project

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -22,9 +22,9 @@ object Dependencies {
     // We don't force Akka updates because downstream projects can upgrade
     // themselves. For more information see
     // https://doc.akka.io//docs/akka/current/project/downstream-upgrade-strategy.html
-    val akka = "2.10.0-M1"
+    val akka = "2.10.0"
     val akkaBinary = VersionNumber(akka).numbers match { case Seq(major, minor, _*) => s"$major.$minor" }
-    val akkaHttp = "10.7.0-M1"
+    val akkaHttp = "10.7.0"
     val akkaHttpBinary = VersionNumber(akkaHttp).numbers match { case Seq(major, minor, _*) => s"$major.$minor" }
 
     val grpc = "1.63.2" // checked synced by VersionSyncCheckPlugin

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,3 +1,6 @@
+// for sbt-paradox-akka
+resolvers += "Akka library repository".at("https://repo.akka.io/maven")
+
 enablePlugins(BuildInfoPlugin)
 
 val sbtProtocV = "1.0.7"
@@ -17,7 +20,7 @@ addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.7")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
 
 // docs
-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-site-paradox" % "1.7.0")

diff --git a/samples/akka-grpc-quickstart-java/build.gradle b/samples/akka-grpc-quickstart-java/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 plugins {
   id 'java'
   id 'application'
-  id 'com.lightbend.akka.grpc.gradle' version '2.4.3'
+  id 'com.lightbend.akka.grpc.gradle' version '2.5.0'
 }
 repositories {
   mavenCentral()
@@ -21,15 +21,15 @@ repositories {
 dependencies {
   implementation 'org.scala-lang:scala-library:2.13.13'
 
-  implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.10.0-M1'
-  implementation 'com.typesafe.akka:akka-discovery_2.13:2.10.0-M1'
-  implementation 'com.typesafe.akka:akka-stream_2.13:2.10.0-M1'
-  implementation 'com.typesafe.akka:akka-pki_2.13:2.10.0-M1'
+  implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.10.0'
+  implementation 'com.typesafe.akka:akka-discovery_2.13:2.10.0'
+  implementation 'com.typesafe.akka:akka-stream_2.13:2.10.0'
+  implementation 'com.typesafe.akka:akka-pki_2.13:2.10.0'
 
   implementation 'ch.qos.logback:logback-classic:1.2.13'
 
-  testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.10.0-M1'
-  testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.10.0-M1'
+  testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.10.0'
+  testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.10.0'
   testImplementation 'junit:junit:4.13'
 }
 

diff --git a/samples/akka-grpc-quickstart-java/build.sbt b/samples/akka-grpc-quickstart-java/build.sbt
@@ -2,8 +2,8 @@ name := "akka-grpc-quickstart-java"
 version := "1.0"
 scalaVersion := "2.13.15"
 
-val akkaVersion = "2.10.0-M1"
-lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.4.3")
+val akkaVersion = "2.10.0"
+lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.5.0")
 
 enablePlugins(AkkaGrpcPlugin)
 

diff --git a/samples/akka-grpc-quickstart-java/pom.xml b/samples/akka-grpc-quickstart-java/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <akka.version>2.10.0-M1</akka.version>
-    <akka-grpc.version>2.4.3</akka-grpc.version>
+    <akka.version>2.10.0</akka.version>
+    <akka-grpc.version>2.5.0</akka-grpc.version>
     <scala.binary.version>2.13</scala.binary.version>
     <project.encoding>UTF-8</project.encoding>
   </properties>

diff --git a/samples/akka-grpc-quickstart-java/project/plugins.sbt b/samples/akka-grpc-quickstart-java/project/plugins.sbt
@@ -1,5 +1,5 @@
 resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
 addSbtPlugin(
-  "com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.4.3"
+  "com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0"
 )
diff --git a/samples/akka-grpc-quickstart-scala/build.gradle b/samples/akka-grpc-quickstart-scala/build.gradle
@@ -9,7 +9,7 @@ buildscript {
 plugins {
   id 'java'
   id 'application'
-  id 'com.lightbend.akka.grpc.gradle' version '2.4.3'
+  id 'com.lightbend.akka.grpc.gradle' version '2.5.0'
 }
 repositories {
   mavenCentral()
@@ -21,15 +21,15 @@ repositories {
 dependencies {
   implementation 'org.scala-lang:scala-library:2.13.13'
 
-  implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.10.0-M1'
-  implementation 'com.typesafe.akka:akka-discovery_2.13:2.10.0-M1'
-  implementation 'com.typesafe.akka:akka-stream_2.13:2.10.0-M1'
-  implementation 'com.typesafe.akka:akka-pki_2.13:2.10.0-M1'
+  implementation 'com.typesafe.akka:akka-actor-typed_2.13:2.10.0'
+  implementation 'com.typesafe.akka:akka-discovery_2.13:2.10.0'
+  implementation 'com.typesafe.akka:akka-stream_2.13:2.10.0'
+  implementation 'com.typesafe.akka:akka-pki_2.13:2.10.0'
 
   implementation 'ch.qos.logback:logback-classic:1.2.13'
 
-  testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.10.0-M1'
-  testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.10.0-M1'
+  testImplementation 'com.typesafe.akka:akka-actor-testkit-typed_2.13:2.10.0'
+  testImplementation 'com.typesafe.akka:akka-stream-testkit_2.13:2.10.0'
   testImplementation 'org.scalatest:scalatest_2.13:3.2.12'
   // optional in Scalatest
   testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'

diff --git a/samples/akka-grpc-quickstart-scala/build.sbt b/samples/akka-grpc-quickstart-scala/build.sbt
@@ -3,8 +3,8 @@ name := "akka-grpc-quickstart-scala"
 version := "1.0"
 scalaVersion := "2.13.15"
 
-val akkaVersion = "2.10.0-M1"
-lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.4.3")
+val akkaVersion = "2.10.0"
+lazy val akkaGrpcVersion = sys.props.getOrElse("akka-grpc.version", "2.5.0")
 
 enablePlugins(AkkaGrpcPlugin)
 

diff --git a/samples/akka-grpc-quickstart-scala/pom.xml b/samples/akka-grpc-quickstart-scala/pom.xml
@@ -11,8 +11,8 @@
   <properties>
     <maven.compiler.source>17</maven.compiler.source>
     <maven.compiler.target>17</maven.compiler.target>
-    <akka.version>2.10.0-M1</akka.version>
-    <akka-grpc.version>2.4.3</akka-grpc.version>
+    <akka.version>2.10.0</akka.version>
+    <akka-grpc.version>2.5.0</akka-grpc.version>
     <scala.binary.version>2.13</scala.binary.version>
     <project.encoding>UTF-8</project.encoding>
   </properties>

diff --git a/samples/akka-grpc-quickstart-scala/project/plugins.sbt b/samples/akka-grpc-quickstart-scala/project/plugins.sbt
@@ -1,3 +1,3 @@
 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.5.0")
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt b/sbt-plugin/src/sbt-test/gen-scala-server/07-gen-basic-server-with-akka-27/build.sbt
@@ -4,7 +4,7 @@ resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
 enablePlugins(AkkaGrpcPlugin)
 
-dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.10.0-M1"
+dependencyOverrides += "com.typesafe.akka" %% "akka-stream" % "2.10.0"
 
 assembly / assemblyMergeStrategy := {
   // https://github.com/akka/akka/issues/29456