Skip to content

Commit

Permalink
chore: Pre 24.10 release (#1236)
Browse files Browse the repository at this point in the history
* chore: pre 24.10 release items
  • Loading branch information
sebastian-alfers authored Oct 26, 2024
1 parent 014f5bb commit 6bc8f14
Show file tree
Hide file tree
Showing 26 changed files with 104 additions and 106 deletions.
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 Projection 1.5.7
Licensed Work: Akka Projection 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-10-02
Change Date: 2027-10-26

Change License: Apache License, Version 2.0

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ final class GrpcReadJournal private (
ReplayPersistenceId(Some(PersistenceIdSeqNr(pid, seqNr)), filterAfterSeqNr)
}.toVector

// need this for compatibility with 1.5.2
// need this for compatibility with 1.6.0
val protoPersistenceIdOffsets = protoReplayPersistenceIds.map(_.fromPersistenceIdOffset.get)

if (log.isDebugEnabled() && protoReplayPersistenceIds.nonEmpty)
Expand Down
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -231,16 +231,15 @@ lazy val commonParadoxProperties = Def.settings(
// Akka Persistence DynamoDB plugin
"extref.akka-persistence-dynamodb.base_url" -> s"https://doc.akka.io/libraries/akka-persistence-dynamodb/${Dependencies.Versions.AkkaPersistenceDynamodbVersionInDocs}/%s",
// Akka Guide
"extref.akka-guide.base_url" -> "https://developer.lightbend.com/docs/akka-guide/microservices-tutorial/",
"extref.akka-guide.base_url" -> "https://doc.akka.io/guide/microservices-tutorial/",
// Java
"javadoc.base_url" -> "https://docs.oracle.com/javase/8/docs/api/",
// Scala
"scaladoc.scala.base_url" -> s"https://www.scala-lang.org/api/${scalaBinaryVersion.value}.x/",
"scaladoc.akka.projection.base_url" -> s"/${(Preprocess / siteSubdirName).value}/",
"javadoc.akka.projection.base_url" -> "", // no Javadoc is published
// Misc
"extref.samples.base_url" -> "https://developer.lightbend.com/start/?group=akka&project=%s",
"extref.platform-guide.base_url" -> "https://developer.lightbend.com/docs/akka-guide/%s"))
"extref.platform-guide.base_url" -> "https://doc.akka.io/guide/%s"))

lazy val docs = project
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, SitePreviewPlugin, PreprocessPlugin, PublishRsyncPlugin)
Expand Down
3 changes: 1 addition & 2 deletions docs/src/main/paradox/slick.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@ The @apidoc[SlickProjection$] has support for storing the offset in a relational
used with Scala.

