diff --git a/.github/workflows/dependency-graph.yml b/.github/workflows/dependency-graph.yml index 5eedc60c..94fe0803 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-projection' + if: github.repository == 'apache/pekko-projection' steps: - uses: actions/checkout@v4 - uses: scalacenter/sbt-dependency-submission@v2 diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index abbee257..422ab0df 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -10,7 +10,7 @@ jobs: build: name: Code is formatted runs-on: ubuntu-latest - if: github.repository == 'apache/incubator-pekko-projection' + if: github.repository == 'apache/pekko-projection' steps: - name: Checkout current branch (full) uses: actions/checkout@v4 diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml index 52331451..631f98d8 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-projection' + if: github.repository == 'apache/pekko-projection' 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 9efafd93..5e95ffd4 100644 --- a/.github/workflows/publish-1.0-docs.yml +++ b/.github/workflows/publish-1.0-docs.yml @@ -7,7 +7,7 @@ jobs: publish-docs: name: Publish documentation to nightlies.apache.org runs-on: ubuntu-latest - if: github.repository == 'apache/incubator-pekko-projection' + if: github.repository == 'apache/pekko-projection' steps: - name: Checkout uses: actions/checkout@v4 diff --git a/.github/workflows/publish-nightly.yml b/.github/workflows/publish-nightly.yml index 81a0e685..b4032298 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-projection' + if: github.repository == 'apache/pekko-projection' name: Publish runs-on: ubuntu-20.04 env: @@ -36,7 +36,7 @@ jobs: publish-docs: name: Publish documentation to nightlies.apache.org runs-on: ubuntu-latest - if: github.repository == 'apache/incubator-pekko-projection' + if: github.repository == 'apache/pekko-projection' steps: - name: Checkout uses: actions/checkout@v4 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 37b7d384..56eb9237 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -Apache Pekko (Incubating) Projections +Apache Pekko Projections Copyright 2022-2024 The Apache Software Foundation This product includes software developed at diff --git a/README.md b/README.md index 6fe6f063..9eaedccc 100644 --- a/README.md +++ b/README.md @@ -15,10 +15,10 @@ To keep up with the latest releases check out [Pekko Projections releases](https You can join these forums and chats to discuss and ask Pekko and Pekko connector related questions: -- [GitHub discussions](https://github.com/apache/incubator-pekko-projection/discussions): for questions and general discussion. +- [GitHub discussions](https://github.com/apache/pekko-projection/discussions): for questions and general discussion. - [Pekko users mailing list](https://lists.apache.org/list.html?users@pekko.apache.org): for Pekko usage discussions. - [Pekko dev mailing list](https://lists.apache.org/list.html?dev@pekko.apache.org): for Pekko development discussions. -- [GitHub issues](https://github.com/apache/incubator-pekko-projection/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-projection/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. ## Contributing @@ -26,4 +26,4 @@ Contributions are very welcome. If you have an idea on how to improve Pekko, don ## License -Apache Pekko Projections is available under the Apache License, version 2.0. See [LICENSE](https://github.com/apache/incubator-pekko-projection/blob/main/LICENSE) file for details. +Apache Pekko Projections is available under the Apache License, version 2.0. See [LICENSE](https://github.com/apache/pekko-projection/blob/main/LICENSE) file for details. diff --git a/build.sbt b/build.sbt index 2a77839d..02ba760b 100644 --- a/build.sbt +++ b/build.sbt @@ -12,7 +12,7 @@ import org.apache.pekko.projections.Dependencies ThisBuild / versionScheme := Some(VersionScheme.SemVerSpec) sourceDistName := "apache-pekko-projection" -sourceDistIncubating := true +sourceDistIncubating := false ThisBuild / pekkoInlineEnabled := false ThisBuild / reproducibleBuildsCheckResolver := Resolver.ApacheMavenStagingRepo @@ -174,7 +174,7 @@ lazy val docs = project .dependsOn(core, testkit) .settings( name := "Apache Pekko Projections", - pekkoParadoxGithub := Some("https://github.com/apache/incubator-pekko-projection"), + pekkoParadoxGithub := Some("https://github.com/apache/pekko-projection"), publish / skip := true, makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value, previewPath := (Paradox / siteSubdirName).value, @@ -184,7 +184,7 @@ lazy val docs = project Compile / paradoxProperties ++= Map( "project.url" -> "https://pekko.apache.org/docs/pekko-projection/current/", "canonical.base_url" -> "https://pekko.apache.org/docs/pekko-projection/current", - "github.base_url" -> "https://github.com/apache/incubator-pekko-projection", + "github.base_url" -> "https://github.com/apache/pekko-projection", "pekko.version" -> Dependencies.Versions.pekko, // Pekko "extref.pekko.base_url" -> s"https://pekko.apache.org/docs/pekko/${Dependencies.PekkoVersionInDocs}/%s", diff --git a/core/src/main/scala/org/apache/pekko/projection/internal/ActorHandlerInit.scala b/core/src/main/scala/org/apache/pekko/projection/internal/ActorHandlerInit.scala index c4b14af6..dfe002d0 100644 --- a/core/src/main/scala/org/apache/pekko/projection/internal/ActorHandlerInit.scala +++ b/core/src/main/scala/org/apache/pekko/projection/internal/ActorHandlerInit.scala @@ -38,7 +38,7 @@ import pekko.annotation.InternalApi case None => throw new IllegalStateException( "Actor not started, please report issue at " + - "https://github.com/apache/incubator-pekko-projection/issues") + "https://github.com/apache/pekko-projection/issues") } } } diff --git a/core/src/main/scala/org/apache/pekko/projection/javadsl/StatefulHandler.scala b/core/src/main/scala/org/apache/pekko/projection/javadsl/StatefulHandler.scala index 05c8f345..8b18e3a7 100644 --- a/core/src/main/scala/org/apache/pekko/projection/javadsl/StatefulHandler.scala +++ b/core/src/main/scala/org/apache/pekko/projection/javadsl/StatefulHandler.scala @@ -66,7 +66,7 @@ import pekko.annotation.ApiMayChange "Process called before previous CompletionStage completed. " + "Did you share the same handler instance between several Projection instances? " + "Otherwise, please report issue at " + - "https://github.com/apache/incubator-pekko-projection/issues") + "https://github.com/apache/pekko-projection/issues") state = newState.thenCompose(s => process(s, envelope)) state.thenApply(_ => Done) diff --git a/core/src/main/scala/org/apache/pekko/projection/scaladsl/StatefulHandler.scala b/core/src/main/scala/org/apache/pekko/projection/scaladsl/StatefulHandler.scala index d74cb543..4403a6f9 100644 --- a/core/src/main/scala/org/apache/pekko/projection/scaladsl/StatefulHandler.scala +++ b/core/src/main/scala/org/apache/pekko/projection/scaladsl/StatefulHandler.scala @@ -65,7 +65,7 @@ import pekko.annotation.ApiMayChange "Process called before previous Future completed. " + "Did you share the same handler instance between several Projection instances? " + "Otherwise, please report issue at " + - "https://github.com/apache/incubator-pekko-projection/issues") + "https://github.com/apache/pekko-projection/issues") } state = newState.flatMap(s => process(s, envelope)) state.map(_ => Done) diff --git a/docs/src/main/paradox/getting-started/running.md b/docs/src/main/paradox/getting-started/running.md index 89e034a1..ccec10ee 100644 --- a/docs/src/main/paradox/getting-started/running.md +++ b/docs/src/main/paradox/getting-started/running.md @@ -4,7 +4,7 @@ This example requires a Cassandra database to run. If you do not have a Cassandra database then you can run one locally as a Docker container. -To run a Cassandra database locally you can use [`docker-compose`](https://docs.docker.com/compose/) to run the [`docker-compose.yaml`](https://raw.githubusercontent.com/apache/incubator-pekko-projection/main/docker-compose.yml) found in the Projections project root. +To run a Cassandra database locally you can use [`docker-compose`](https://docs.docker.com/compose/) to run the [`docker-compose.yaml`](https://raw.githubusercontent.com/apache/pekko-projection/main/docker-compose.yml) found in the Projections project root. The `docker-compose.yml` file references the latest [Cassandra Docker Image](https://hub.docker.com/_/cassandra). Change directory to the directory of the `docker-compose.yml` file and manage a Cassandra container with the following commands. diff --git a/durable-state/src/main/scala/org/apache/pekko/projection/state/javadsl/DurableStateSourceProvider.scala b/durable-state/src/main/scala/org/apache/pekko/projection/state/javadsl/DurableStateSourceProvider.scala index f04197e5..1090e03b 100644 --- a/durable-state/src/main/scala/org/apache/pekko/projection/state/javadsl/DurableStateSourceProvider.scala +++ b/durable-state/src/main/scala/org/apache/pekko/projection/state/javadsl/DurableStateSourceProvider.scala @@ -141,7 +141,7 @@ object DurableStateSourceProvider { case other => // FIXME case DeletedDurableState when that is added throw new IllegalArgumentException( - s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/incubator-pekko-persistence-r2dbc/issues") + s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/pekko-persistence-r2dbc/issues") } override def getObject(persistenceId: String): CompletionStage[GetObjectResult[A]] = diff --git a/durable-state/src/main/scala/org/apache/pekko/projection/state/scaladsl/DurableStateSourceProvider.scala b/durable-state/src/main/scala/org/apache/pekko/projection/state/scaladsl/DurableStateSourceProvider.scala index 36ec36a7..88c29b0e 100644 --- a/durable-state/src/main/scala/org/apache/pekko/projection/state/scaladsl/DurableStateSourceProvider.scala +++ b/durable-state/src/main/scala/org/apache/pekko/projection/state/scaladsl/DurableStateSourceProvider.scala @@ -130,7 +130,7 @@ object DurableStateSourceProvider { case other => // FIXME case DeletedDurableState when that is added throw new IllegalArgumentException( - s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/incubator-pekko-persistence-r2dbc/issues") + s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/pekko-persistence-r2dbc/issues") } override def getObject(persistenceId: String): Future[GetObjectResult[A]] = diff --git a/project/AddMetaInfLicenseFiles.scala b/project/AddMetaInfLicenseFiles.scala index b0f561ca..102edda4 100644 --- a/project/AddMetaInfLicenseFiles.scala +++ b/project/AddMetaInfLicenseFiles.scala @@ -26,8 +26,4 @@ object AddMetaInfLicenseFiles extends AutoPlugin { override def trigger = allRequirements override def requires = ApacheSonatypePlugin - - override lazy val projectSettings = Seq( - apacheSonatypeDisclaimerFile := Some((LocalRootProject / baseDirectory).value / "DISCLAIMER")) - } diff --git a/project/Common.scala b/project/Common.scala index 4cc222ee..e1f79321 100644 --- a/project/Common.scala +++ b/project/Common.scala @@ -29,13 +29,13 @@ object Common extends AutoPlugin { // apiURL defined in projectSettings because version.value is not correct here scmInfo := Some( ScmInfo( - url("https://github.com/apache/incubator-pekko-projection"), - "git@github.com:apache/incubator-pekko-projection.git")), + url("https://github.com/apache/pekko-projection"), + "git@github.com:apache/pekko-projection.git")), developers += Developer( "contributors", "Contributors", "dev@pekko.apache.org", - url("https://github.com/apache/incubator-pekko-projection/graphs/contributors")), + url("https://github.com/apache/pekko-projection/graphs/contributors")), description := "Apache Pekko Projection.") val mimaCompareVersion = "1.0.0" @@ -55,7 +55,7 @@ object Common extends AutoPlugin { (ThisBuild / baseDirectory).value.toString, "-doc-source-url", { val branch = if (isSnapshot.value) "main" else s"v${version.value}" - s"https://github.com/apache/incubator-pekko-projection/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}" + s"https://github.com/apache/pekko-projection/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}" }) ++ (if (scalaBinaryVersion.value.startsWith("3")) { Seq("-skip-packages:org.apache.pekko.pattern") } else { diff --git a/project/project-info.conf b/project/project-info.conf index 29a9a8ae..d6edb419 100644 --- a/project/project-info.conf +++ b/project/project-info.conf @@ -11,11 +11,11 @@ project-info { new-tab: false } issues: { - url: "https://github.com/apache/incubator-pekko-projection/issues" + url: "https://github.com/apache/pekko-projection/issues" text: "GitHub issues" } release-notes: { - url: "https://github.com/apache/incubator-pekko-projection/releases" + url: "https://github.com/apache/pekko-projection/releases" text: "GitHub releases" } api-docs: [ @@ -34,8 +34,8 @@ project-info { url: "https://lists.apache.org/list.html?dev@pekko.apache.org" } { - text: "apache/incubator-pekko-projection discussion" - url: "https://github.com/apache/incubator-pekko-projection/discussions" + text: "apache/pekko-projection discussion" + url: "https://github.com/apache/pekko-projection/discussions" } ] }