diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 19a643df..af5719e9 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -69,7 +69,7 @@ jobs: matrix: SCALA_VERSION: [ 2.12, 2.13 ] JAVA_VERSION: [ 8, 11 ] - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' steps: - name: Checkout uses: actions/checkout@v4 @@ -108,7 +108,7 @@ jobs: test-postgres-scala3: name: Run test with Postgres (Scala 3) runs-on: ubuntu-latest - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' steps: - name: Checkout uses: actions/checkout@v4 @@ -151,7 +151,7 @@ jobs: matrix: SCALA_VERSION: [ 2.12, 2.13 ] JAVA_VERSION: [ 8, 11 ] - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' steps: - name: Checkout uses: actions/checkout@v4 @@ -190,7 +190,7 @@ jobs: test-docs: name: Docs runs-on: ubuntu-latest - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 565215b2..51815d67 100644 --- a/.github/workflows/dependency-graph.yml +++ b/.github/workflows/dependency-graph.yml @@ -7,7 +7,7 @@ jobs: dependency-graph: name: Update Dependency Graph runs-on: ubuntu-latest - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' steps: - uses: actions/checkout@v4 - uses: scalacenter/sbt-dependency-submission@v2 diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index c3e5965f..7be96e3d 100644 --- a/.github/workflows/link-validator.yml +++ b/.github/workflows/link-validator.yml @@ -11,7 +11,7 @@ on: jobs: validate-links: runs-on: ubuntu-20.04 - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/publish-1.0-docs.yml b/.github/workflows/publish-1.0-docs.yml index e020a742..a2d4eb68 100644 --- a/.github/workflows/publish-1.0-docs.yml +++ b/.github/workflows/publish-1.0-docs.yml @@ -5,7 +5,7 @@ on: jobs: publish-docs: - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' name: Publish 1.0 Docs runs-on: ubuntu-20.04 env: diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml index 64f5618d..fac7c1e5 100644 --- a/.github/workflows/publish-nightly.yml +++ b/.github/workflows/publish-nightly.yml @@ -8,7 +8,7 @@ on: jobs: publish: # runs on main repo only - if: github.repository == 'apache/incubator-pekko-persistence-r2dbc' + if: github.repository == 'apache/pekko-persistence-r2dbc' name: Publish runs-on: ubuntu-20.04 env: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 19bb975b..e8869d31 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,9 +77,9 @@ docker exec -it yb-tserver-n1 /home/yugabyte/bin/ysqlsh -h yb-tserver-n1 This is the process for committing code into main. 1. For non-trivial changes, you will be asked to sign the [CLA](https://www.apache.org/licenses/contributor-agreements.html) if you have not done so before. -2. Before starting to work on a feature or a fix, make sure that there is a ticket for your work in the [issue tracker](https://github.com/apache/incubator-pekko-persistence-r2dbc/issues). If not, create it first. +2. Before starting to work on a feature or a fix, make sure that there is a ticket for your work in the [issue tracker](https://github.com/apache/pekko-persistence-r2dbc/issues). If not, create it first. 3. Perform your work according to the [pull request requirements](#pull-request-requirements). -4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on [GitHub](https://github.com/apache/incubator-pekko-persistence-r2dbc/pulls). +4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on [GitHub](https://github.com/apache/pekko-persistence-r2dbc/pulls). 5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). 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. 7. If the branch merge conflicts with its target, rebase your branch onto the target branch. diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index 6a31e0f4..00000000 --- a/DISCLAIMER +++ /dev/null @@ -1,10 +0,0 @@ -Apache Pekko (incubating) is an effort undergoing incubation at the Apache -Software Foundation (ASF), sponsored by the Apache Incubator PMC. - -Incubation is required of all newly accepted projects until a further review -indicates that the infrastructure, communications, and decision making process -have stabilized in a manner consistent with other successful ASF projects. - -While incubation status is not necessarily a reflection of the completeness -or stability of the code, it does indicate that the project has yet to be -fully endorsed by the ASF. diff --git a/NOTICE b/NOTICE index 8b6fe239..aa82da8b 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache Pekko (Incubating) Persistence R2DBC +Apache Pekko Persistence R2DBC Copyright 2022-2024 The Apache Software Foundation This product includes software developed at diff --git a/README.md b/README.md index 0069ec99..31efb44b 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ store for SQL databases with RD2BC connectivity. ## Project status -Version 1.0.0 has been released. Any contributions are welcome. Please observe the [Code of Conduct](https://github.com/apache/incubator-pekko-persistence-r2dbc?tab=coc-ov-file#readme). +Version 1.0.0 has been released. Any contributions are welcome. Please observe the [Code of Conduct](https://github.com/apache/pekko-persistence-r2dbc?tab=coc-ov-file#readme). ## Documentation @@ -15,10 +15,10 @@ Version 1.0.0 has been released. Any contributions are welcome. Please observe t There are several ways to interact with the Pekko community: -- [GitHub discussions](https://github.com/apache/incubator-pekko-persistence-jdbc/discussions): for questions and general discussion. +- [GitHub discussions](https://github.com/apache/pekko-persistence-jdbc/discussions): for questions and general discussion. - [Pekko dev mailing list](https://lists.apache.org/list.html?dev@pekko.apache.org): for Pekko development discussions. - [Pekko users mailing list](https://lists.apache.org/list.html?users@pekko.apache.org): for Pekko user discussions. -- [GitHub issues](https://github.com/apache/incubator-pekko-persistence-r2dbc/issues): for bug reports and feature requests. Please search the existing issues before creating new ones. If you are unsure whether you have found a bug, consider asking in GitHub discussions or the mailing list first. +- [GitHub issues](https://github.com/apache/pekko-persistence-r2dbc/issues): for bug reports and feature requests. Please search the existing issues before creating new ones. If you are unsure whether you have found a bug, consider asking in GitHub discussions or the mailing list first. ## License diff --git a/build.sbt b/build.sbt index e00bcd77..a21240f1 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ import sbt.Keys.parallelExecution ThisBuild / versionScheme := Some(VersionScheme.SemVerSpec) sourceDistName := "apache-pekko-persistence-r2dbc" -sourceDistIncubating := true +sourceDistIncubating := false ThisBuild / pekkoInlineEnabled := false ThisBuild / reproducibleBuildsCheckResolver := Resolver.ApacheMavenStagingRepo @@ -24,14 +24,14 @@ inThisBuild( Seq( scmInfo := Some( ScmInfo( - url("https://github.com/apache/incubator-pekko-persistence-r2dbc"), - "https://github.com/apache/incubator-pekko-persistence-r2dbc.git")), + url("https://github.com/apache/pekko-persistence-r2dbc"), + "https://github.com/apache/pekko-persistence-r2dbc.git")), startYear := Some(2022), developers += Developer( "contributors", "Contributors", "dev@pekko.apache.org", - url("https://github.com/apache/incubator-pekko-persistence-r2dbc/graphs/contributors")), + url("https://github.com/apache/pekko-persistence-r2dbc/graphs/contributors")), description := "An Apache Pekko Persistence implementation backed by SQL database with R2DBC", // add snapshot repo when Pekko version overridden resolvers ++= @@ -84,7 +84,7 @@ lazy val docs = project libraryDependencies ++= Dependencies.docs, previewPath := (Paradox / siteSubdirName).value, Paradox / siteSubdirName := s"docs/pekko-persistence-r2dbc/${projectInfoVersion.value}", - pekkoParadoxGithub := Some("https://github.com/apache/incubator-pekko-persistence-r2dbc"), + pekkoParadoxGithub := Some("https://github.com/apache/pekko-persistence-r2dbc"), paradoxGroups := Map("Language" -> Seq("Java", "Scala")), Compile / paradoxProperties ++= Map( "project.url" -> "https://pekko.apache.org/docs/pekko-persistence-r2dbc/current/", diff --git a/docs/src/main/paradox/contributing.md b/docs/src/main/paradox/contributing.md index 0e400eb3..c5c3816d 100644 --- a/docs/src/main/paradox/contributing.md +++ b/docs/src/main/paradox/contributing.md @@ -1,6 +1,6 @@ # Contributing Please feel free to contribute to Apache Pekko Persistence R2DBC and the documentation by reporting issues you identify, or by suggesting changes to the code. -Please refer to our [contributing instructions](https://github.com/apache/incubator-pekko-persistence-r2dbc/blob/main/CONTRIBUTING.md) to learn how it can be done. +Please refer to our [contributing instructions](https://github.com/apache/pekko-persistence-r2dbc/blob/main/CONTRIBUTING.md) to learn how it can be done. We want the Apache Pekko community to have a welcoming and open atmosphere and expect all contributors to respect our [code of conduct](https://www.apache.org/foundation/policies/conduct.html). diff --git a/docs/src/main/paradox/migration-guides.md b/docs/src/main/paradox/migration-guides.md index aa6017c0..948f6cdc 100644 --- a/docs/src/main/paradox/migration-guides.md +++ b/docs/src/main/paradox/migration-guides.md @@ -8,7 +8,7 @@ These migration notes are designed for users migrating from Akka Persistence R2D and assume a basic level of Akka experience. Please feel free to submit an issue or a patch if you feel like the notes can be improved. One of the main differences is that the database tables used by `pekko-projection-r2dbc` have been renamed to -remove the `akka` prefixes ([PR71](https://github.com/apache/incubator-pekko-persistence-r2dbc/pull/71)). +remove the `akka` prefixes ([PR71](https://github.com/apache/pekko-persistence-r2dbc/pull/71)). The table names that `pekko-projection-r2dbc` expects to find can be changed using [configuration settngs](https://github.com/lightbend/config). diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md index a4d47e9a..e2c58d21 100644 --- a/docs/src/main/paradox/overview.md +++ b/docs/src/main/paradox/overview.md @@ -5,7 +5,7 @@ The Pekko Persistence R2DBC plugin allows for using SQL database with R2DBC as a Currently, the R2DBC plugin has support for [PostgreSQL](https://www.postgresql.org) and [Yugabyte](https://www.yugabyte.com). It is specifically designed to work well for distributed SQL databases. -[Create an issue](https://github.com/apache/incubator-pekko-persistence-r2dbc/issues) if you would like to @ref[contribute](contributing.md) +[Create an issue](https://github.com/apache/pekko-persistence-r2dbc/issues) if you would like to @ref[contribute](contributing.md) support for other databases that has a [R2DBC driver](https://r2dbc.io/drivers/). @@@ warning diff --git a/docs/src/main/paradox/release-notes.md b/docs/src/main/paradox/release-notes.md index 3e7f6ec2..76b52ceb 100644 --- a/docs/src/main/paradox/release-notes.md +++ b/docs/src/main/paradox/release-notes.md @@ -21,7 +21,7 @@ We haven't had to fix any significant bugs that were in Akka Persistence R2DBC 0 ### Changes -* Changed the table names in the DDL schemas to remove the akka/pekko prefixes ([PR71](https://github.com/apache/incubator-pekko-persistence-r2dbc/pull/71)) +* Changed the table names in the DDL schemas to remove the akka/pekko prefixes ([PR71](https://github.com/apache/pekko-persistence-r2dbc/pull/71)) ### Additions diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala index 0061ff37..57cf7635 100644 --- a/project/MetaInfLicenseNoticeCopy.scala +++ b/project/MetaInfLicenseNoticeCopy.scala @@ -19,9 +19,6 @@ object MetaInfLicenseNoticeCopy extends AutoPlugin { private lazy val baseDir = LocalRootProject / baseDirectory - override lazy val projectSettings = Seq( - apacheSonatypeDisclaimerFile := Some(baseDir.value / "DISCLAIMER")) - override def trigger = allRequirements override def requires = ApacheSonatypePlugin diff --git a/project/project-info.conf b/project/project-info.conf index 88ade1c2..8c001fdf 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -3,11 +3,11 @@ project-info { shared-info { jdk-versions: ["OpenJDK 8", "OpenJDK 11", "OpenJDK 17"] issues: { - url: "https://github.com/apache/incubator-pekko-persistence-r2dbc/issues" + url: "https://github.com/apache/pekko-persistence-r2dbc/issues" text: "Github issues" } release-notes: { - url: "https://github.com/apache/incubator-pekko-persistence-r2dbc/releases" + url: "https://github.com/apache/pekko-persistence-r2dbc/releases" text: "Github releases" } forums: [ @@ -21,7 +21,7 @@ project-info { } { text: "Github Discussions" - url: "https://github.com/apache/incubator-pekko-persistence-r2dbc/discussions" + url: "https://github.com/apache/pekko-persistence-r2dbc/discussions" } ] } diff --git a/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala b/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala index 43a78f7e..365d58a6 100644 --- a/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala +++ b/projection/src/main/scala/org/apache/pekko/projection/r2dbc/internal/R2dbcOffsetStore.scala @@ -540,7 +540,7 @@ private[projection] class R2dbcOffsetStore( if (newInflight.size >= 10000) { throw new IllegalStateException( s"Too many envelopes in-flight [${newInflight.size}]. " + - "Please report this issue at https://github.com/apache/incubator-pekko-persistence-r2dbc") + "Please report this issue at https://github.com/apache/pekko-persistence-r2dbc") } if (!inflight.compareAndSet(currentInflight, newInflight)) cleanupInflight(newState) // CAS retry, concurrent update of inflight @@ -701,7 +701,7 @@ private[projection] class R2dbcOffsetStore( new IllegalStateException( s"Rejected envelope from backtracking, persistenceId [$pid], seqNr [$seqNr] " + "due to unexpected sequence number. " + - "Please report this issue at https://github.com/apache/incubator-pekko-persistence-r2dbc")) + "Please report this issue at https://github.com/apache/pekko-persistence-r2dbc")) } } else if (seqNr == 1) { // always accept first event if no other event for that pid has been seen @@ -732,7 +732,7 @@ private[projection] class R2dbcOffsetStore( throw new IllegalStateException( s"Rejected envelope from backtracking, persistenceId [$pid], seqNr [$seqNr], " + "due to unknown sequence number. " + - "Please report this issue at https://github.com/apache/incubator-pekko-persistence-r2dbc") + "Please report this issue at https://github.com/apache/pekko-persistence-r2dbc") } case None => // previous not found, could have been deleted @@ -1007,7 +1007,7 @@ private[projection] class R2dbcOffsetStore( case change: DurableStateChange[_] if change.offset.isInstanceOf[TimestampOffset] => // FIXME case DeletedDurableState when that is added throw new IllegalArgumentException( - s"DurableStateChange [${change.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/incubator-pekko-persistence-r2dbc/issues") + s"DurableStateChange [${change.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/pekko-persistence-r2dbc/issues") case _ => None } }