@@@ warning
The Slick module in Akka Projections is [community-driven](https://developer.lightbend.com/docs/introduction/getting-help/support-terminology.html#community-driven)
and not included in Lightbend support.
The Slick module in Akka Projections is community-driven and not included in Lightbend support.
Prefer using the @ref[JDBC module](jdbc.md) to implement your projection handler. Slick support in Akka Projections is meant for users
migrating from [`Lagom's Slick ReadSideProcessor`](https://www.lagomframework.com/documentation/1.6.x/scala/ReadSideSlick.html).
@@@
Expand Down
2 changes: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ object Common extends AutoPlugin {
developers += Developer(
"contributors",
"Contributors",
"https://gitter.im/akka/dev",
"akka[email protected]",
url("https://github.com/akka/akka-projection/graphs/contributors")),
licenses := {
val tagOrBranch =
Expand Down
18 changes: 9 additions & 9 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,36 @@ object Dependencies {
val ScalaVersions = Dependencies.Scala2Versions :+ Dependencies.Scala3

object Versions {
val Akka = sys.props.getOrElse("build.akka.version", "2.10.0-M1")
val Akka = sys.props.getOrElse("build.akka.version", "2.10.0")
val AkkaVersionInDocs = VersionNumber(Akka).numbers match { case Seq(major, minor, _*) => s"$major.$minor" }

val Alpakka = "9.0.0-M1"
val Alpakka = "9.0.0"
val AlpakkaVersionInDocs = VersionNumber(Alpakka).numbers match { case Seq(major, minor, _*) => s"$major.$minor" }

val AlpakkaKafka = "7.0.0-M1"
val AlpakkaKafka = "7.0.0"
val AlpakkaKafkaVersionInDocs = VersionNumber(AlpakkaKafka).numbers match {
case Seq(major, minor, _*) => s"$major.$minor"
}
val AkkaGrpcVersionInDocs = "2.5.0-M1"
val AkkaGrpcVersionInDocs = "2.5.0"

val AkkaProjectionVersionInDocs = "1.6.0"

val AkkaPersistenceCassandra = "1.2.1"
val AkkaPersistenceJdbc = "5.5.0-M1"
val AkkaPersistenceCassandra = "1.3.0"
val AkkaPersistenceJdbc = "5.5.0"

val AkkaPersistenceR2dbc = "1.3.0-M1"
val AkkaPersistenceR2dbc = "1.3.0"
val AkkaPersistenceR2dbcVersionInDocs = VersionNumber(AkkaPersistenceR2dbc).numbers match {
case Seq(major, minor, _*) => s"$major.$minor"
}

val AkkaPersistenceDynamodb = "2.0.0-M1"
val AkkaPersistenceDynamodb = "2.0.0"
val AkkaPersistenceDynamodbVersionInDocs = VersionNumber(AkkaPersistenceDynamodb).numbers match {
case Seq(major, minor, _*) => s"$major.$minor"
}

val DynamodbSdk = "2.25.59"

val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "7.0.0-M1")
val alpakkaKafka = sys.props.getOrElse("build.alpakka.kafka.version", "7.0.0")
val slick = "3.5.2"
val scalaTest = "3.2.18"
val testContainers = "1.19.3"
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")

// remember to bump in Dependencies.scala and samples/grpc/ projects as well if changing
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0")

// Documentation
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")
Expand Down
2 changes: 1 addition & 1 deletion project/project-info.conf
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ project-info {
forums: [
{
text: "Lightbend Discuss"
url: "https://discuss.lightbend.com/c/akka/"
url: "https://discuss.akka.io/c/akka/"
}
]
}
Expand Down
14 changes: 7 additions & 7 deletions samples/grpc/iot-service-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka.version>2.10.0-M1</akka.version>
<akka-projection.version>1.5.7</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0-M1</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.5.0-M1</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0-M1</akka-grpc-maven-plugin.version>
<akka.version>2.10.0</akka.version>
<akka-projection.version>1.6.0</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0</akka-management.version>
<akka-diagnostics.version>2.2.0</akka-diagnostics.version>
<akka-grpc.version>2.5.0</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0</akka-grpc-maven-plugin.version>
<logback.version>1.3.6</logback.version>
<junit.version>4.13.2</junit.version>
<scala.binary.version>2.13</scala.binary.version>
Expand Down
12 changes: 6 additions & 6 deletions samples/grpc/iot-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props
.fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
Global / cancelable := false // ctrl-c

val AkkaVersion = "2.10.0-M1"
val AkkaHttpVersion = "10.6.3"
val AkkaManagementVersion = "1.5.2"
val AkkaPersistenceR2dbcVersion = "1.3.0-M1"
val AkkaVersion = "2.10.0"
val AkkaHttpVersion = "10.7.0"
val AkkaManagementVersion = "1.6.0"
val AkkaPersistenceR2dbcVersion = "1.3.0"
val AkkaProjectionVersion =
sys.props.getOrElse("akka-projection.version", "1.5.7")
val AkkaDiagnosticsVersion = "2.1.1"
sys.props.getOrElse("akka-projection.version", "1.6.0")
val AkkaDiagnosticsVersion = "2.2.0"

enablePlugins(AkkaGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/iot-service-scala/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resolvers += "Akka library repository".at("https://repo.akka.io/maven")

addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0")
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")
16 changes: 8 additions & 8 deletions samples/grpc/local-drone-control-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka.version>2.10.0-M1</akka.version>
<akka-projection.version>1.5.7</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0-M1</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.5.0-M1</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0-M1</akka-grpc-maven-plugin.version>
<akka.version>2.10.0</akka.version>
<akka-projection.version>1.6.0</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0</akka-management.version>
<akka-diagnostics.version>2.2.0</akka-diagnostics.version>
<akka-http.version>10.7.0</akka-http.version>
<akka-grpc.version>2.5.0</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0</akka-grpc-maven-plugin.version>
<logback.version>1.5.7</logback.version>
<prometheus.client.version>0.16.0</prometheus.client.version>
<junit.version>4.13.2</junit.version>
Expand Down
12 changes: 6 additions & 6 deletions samples/grpc/local-drone-control-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ run / javaOptions ++= sys.props
.fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
Global / cancelable := false // ctrl-c

val AkkaVersion = "2.10.0-M1"
val AkkaHttpVersion = "10.6.3"
val AkkaManagementVersion = "1.5.2"
val AkkaPersistenceR2dbcVersion = "1.3.0-M1"
val AkkaVersion = "2.10.0"
val AkkaHttpVersion = "10.7.0"
val AkkaManagementVersion = "1.6.0"
val AkkaPersistenceR2dbcVersion = "1.3.0"
val AkkaProjectionVersion =
sys.props.getOrElse("akka-projection.version", "1.5.7")
val AkkaDiagnosticsVersion = "2.1.0"
sys.props.getOrElse("akka-projection.version", "1.6.0")
val AkkaDiagnosticsVersion = "2.2.0"

enablePlugins(AkkaGrpcPlugin)

Expand Down
2 changes: 1 addition & 1 deletion samples/grpc/local-drone-control-scala/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resolvers += "Akka library repository".at("https://repo.akka.io/maven")

addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0")
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")
Expand Down
14 changes: 7 additions & 7 deletions samples/grpc/restaurant-drone-deliveries-service-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka.version>2.10.0-M1</akka.version>
<akka-projection.version>1.5.2</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0-M1</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0-M1</akka-management.version>
<akka-diagnostics.version>2.1.0</akka-diagnostics.version>
<akka-grpc.version>2.5.0-M1</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0-M1</akka-grpc-maven-plugin.version>
<akka.version>2.10.0</akka.version>
<akka-projection.version>1.6.0</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0</akka-management.version>
<akka-diagnostics.version>2.2.0</akka-diagnostics.version>
<akka-grpc.version>2.5.0</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0</akka-grpc-maven-plugin.version>
<logback.version>1.5.7</logback.version>
<junit.version>4.13.2</junit.version>
<scala.binary.version>2.13</scala.binary.version>
Expand Down
12 changes: 6 additions & 6 deletions samples/grpc/restaurant-drone-deliveries-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props
.fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
Global / cancelable := false // ctrl-c

val AkkaVersion = "2.10.0-M1"
val AkkaHttpVersion = "10.6.3"
val AkkaManagementVersion = "1.5.2"
val AkkaPersistenceR2dbcVersion = "1.3.0-M1"
val AkkaVersion = "2.10.0"
val AkkaHttpVersion = "10.7.0"
val AkkaManagementVersion = "1.6.0"
val AkkaPersistenceR2dbcVersion = "1.3.0"
val AkkaProjectionVersion =
sys.props.getOrElse("akka-projection.version", "1.5.7")
val AkkaDiagnosticsVersion = "2.1.1"
sys.props.getOrElse("akka-projection.version", "1.6.0")
val AkkaDiagnosticsVersion = "2.2.0"

enablePlugins(AkkaGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resolvers += "Akka library repository".at("https://repo.akka.io/maven")

addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0")
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")
14 changes: 7 additions & 7 deletions samples/grpc/shopping-analytics-service-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka.version>2.10.0-M1</akka.version>
<akka-projection.version>1.5.7</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0-M1</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0-M1</akka-management.version>
<akka-diagnostics.version>2.1.0</akka-diagnostics.version>
<akka-grpc.version>2.5.0-M1</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0-M1</akka-grpc-maven-plugin.version>
<akka.version>2.10.0</akka.version>
<akka-projection.version>1.6.0</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0</akka-management.version>
<akka-diagnostics.version>2.2.0</akka-diagnostics.version>
<akka-grpc.version>2.5.0</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0</akka-grpc-maven-plugin.version>
<logback.version>1.5.7</logback.version>
<junit.version>4.13.2</junit.version>
<scala.binary.version>2.13</scala.binary.version>
Expand Down
12 changes: 6 additions & 6 deletions samples/grpc/shopping-analytics-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props
.fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
Global / cancelable := false // ctrl-c

val AkkaVersion = "2.10.0-M1"
val AkkaHttpVersion = "10.6.3"
val AkkaManagementVersion = "1.6.0-M1"
val AkkaPersistenceR2dbcVersion = "1.3.0-M1"
val AkkaVersion = "2.10.0"
val AkkaHttpVersion = "10.7.0"
val AkkaManagementVersion = "1.6.0"
val AkkaPersistenceR2dbcVersion = "1.3.0"
val AkkaProjectionVersion =
sys.props.getOrElse("akka-projection.version", "1.5.7")
val AkkaDiagnosticsVersion = "2.1.0"
sys.props.getOrElse("akka-projection.version", "1.6.0")
val AkkaDiagnosticsVersion = "2.2.0"

enablePlugins(AkkaGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resolvers += "Akka library repository".at("https://repo.akka.io/maven")

addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0")
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")
14 changes: 7 additions & 7 deletions samples/grpc/shopping-cart-service-java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<akka.version>2.10.0-M1</akka.version>
<akka-projection.version>1.5.7</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0-M1</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0-M1</akka-management.version>
<akka-diagnostics.version>2.1.0</akka-diagnostics.version>
<akka-grpc.version>2.5.0-M1</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0-M1</akka-grpc-maven-plugin.version>
<akka.version>2.10.0</akka.version>
<akka-projection.version>1.6.0</akka-projection.version>
<akka-persistence-r2dbc.version>1.3.0</akka-persistence-r2dbc.version>
<akka-management.version>1.6.0</akka-management.version>
<akka-diagnostics.version>2.2.0</akka-diagnostics.version>
<akka-grpc.version>2.5.0</akka-grpc.version>
<akka-grpc-maven-plugin.version>2.5.0</akka-grpc-maven-plugin.version>
<logback.version>1.5.7</logback.version>
<junit.version>4.13.2</junit.version>
<scala.binary.version>2.13</scala.binary.version>
Expand Down
12 changes: 6 additions & 6 deletions samples/grpc/shopping-cart-service-scala/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,13 @@ run / javaOptions ++= sys.props
.fold(Seq.empty[String])(res => Seq(s"-Dconfig.resource=$res"))
Global / cancelable := false // ctrl-c

val AkkaVersion = "2.10.0-M1"
val AkkaHttpVersion = "10.6.3"
val AkkaManagementVersion = "1.5.2"
val AkkaPersistenceR2dbcVersion = "1.3.0-M1"
val AkkaVersion = "2.10.0"
val AkkaHttpVersion = "10.7.0"
val AkkaManagementVersion = "1.6.0"
val AkkaPersistenceR2dbcVersion = "1.3.0"
val AkkaProjectionVersion =
sys.props.getOrElse("akka-projection.version", "1.5.7")
val AkkaDiagnosticsVersion = "2.1.1"
sys.props.getOrElse("akka-projection.version", "1.6.0")
val AkkaDiagnosticsVersion = "2.2.0"

enablePlugins(AkkaGrpcPlugin)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
resolvers += "Akka library repository".at("https://repo.akka.io/maven")

addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0-M1")
addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.5.0")
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")
Loading

0 comments on commit 6bc8f14

Please sign in to comment.