From e4af51935f26723ec39dccec36fd6a376b0c42b0 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 23 Oct 2024 07:39:39 +0200 Subject: [PATCH 1/5] chore: bump akka to 2.10.0 --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 51d43453..b72bf7a3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -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" From 5b2b6364bbe0e6812ccafa98c0e56f75776fa0ff Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 23 Oct 2024 07:41:04 +0200 Subject: [PATCH 2/5] chore: Update license version and change date for 5.5.0 --- LICENSE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/LICENSE b/LICENSE index db4508b9..e92861ac 100644 --- a/LICENSE +++ b/LICENSE @@ -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 @@ -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 From a392442f3610aedcc827b0547d5261d2af181f6f Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 23 Oct 2024 07:55:00 +0200 Subject: [PATCH 3/5] bump: sbt-paradox-akka to 24.10.3 --- project/plugins.sbt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 659a8f12..ee5bd3f6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -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") @@ -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") From de46b505a464ddcb7c68452eba274c35fd848210 Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 23 Oct 2024 08:13:57 +0200 Subject: [PATCH 4/5] chore: remove references to gitter --- CONTRIBUTING.md | 2 +- README.md | 2 +- docs/release-train-issue-template.md | 1 - project/ProjectAutoPlugin.scala | 2 +- project/project-info.conf | 4 ---- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 94b57994..9e4c0a3a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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.lightbend.com/c/akka/). ## Pull Request Requirements diff --git a/README.md b/README.md index 2cb625b7..de8be455 100644 --- a/README.md +++ b/README.md @@ -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.lightbend.com/c/akka/). ## License diff --git a/docs/release-train-issue-template.md b/docs/release-train-issue-template.md index 0983f308..d5b12a92 100644 --- a/docs/release-train-issue-template.md +++ b/docs/release-train-issue-template.md @@ -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: diff --git a/project/ProjectAutoPlugin.scala b/project/ProjectAutoPlugin.scala index b5f7e961..372fe872 100644 --- a/project/ProjectAutoPlugin.scala +++ b/project/ProjectAutoPlugin.scala @@ -22,7 +22,7 @@ object ProjectAutoPlugin extends AutoPlugin { developers += Developer( "contributors", "Contributors", - "https://gitter.im/akka/dev", + "akka.official@gmail.com", url("https://github.com/akka/akka-persistence-jdbc/graphs/contributors")), releaseNotesURL := ( if ((ThisBuild / isSnapshot).value) None diff --git a/project/project-info.conf b/project/project-info.conf index 27c1987c..093450ca 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -22,10 +22,6 @@ project-info { text: "Lightbend Discuss" url: "https://discuss.lightbend.com/c/akka/" } - { - text: "akka/akka Gitter channel" - url: "https://gitter.im/akka/akka" - } ] } core: ${project-info.shared-info} { From a4e39872c1c9efacf1fdac8af75e10a56382cdcb Mon Sep 17 00:00:00 2001 From: Sebastian Date: Wed, 23 Oct 2024 08:48:20 +0200 Subject: [PATCH 5/5] discuss.akka.io over discuss.lightbend.com --- CONTRIBUTING.md | 2 +- README.md | 4 ++-- project/project-info.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9e4c0a3a..5acf9fc6 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 forum](https://discuss.lightbend.com/c/akka/). +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 diff --git a/README.md b/README.md index de8be455..ab2f6bb3 100644 --- a/README.md +++ b/README.md @@ -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: @@ -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 forum](https://discuss.lightbend.com/c/akka/). +You can also ask for clarifications or guidance in GitHub issues directly, or in the [akka forum](https://discuss.akka.io/c/akka/). ## License diff --git a/project/project-info.conf b/project/project-info.conf index 093450ca..ce521abd 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.io/c/akka/" } ] }