diff --git a/LICENSE b/LICENSE index eb26cbf5ff..ea52dc3c74 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ Business Source License 1.1 Parameters Licensor: Lightbend, Inc. -Licensed Work: Alpakka 8.0.0 +Licensed Work: Alpakka 9.0.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-14 +Change Date: 2027-10-24 Change License: Apache License, Version 2.0 diff --git a/README.md b/README.md index e391176b99..34e32dd958 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Community You can join these forums and chats to discuss and ask Akka and Alpakka related questions: -- Forums: [discuss.lightbend.com](https://discuss.lightbend.com/c/akka/streams-and-alpakka) +- Forums: [discuss.akka.io.](https://discuss.akka.io/c/akka/streams-and-alpakka) - Issue tracker: [github.com/akka/alpakka/issues](https://github.com/akka/alpakka/issues) In addition to that, you may enjoy the following: diff --git a/docs/src/main/paradox/release-notes/2.0.x.md b/docs/src/main/paradox/release-notes/2.0.x.md index f8531e1eb5..de07f090c2 100644 --- a/docs/src/main/paradox/release-notes/2.0.x.md +++ b/docs/src/main/paradox/release-notes/2.0.x.md @@ -147,7 +147,7 @@ Released 2020-04-30 - **Alpakka 2.0 updates dependencies for most connectors.** - **Alpakka 2.0 requires Akka 2.5.31 or Akka 2.6.4.** We recommend upgrading your projects to the latest versions of Akka. -- Many Alpakka APIs haven't changed since Alpakka 1.0. We hope adapting to the changes will be easy. For the time being we don't have dedicated migration guides. Please reach out in the [Discuss forum](https://discuss.lightbend.com/c/akka/streams-and-alpakka) if you run into problems. +- Many Alpakka APIs haven't changed since Alpakka 1.0. We hope adapting to the changes will be easy. For the time being we don't have dedicated migration guides. Please reach out in the [Discuss forum](https://discuss.akka.io/c/akka/streams-and-alpakka) if you run into problems. ## Major new functionality diff --git a/project/Dependencies.scala b/project/Dependencies.scala index e29c46053a..8d61c82c65 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val Scala2Versions = Seq(Scala213) val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3 - val AkkaVersion = "2.10.0-M1" + val AkkaVersion = "2.10.0" val AkkaBinaryVersion = VersionNumber(AkkaVersion).numbers match { case Seq(major, minor, _*) => s"$major.$minor" } val InfluxDBJavaVersion = "2.15" @@ -24,11 +24,11 @@ object Dependencies { // Sync with plugins.sbt val AkkaGrpcBinaryVersion = "2.5" // sync ignore prefix in scripts/link-validator.conf#L30 - val AkkaHttpVersion = "10.7.0-M1" + val AkkaHttpVersion = "10.7.0" val AkkaHttpBinaryVersion = VersionNumber(AkkaHttpVersion).numbers match { case Seq(major, minor, _*) => s"$major.$minor" } - val AlpakkaKafkaVersion = "7.0.0-M1" + val AlpakkaKafkaVersion = "7.0.0" val ScalaTestVersion = "3.2.19" val TestContainersScalaTestVersion = "0.40.3" // pulls Testcontainers 1.16.2 val mockitoVersion = "5.13.0" // check even https://github.com/scalatest/scalatestplus-mockito/releases diff --git a/project/plugins.sbt b/project/plugins.sbt index cd986dde0b..fd1945a9af 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -8,7 +8,7 @@ addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4") addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0") // 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-unidoc" % "0.5.0") diff --git a/project/project-info.conf b/project/project-info.conf index 82d322ed3f..2db3f66cc4 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -20,7 +20,7 @@ project-info { forums: [ { text: "Lightbend Discuss" - url: "https://discuss.lightbend.com/c/akka/" + url: "https://discuss.akka.com/c/akka/" } ] }