Skip to content

Commit

Permalink
Merge pull request #1334 from akka/pre-release-24.10
Browse files Browse the repository at this point in the history
chore: pre 24.10 release items
  • Loading branch information
sebastian-alfers authored Oct 24, 2024
2 parents 87670bb + 298ed22 commit 6f63f81
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 20 deletions.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/).

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion integration-test/dns-api-mesos/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
4 changes: 2 additions & 2 deletions integration-test/kubernetes-api-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<properties>
<encoding>UTF-8</encoding>
<maven.compiler.release>11</maven.compiler.release>
<akka.version>2.10.0-M1</akka.version>
<akka.http.version>10.7.0-M1</akka.http.version>
<akka.version>2.10.0</akka.version>
<akka.http.version>10.7.0</akka.http.version>
<akka-management.version>1.5.2</akka-management.version>
<scala.binary.version>2.13</scala.binary.version>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions native-image-tests/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
4 changes: 3 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion project/project-info.conf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ project-info {
forums: [
{
text: "Lightbend Discuss"
url: "https://discuss.lightbend.com/c/akka/"
url: "https://discuss.akka.com/"
}
]
api-docs: [
Expand Down
6 changes: 3 additions & 3 deletions samples/akka-sample-cluster-kubernetes-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<encoding>UTF-8</encoding>
<akka.version>2.10.0-M1</akka.version>
<akka-management.version>1.5.3</akka-management.version>
<akka-http.version>10.7.0-M1</akka-http.version>
<akka.version>2.10.0</akka.version>
<akka-management.version>1.6.0</akka-management.version>
<akka-http.version>10.7.0</akka-http.version>
<scala.binary.version>2.13</scala.binary.version>
<version.number>${git.commit.time}-${git.commit.id.abbrev}</version.number>
</properties>
Expand Down
6 changes: 3 additions & 3 deletions samples/akka-sample-cluster-kubernetes-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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 := "-"
Expand Down

0 comments on commit 6f63f81

Please sign in to comment.