Skip to content

Commit

Permalink
Merge pull request #871 from sebastian-alfers/pre-release-24.10
Browse files Browse the repository at this point in the history
Pre release 24.10
  • Loading branch information
sebastian-alfers authored Oct 23, 2024
2 parents f56f367 + a4e3987 commit 66bc374
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ This is the process for committing code into master.
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.
7. If the branch merge conflicts with its target, rebase your branch onto the target branch.

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/c/akka/).

## 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 Persistence JDBC 5.4.2
Licensed Work: Akka Persistence JDBC 5.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
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-29
Change Date: 2027-10-23

Change License: Apache License, Version 2.0

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ For the change log prior to v3.2.0, visit [Version History Page (wiki)](https://

You can join these groups and chats to discuss and ask Akka related questions:

- Forums: [discuss.akka.io](https://discuss.lightbend.com/c/akka/)
- Forums: [discuss.akka.io](https://discuss.akka.io/c/akka/)
- Issue tracker: [![github: akka/akka-persistence-jdbc](https://img.shields.io/badge/github%3A-issues-blue.svg?style=flat-square)](https://github.com/akka/akka-persistence-jdbc/issues)

In addition to that, you may enjoy following:
Expand All @@ -43,7 +43,7 @@ If you find an issue that you'd like to see fixed, the quickest way to make that

Refer to the [CONTRIBUTING.md](CONTRIBUTING.md) file for more details about the workflow, and general hints on how to prepare your pull request.

You can also ask for clarifications or guidance in GitHub issues directly, or in the [akka/dev](https://gitter.im/akka/dev) chat if a more real time communication would be of benefit.
You can also ask for clarifications or guidance in GitHub issues directly, or in the [akka forum](https://discuss.akka.io/c/akka/).

## License

Expand Down
1 change: 0 additions & 1 deletion docs/release-train-issue-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ For important patch releases, and only if critical issues have been fixed:
- [ ] Send a release notification to [Lightbend discuss](https://discuss.akka.io)
- [ ] Tweet using the [@akkateam](https://twitter.com/akkateam/) account (or ask someone to) about the new release
- [ ] Announce on [Gitter akka/akka](https://gitter.im/akka/akka)
- [ ] Announce internally (with links to Tweet, discuss)
For minor or major releases:
Expand Down
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object Dependencies {

val ScalaVersions = Seq(Scala213, 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 SlickVersion = "3.5.2"
Expand Down
2 changes: 1 addition & 1 deletion project/ProjectAutoPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ object ProjectAutoPlugin extends AutoPlugin {
developers += Developer(
"contributors",
"Contributors",
"https://gitter.im/akka/dev",
"akka[email protected]",
url("https://github.com/akka/akka-persistence-jdbc/graphs/contributors")),
releaseNotesURL := (
if ((ThisBuild / isSnapshot).value) None
Expand Down
5 changes: 4 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
// for sbt-paradox-akka
resolvers += "Akka library repository".at("https://repo.akka.io/maven")

// compliance
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
Expand All @@ -11,7 +14,7 @@ addDependencyTreePlugin
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
// docs
addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.57")
addSbtPlugin("io.akka" % "sbt-paradox-akka" % "24.10.3")
addSbtPlugin("com.github.sbt" % "sbt-site" % "1.7.0")
addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.7.0")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
Expand Down
6 changes: 1 addition & 5 deletions project/project-info.conf
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ project-info {
forums: [
{
text: "Lightbend Discuss"
url: "https://discuss.lightbend.com/c/akka/"
}
{
text: "akka/akka Gitter channel"
url: "https://gitter.im/akka/akka"
url: "https://discuss.akka.io/c/akka/"
}
]
}
Expand Down

0 comments on commit 66bc374

Please sign in to comment.