diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 811b1f98..49f97991 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,7 +6,7 @@ You're always welcome to submit your PR straight away and start the discussion (
# The Akka Community
-In case of questions about the contribution process or for discussion of specific issues please visit the [akka/dev gitter chat](https://gitter.im/akka/dev).
+In case of questions about the contribution process or for discussion of specific issues please visit the [akka forum](https://discuss.akka.io/).
You may also check out these [other resources](https://akka.io/get-involved/).
@@ -21,7 +21,7 @@ This is the process for committing code into master.
5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that the maintainers can consist of outside contributors, both within and outside Lightbend. Outside contributors are encouraged to participate in the review process, it is not a closed process.
6. After the review you should fix the issues (review comments, CI failures) by pushing a new commit for new review, iterating until the reviewers give their thumbs up and CI tests pass.
-In case of questions about the contribution process or for discussion of specific issues please visit the [akka/dev gitter chat](https://gitter.im/akka/dev).
+In case of questions about the contribution process or for discussion of specific issues please visit the [akka forum](https://discuss.akka.io/).
## Pull Request Requirements
diff --git a/LICENSE b/LICENSE
index ea1fc0b6..49127dbb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -3,7 +3,7 @@ Business Source License 1.1
Parameters
Licensor: Lightbend, Inc.
-Licensed Work: Akka Management 1.5.3
+Licensed Work: Akka Management 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-08-08
+Change Date: 2027-10-24
Change License: Apache License, Version 2.0
diff --git a/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md b/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md
index a24c1507..4eca5a2b 100644
--- a/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md
+++ b/docs/src/main/paradox/kubernetes-deployment/forming-a-cluster.md
@@ -14,7 +14,7 @@ discover this automatically using the Kubernetes API. The process is roughly as
5. The pod that is decided to start the cluster forms a cluster with itself.
6. The remaining pods poll that pod until it reports that it has formed a cluster, they then join it.
-For a much more detailed description of this process, see the [Akka Cluster Bootstrap documentation](https://developer.lightbend.com/docs/akka-management/current/bootstrap/details.html).
+For a much more detailed description of this process, see the [Akka Cluster Bootstrap documentation](https://doc.akka.io/docs/akka-management/current/bootstrap/details.html).
## Bootstrap and Management dependencies
diff --git a/integration-test/dns-api-mesos/build.sbt b/integration-test/dns-api-mesos/build.sbt
index 54983d20..1a4ac5ad 100644
--- a/integration-test/dns-api-mesos/build.sbt
+++ b/integration-test/dns-api-mesos/build.sbt
@@ -14,4 +14,4 @@ libraryDependencies += "com.lightbend.akka.management" %% "akka-management-clust
libraryDependencies += "com.lightbend.akka.management" %% "akka-management-cluster-http" % akkaManagementVersion(
version.value)
-libraryDependencies += "com.typesafe.akka" %% "akka-discovery" % "2.10.0-M1"
+libraryDependencies += "com.typesafe.akka" %% "akka-discovery" % "2.10.0"
diff --git a/integration-test/kubernetes-api-java/pom.xml b/integration-test/kubernetes-api-java/pom.xml
index bc163d21..e481495d 100644
--- a/integration-test/kubernetes-api-java/pom.xml
+++ b/integration-test/kubernetes-api-java/pom.xml
@@ -17,8 +17,8 @@
UTF-8
11
- 2.10.0-M1
- 10.7.0-M1
+ 2.10.0
+ 10.7.0
1.5.2
2.13
diff --git a/native-image-tests/build.sbt b/native-image-tests/build.sbt
index 0c0e6afa..539e8ec1 100644
--- a/native-image-tests/build.sbt
+++ b/native-image-tests/build.sbt
@@ -6,8 +6,8 @@ scalaVersion := "2.13.15"
resolvers += "Akka library repository".at("https://repo.akka.io/maven")
-lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.0-M1")
-lazy val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.7.0-M1")
+lazy val akkaVersion = sys.props.getOrElse("akka.version", "2.10.0")
+lazy val akkaHttpVersion = sys.props.getOrElse("akka.http.version", "10.7.0")
// Note: this default isn't really used anywhere so not important to bump
lazy val akkaManagementVersion = sys.props.getOrElse("akka.management.version", "1.5.2")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 1c68a18d..ad134f49 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -11,10 +11,10 @@ object Dependencies {
val CrossScalaVersions = Seq(Scala213, Scala3)
// Align the versions in integration-test/kubernetes-api-java/pom.xml
- val AkkaVersion = "2.10.0-M1"
+ val AkkaVersion = "2.10.0"
val AkkaBinaryVersion = VersionNumber(AkkaVersion).numbers match { case Seq(major, minor, _*) => s"$major.$minor" }
// Align the versions in integration-test/kubernetes-api-java/pom.xml
- val AkkaHttpVersion = "10.7.0-M1"
+ val AkkaHttpVersion = "10.7.0"
val AkkaHttpBinaryVersion = VersionNumber(AkkaHttpVersion).numbers match {
case Seq(major, minor, _*) => s"$major.$minor"
}
diff --git a/project/plugins.sbt b/project/plugins.sbt
index d75f2deb..b4a9d325 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,9 +1,11 @@
+resolvers += "Akka library repository".at("https://repo.akka.io/maven")
+
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.3")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
-addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.57")
+addSbtPlugin("io.akka" % "sbt-paradox-akka" % "24.10.3")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.3")
diff --git a/project/project-info.conf b/project/project-info.conf
index 0e1e0c10..2c81aa17 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -18,7 +18,7 @@ project-info {
forums: [
{
text: "Lightbend Discuss"
- url: "https://discuss.lightbend.com/c/akka/"
+ url: "https://discuss.akka.com/"
}
]
api-docs: [
diff --git a/samples/akka-sample-cluster-kubernetes-java/pom.xml b/samples/akka-sample-cluster-kubernetes-java/pom.xml
index 475b1033..d83aa09d 100644
--- a/samples/akka-sample-cluster-kubernetes-java/pom.xml
+++ b/samples/akka-sample-cluster-kubernetes-java/pom.xml
@@ -10,9 +10,9 @@
17
17
UTF-8
- 2.10.0-M1
- 1.5.3
- 10.7.0-M1
+ 2.10.0
+ 1.6.0
+ 10.7.0
2.13
${git.commit.time}-${git.commit.id.abbrev}
diff --git a/samples/akka-sample-cluster-kubernetes-scala/build.sbt b/samples/akka-sample-cluster-kubernetes-scala/build.sbt
index e179f0a0..24153524 100644
--- a/samples/akka-sample-cluster-kubernetes-scala/build.sbt
+++ b/samples/akka-sample-cluster-kubernetes-scala/build.sbt
@@ -3,9 +3,9 @@ ThisBuild / organization := "com.lightbend"
name := "akka-sample-cluster-kubernetes"
scalaVersion := "2.13.15"
-lazy val akkaHttpVersion = "10.6.3"
-lazy val akkaVersion = "2.9.3"
-lazy val akkaManagementVersion = "1.5.3"
+lazy val akkaHttpVersion = "10.7.0"
+lazy val akkaVersion = "2.10.0"
+lazy val akkaManagementVersion = "1.6.0"
// make version compatible with docker for publishing
ThisBuild / dynverSeparator := "-"