You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/01/23 11:23:03 UTC

[incubator-pekko-projection] branch main updated: rename modules as pekko-* (#5)

This is an automated email from the ASF dual-hosted git repository.

fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-projection.git


The following commit(s) were added to refs/heads/main by this push:
     new 84f05b1  rename modules as pekko-* (#5)
84f05b1 is described below

commit 84f05b1f0b0767184c66a012dc45cf4ad3f41e4c
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Mon Jan 23 11:22:58 2023 +0000

    rename modules as pekko-* (#5)
---
 .github/workflows/checks.yml                       |  18 +--
 .github/workflows/integration-tests-cassandra.yml  |   8 +-
 .github/workflows/integration-tests-jdbc.yml       |  10 +-
 .github/workflows/integration-tests-kafka.yml      |   8 +-
 .github/workflows/integration-tests-slick.yml      |  10 +-
 .github/workflows/release.yml                      |  10 +-
 .github/workflows/unit-tests.yml                   |   6 +-
 .gitignore                                         |   4 +-
 build.sbt                                          |  28 ++--
 docs/src/main/paradox/cassandra.md                 |  14 +-
 docs/src/main/paradox/durable-state.md             |  10 +-
 docs/src/main/paradox/error.md                     |   4 +-
 docs/src/main/paradox/eventsourced.md              |  10 +-
 .../paradox/getting-started/projection-handler.md  |   4 +-
 docs/src/main/paradox/getting-started/running.md   |   4 +-
 .../main/paradox/getting-started/setup-your-app.md |   4 +-
 .../paradox/getting-started/source-provider.md     |   4 +-
 docs/src/main/paradox/getting-started/testing.md   |   4 +-
 docs/src/main/paradox/jdbc.md                      |  12 +-
 docs/src/main/paradox/kafka.md                     |  12 +-
 docs/src/main/paradox/overview.md                  |  14 +-
 docs/src/main/paradox/projection-settings.md       |   2 +-
 docs/src/main/paradox/running.md                   |   2 +-
 docs/src/main/paradox/slick.md                     |  12 +-
 docs/src/main/paradox/testing.md                   |  10 +-
 project/Common.scala                               |  28 ++--
 project/build.properties                           |   2 +-
 project/plugins.sbt                                |   6 +-
 project/project-info.conf                          | 151 ++++-----------------
 .../cassandra/CassandraProjectionTest.java         |   0
 .../src/it/resources/logback-test.xml              |   0
 .../cassandra/CassandraOffsetStoreSpec.scala       |   0
 .../cassandra/CassandraProjectionSpec.scala        |   0
 .../cassandra/ContainerSessionProvider.scala       |   0
 .../src/main/resources/reference.conf              |   0
 .../cassandra/internal/CassandraOffsetStore.scala  |   0
 .../internal/CassandraProjectionImpl.scala         |   0
 .../cassandra/internal/CassandraSettings.scala     |   0
 .../cassandra/javadsl/CassandraProjection.scala    |   0
 .../cassandra/scaladsl/CassandraProjection.scala   |   0
 .../projection/ProjectionBehaviorCompileTest.java  |   0
 .../src/test/resources/logback-test.xml            |   0
 .../akka/projection/ProjectionBehaviorSpec.scala   |   0
 .../scala/akka/projection/StatusObserverSpec.scala |   0
 .../scala/akka/projection/TestStatusObserver.scala |   0
 .../src/test/scala/akka/projection/TestTags.scala  |   0
 .../internal/HandlerRecoveryImplSpec.scala         |   0
 .../internal/OffsetSerializationSpec.scala         |   0
 .../internal/ProjectionSerializerSpec.scala        |   0
 .../internal/TelemetryProviderSpec.scala           |   0
 .../internal/metrics/ErrorRateMetricSpec.scala     |   0
 .../internal/metrics/LifecycleMetricSpec.scala     |   0
 .../metrics/OffsetCommittedCounterMetricSpec.scala |   0
 .../internal/metrics/ServiceTimeMetricSpec.scala   |   0
 .../internal/metrics/WaitTimeMetricSpec.scala      |   0
 .../internal/metrics/tools/InMemTelemetry.scala    |   0
 .../tools/InternalProjectionStateMetricsSpec.scala |   0
 .../internal/metrics/tools/TestHandlers.scala      |   0
 .../internal/protobuf/ProjectionMessages.java      |   0
 .../src/main/protobuf/ProjectionMessages.proto     |   0
 .../src/main/resources/reference.conf              |   0
 .../akka/projection/BySlicesSourceProvider.scala   |   0
 .../akka/projection/HandlerRecoveryStrategy.scala  |   0
 .../scala/akka/projection/MergeableOffset.scala    |   0
 .../scala/akka/projection/OffsetVerification.scala |   0
 .../main/scala/akka/projection/Projection.scala    |   0
 .../scala/akka/projection/ProjectionBehavior.scala |   0
 .../scala/akka/projection/ProjectionContext.scala  |   0
 .../main/scala/akka/projection/ProjectionId.scala  |   0
 .../scala/akka/projection/StatusObserver.scala     |   0
 .../projection/internal/ActorHandlerInit.scala     |   2 +-
 .../akka/projection/internal/HandlerAdapter.scala  |   0
 .../projection/internal/HandlerRecoveryImpl.scala  |   0
 .../projection/internal/InternalProjection.scala   |   0
 .../internal/InternalProjectionState.scala         |   0
 .../projection/internal/NoopStatusObserver.scala   |   0
 .../projection/internal/OffsetSerialization.scala  |   0
 .../akka/projection/internal/OffsetStrategy.scala  |   0
 .../internal/ProjectionContextImpl.scala           |   0
 .../projection/internal/ProjectionSerializer.scala |   0
 .../projection/internal/ProjectionSettings.scala   |   0
 .../internal/SourceProviderAdapter.scala           |   0
 .../scala/akka/projection/internal/Telemetry.scala |   0
 .../akka/projection/javadsl/ActorHandler.scala     |   0
 .../scala/akka/projection/javadsl/Handler.scala    |   0
 .../projection/javadsl/ProjectionManagement.scala  |   0
 .../akka/projection/javadsl/Projections.scala      |   0
 .../akka/projection/javadsl/SourceProvider.scala   |   0
 .../akka/projection/javadsl/StatefulHandler.scala  |   2 +-
 .../akka/projection/scaladsl/ActorHandler.scala    |   0
 .../scala/akka/projection/scaladsl/Handler.scala   |   0
 .../projection/scaladsl/ProjectionManagement.scala |   0
 .../akka/projection/scaladsl/Projections.scala     |   0
 .../akka/projection/scaladsl/SourceProvider.scala  |   0
 .../akka/projection/scaladsl/StatefulHandler.scala |   2 +-
 .../state/javadsl/DurableStateSourceProvider.scala |   2 +-
 .../scaladsl/DurableStateSourceProvider.scala      |   2 +-
 .../scaladsl/DurableStateSourceProviderSpec.scala  |   0
 .../projection/eventsourced/EventEnvelope.scala    |   0
 .../javadsl/EventSourcedProvider.scala             |   0
 .../scaladsl/EventSourcedProvider.scala            |   0
 .../src/it/resources/db/default-init.sql           |   0
 .../src/it/resources/db/oracle-init.sql            |   0
 .../src/it/resources/logback-test.xml              |   0
 .../jdbc/JdbcContainerOffsetStoreSpec.scala        |   0
 .../akka/projection/jdbc/JdbcProjectionSpec.scala  |   0
 .../src/main/resources/reference.conf              |   0
 .../projection/jdbc/JdbcHandlerLifecycle.scala     |   0
 .../scala/akka/projection/jdbc/JdbcSession.scala   |   0
 .../akka/projection/jdbc/internal/Dialect.scala    |   0
 .../jdbc/internal/JdbcHandlerAdapter.scala         |   0
 .../projection/jdbc/internal/JdbcOffsetStore.scala |   0
 .../jdbc/internal/JdbcProjectionImpl.scala         |   0
 .../projection/jdbc/internal/JdbcSessionUtil.scala |   0
 .../projection/jdbc/internal/JdbcSettings.scala    |   0
 .../akka/projection/jdbc/javadsl/JdbcHandler.scala |   0
 .../projection/jdbc/javadsl/JdbcProjection.scala   |   0
 .../projection/jdbc/scaladsl/JdbcHandler.scala     |   0
 .../projection/jdbc/scaladsl/JdbcProjection.scala  |   0
 .../akka/projection/jdbc/JdbcProjectionTest.java   |   0
 .../src/test/resources/logback-test.xml            |   0
 .../akka/projection/jdbc/JdbcOffsetStoreSpec.scala |   0
 .../jdbc/internal/JdbcSettingsSpec.scala           |   0
 .../src/it/resources/application.conf              |   0
 .../src/it/resources/logback-test.xml              |   0
 .../projection/kafka/KafkaSourceProviderSpec.scala |   0
 .../akka/projection/kafka/KafkaSpecBase.scala      |   0
 .../integration/KafkaToSlickIntegrationSpec.scala  |   0
 .../src/main/resources/reference.conf              |   0
 .../scala/akka/projection/kafka/KafkaOffsets.scala |   0
 .../kafka/internal/KafkaSourceProviderImpl.scala   |   0
 .../internal/KafkaSourceProviderSettings.scala     |   0
 .../kafka/internal/MetadataClientAdapter.scala     |   0
 .../kafka/javadsl/KafkaSourceProvider.scala        |   0
 .../kafka/scaladsl/KafkaSourceProvider.scala       |   0
 .../src/test/resources/application.conf            |   0
 .../src/test/resources/logback-test.xml            |   0
 .../internal/KafkaSourceProviderImplSpec.scala     |   0
 .../src/it/resources/logback-test.xml              |   0
 .../slick/SlickContainerOffsetStoreSpec.scala      |   0
 .../src/main/resources/reference.conf              |   0
 .../akka/projection/slick/SlickProjection.scala    |   0
 .../slick/internal/SlickOffsetStore.scala          |   0
 .../slick/internal/SlickProjectionImpl.scala       |   0
 .../projection/slick/internal/SlickSettings.scala  |   0
 .../src/test/resources/logback-test.xml            |   0
 .../projection/slick/SlickOffsetStoreSpec.scala    |   0
 .../projection/slick/SlickProjectionSpec.scala     |   0
 .../projection/testkit/internal/TestClock.scala    |   0
 .../internal/TestInMemoryOffsetStoreImpl.scala     |   0
 .../testkit/internal/TestOffsetStoreAdapter.scala  |   0
 .../testkit/internal/TestProjectionImpl.scala      |   0
 .../testkit/internal/TestSourceProviderImpl.scala  |   0
 .../testkit/javadsl/ProjectionTestKit.scala        |   0
 .../testkit/javadsl/TestOffsetStore.scala          |   0
 .../testkit/javadsl/TestProjection.scala           |   0
 .../testkit/javadsl/TestSourceProvider.scala       |   0
 .../testkit/scaladsl/ProjectionTestKit.scala       |   0
 .../testkit/scaladsl/TestOffsetStore.scala         |   0
 .../testkit/scaladsl/TestProjection.scala          |   0
 .../testkit/scaladsl/TestSourceProvider.scala      |   0
 .../testkit/javadsl/ProjectionTestKitTest.java     |   0
 .../src/test/resources/logback-test.xml            |   0
 .../testkit/scaladsl/ProjectionTestKitSpec.scala   |   0
 .../testkit/scaladsl/TestProjectionSpec.scala      |   0
 165 files changed, 168 insertions(+), 253 deletions(-)

diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 60dadef..fa3de3e 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -10,10 +10,10 @@ on:
 jobs:
   check-code-style:
     name: Check Code Style
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
@@ -25,7 +25,7 @@ jobs:
           git checkout scratch
 
       - name: Set up JDK 11
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: adopt@1.11.0-9
 
@@ -37,10 +37,10 @@ jobs:
 
   check-code-compilation:
     name: Check Code Compilation
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -51,7 +51,7 @@ jobs:
           git checkout scratch
 
       - name: Set up JDK 11
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: adopt@1.11.0-9
 
@@ -63,10 +63,10 @@ jobs:
 
   check-docs:
     name: Check Docs
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -77,7 +77,7 @@ jobs:
           git checkout scratch
 
       - name: Set up JDK 11
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: adopt@1.11.0-9
 
diff --git a/.github/workflows/integration-tests-cassandra.yml b/.github/workflows/integration-tests-cassandra.yml
index 68c4f30..9a7237e 100644
--- a/.github/workflows/integration-tests-cassandra.yml
+++ b/.github/workflows/integration-tests-cassandra.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     name: Build and Test Integration for Cassandra
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +19,7 @@ jobs:
           - { java-version: adopt@1.11.0-9, scala-version: 2.13.3,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
           git checkout scratch
 
       - name: Setup JDK ${{ matrix.java-version }}
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: ${{ matrix.java-version }}
 
@@ -38,7 +38,7 @@ jobs:
         uses: coursier/cache-action@v6.4.0
 
       - name: Run all integration tests with Scala ${{ matrix.scala-version }} and Java ${{ matrix.java-version }}
-        run: sbt "++${{ matrix.scala-version }} akka-projection-cassandra/it:test" ${{ matrix.sbt-opts }}
+        run: sbt "++${{ matrix.scala-version }} pekko-projection-cassandra/it:test" ${{ matrix.sbt-opts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 
diff --git a/.github/workflows/integration-tests-jdbc.yml b/.github/workflows/integration-tests-jdbc.yml
index 8db53ea..e61951d 100644
--- a/.github/workflows/integration-tests-jdbc.yml
+++ b/.github/workflows/integration-tests-jdbc.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     name: Build and Test Integration for JDBC
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +19,7 @@ jobs:
           - { java-version: adopt@1.11.0-9, scala-version: 2.13.3,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -31,10 +31,10 @@ jobs:
 
       - name: Copy license acceptance
         run: |-
-          cp container-license-acceptance.txt akka-projection-jdbc/src/it/resources/container-license-acceptance.txt
+          cp container-license-acceptance.txt projection-jdbc/src/it/resources/container-license-acceptance.txt
 
       - name: Setup JDK ${{ matrix.java-version }}
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: ${{ matrix.java-version }}
 
@@ -42,7 +42,7 @@ jobs:
         uses: coursier/cache-action@v6.4.0        
 
       - name: Run all integration tests with Scala ${{ matrix.scala-version }} and Java ${{ matrix.java-version }}
-        run: sbt "++${{ matrix.scala-version }} akka-projection-jdbc/it:test" ${{ matrix.sbt-opts }}
+        run: sbt "++${{ matrix.scala-version }} pekko-projection-jdbc/it:test" ${{ matrix.sbt-opts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 
diff --git a/.github/workflows/integration-tests-kafka.yml b/.github/workflows/integration-tests-kafka.yml
index e9aaa71..aa48c50 100644
--- a/.github/workflows/integration-tests-kafka.yml
+++ b/.github/workflows/integration-tests-kafka.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     name: Build and Test Integration for Kafka
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +19,7 @@ jobs:
           - { java-version: adopt@1.11.0-9, scala-version: 2.13.3,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
           git checkout scratch
 
       - name: Setup JDK ${{ matrix.java-version }}
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: ${{ matrix.java-version }}
 
@@ -38,7 +38,7 @@ jobs:
         uses: coursier/cache-action@v6.4.0
 
       - name: Run all integration tests with Scala ${{ matrix.scala-version }} and Java ${{ matrix.java-version }}
-        run: sbt "++${{ matrix.scala-version }} akka-projection-kafka/it:test" ${{ matrix.sbt-opts }}
+        run: sbt "++${{ matrix.scala-version }} pekko-projection-kafka/it:test" ${{ matrix.sbt-opts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 
diff --git a/.github/workflows/integration-tests-slick.yml b/.github/workflows/integration-tests-slick.yml
index 380a882..8989bc0 100644
--- a/.github/workflows/integration-tests-slick.yml
+++ b/.github/workflows/integration-tests-slick.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     name: Build and Test Integration for Slick
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +19,7 @@ jobs:
           - { java-version: adopt@1.11.0-9, scala-version: 2.13.3,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -31,10 +31,10 @@ jobs:
 
       - name: Copy license acceptance
         run: |-
-          cp container-license-acceptance.txt akka-projection-slick/src/it/resources/container-license-acceptance.txt
+          cp container-license-acceptance.txt projection-slick/src/it/resources/container-license-acceptance.txt
 
       - name: Setup JDK ${{ matrix.java-version }}
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: ${{ matrix.java-version }}
 
@@ -42,7 +42,7 @@ jobs:
         uses: coursier/cache-action@v6.4.0
 
       - name: Run all integration tests with Scala ${{ matrix.scala-version }} and Java ${{ matrix.java-version }}
-        run: sbt "++${{ matrix.scala-version }} akka-projection-slick/it:test" ${{ matrix.sbt-opts }}
+        run: sbt "++${{ matrix.scala-version }} pekko-projection-slick/it:test" ${{ matrix.sbt-opts }}
         env: # Disable Ryuk resource reaper since we always spin up fresh VMs
           TESTCONTAINERS_RYUK_DISABLED: true
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 10fb641..889f5ac 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -9,15 +9,15 @@ on:
 jobs:
   release:
     # runs on main repo only
-    if: github.repository == 'akka/akka-projection'
+    if: github.repository == 'apache/incubator-pekko-projection'
     name: Release
     # the release environment provides access to secrets required in the release process
-    # https://github.com/akka/akka-projection/settings/environments
+    # https://github.com/apache/incubator-pekko-projection/settings/environments
     environment: release
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
@@ -29,7 +29,7 @@ jobs:
           git checkout scratch
 
       - name: Setup Scala with JDK 8
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
 
       - name: Cache Coursier cache
         uses: coursier/cache-action@v6.4.0
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 27b8b5d..35ed7ec 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   test:
     name: Build and Test
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +19,7 @@ jobs:
           - { java-version: adopt@1.11.0-9, scala-version: 2.13.3,  sbt-opts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
@@ -30,7 +30,7 @@ jobs:
           git checkout scratch
 
       - name: Setup JDK ${{ matrix.java-version }}
-        uses: olafurpg/setup-scala@v10
+        uses: olafurpg/setup-scala@v13
         with:
           java-version: ${{ matrix.java-version }}
 
diff --git a/.gitignore b/.gitignore
index 7437952..7a93f65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,7 @@ target
 
 # we don't want to push this file,
 # each contributor must create its own to signal acceptance
-akka-projection-jdbc/src/it/resources/container-license-acceptance.txt
-akka-projection-slick/src/it/resources/container-license-acceptance.txt
+projection-jdbc/src/it/resources/container-license-acceptance.txt
+projection-slick/src/it/resources/container-license-acceptance.txt
 
 .bsp
diff --git a/build.sbt b/build.sbt
index 3160ddd..4145c0c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -1,20 +1,20 @@
 import akka.projections.Dependencies
 
 lazy val core =
-  Project(id = "akka-projection-core", base = file("akka-projection-core"))
+  Project(id = "pekko-projection-core", base = file("projection-core"))
     .configs(IntegrationTest)
     .settings(headerSettings(IntegrationTest))
     .settings(Defaults.itSettings)
     .settings(Dependencies.core)
     .settings(MetaInfLicenseNoticeCopy.settings)
     .settings(
-      name := "akka-projection-core",
+      name := "pekko-projection-core",
       Compile / packageBin / packageOptions += Package.ManifestAttributes(
-          "Automatic-Module-Name" -> "akka.projection.core"))
+          "Automatic-Module-Name" -> "pekko.projection.core"))
     .settings(Protobuf.settings)
 
 lazy val coreTest =
-  Project(id = "akka-projection-core-test", base = file("akka-projection-core-test"))
+  Project(id = "pekko-projection-core-test", base = file("projection-core-test"))
     .configs(IntegrationTest)
     .settings(headerSettings(IntegrationTest))
     .disablePlugins(MimaPlugin)
@@ -26,7 +26,7 @@ lazy val coreTest =
     .dependsOn(testkit % Test)
 
 lazy val testkit =
-  Project(id = "akka-projection-testkit", base = file("akka-projection-testkit"))
+  Project(id = "pekko-projection-testkit", base = file("projection-testkit"))
     .configs(IntegrationTest)
     .settings(headerSettings(IntegrationTest))
     .settings(Defaults.itSettings)
@@ -36,7 +36,7 @@ lazy val testkit =
 
 // provides offset storage backed by a JDBC table
 lazy val jdbc =
-  Project(id = "akka-projection-jdbc", base = file("akka-projection-jdbc"))
+  Project(id = "pekko-projection-jdbc", base = file("projection-jdbc"))
     .configs(IntegrationTest.extend(Test))
     .settings(headerSettings(IntegrationTest))
     .settings(Defaults.itSettings)
@@ -48,7 +48,7 @@ lazy val jdbc =
 
 // provides offset storage backed by a JDBC (Slick) table
 lazy val slick =
-  Project(id = "akka-projection-slick", base = file("akka-projection-slick"))
+  Project(id = "pekko-projection-slick", base = file("projection-slick"))
     .configs(IntegrationTest.extend(Test))
     .settings(headerSettings(IntegrationTest))
     .settings(Defaults.itSettings)
@@ -61,7 +61,7 @@ lazy val slick =
 
 // provides offset storage backed by a Cassandra table
 lazy val cassandra =
-  Project(id = "akka-projection-cassandra", base = file("akka-projection-cassandra"))
+  Project(id = "pekko-projection-cassandra", base = file("projection-cassandra"))
     .configs(IntegrationTest)
     .settings(headerSettings(IntegrationTest))
     .settings(Defaults.itSettings)
@@ -74,9 +74,9 @@ lazy val cassandra =
     .dependsOn(coreTest % "test->test;it->test")
     .dependsOn(testkit % "test->compile;it->compile")
 
-// provides source providers for akka-persistence-query
+// provides source providers for pekko-persistence-query
 lazy val eventsourced =
-  Project(id = "akka-projection-eventsourced", base = file("akka-projection-eventsourced"))
+  Project(id = "pekko-projection-eventsourced", base = file("projection-eventsourced"))
     .settings(Dependencies.eventsourced)
     .settings(MetaInfLicenseNoticeCopy.settings)
     .dependsOn(core)
@@ -84,7 +84,7 @@ lazy val eventsourced =
 
 // provides offset storage backed by Kafka managed offset commits
 lazy val kafka =
-  Project(id = "akka-projection-kafka", base = file("akka-projection-kafka"))
+  Project(id = "pekko-projection-kafka", base = file("projection-kafka"))
     .configs(IntegrationTest)
     .settings(headerSettings(IntegrationTest))
     .settings(Defaults.itSettings)
@@ -96,7 +96,7 @@ lazy val kafka =
 
 // provides source providers for durable state changes
 lazy val `durable-state` =
-  Project(id = "akka-projection-durable-state", base = file("akka-projection-durable-state"))
+  Project(id = "pekko-projection-durable-state", base = file("projection-durable-state"))
     .configs(IntegrationTest)
     .settings(Dependencies.state)
     .settings(MetaInfLicenseNoticeCopy.settings)
@@ -123,7 +123,7 @@ lazy val examples = project
   .settings(publish / skip := true, scalacOptions += "-feature", javacOptions += "-parameters")
 
 lazy val docs = project
-  .enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
+  .enablePlugins(ParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
   .disablePlugins(MimaPlugin)
   .dependsOn(core, testkit)
   .settings(
@@ -169,7 +169,7 @@ lazy val docs = project
     publishRsyncHost := "akkarepo@gustav.akka.io",
     apidocRootPackage := "akka")
 
-lazy val root = Project(id = "akka-projection", base = file("."))
+lazy val root = Project(id = "projection", base = file("."))
   .aggregate(core, coreTest, testkit, jdbc, slick, cassandra, eventsourced, kafka, `durable-state`, examples, docs)
   .settings(publish / skip := true)
   .enablePlugins(ScalaUnidocPlugin)
diff --git a/docs/src/main/paradox/cassandra.md b/docs/src/main/paradox/cassandra.md
index c61d7e4..2444b5d 100644
--- a/docs/src/main/paradox/cassandra.md
+++ b/docs/src/main/paradox/cassandra.md
@@ -16,20 +16,20 @@ processing semantics, but not exactly-once.
 To use the Cassandra module of Akka Projections add the following dependency in your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-cassandra_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-cassandra_$scala.binary.version$
   version=$project.version$
 }
 
 Akka Projections requires Akka $akka.version$ or later, see @ref:[Akka version](overview.md#akka-version).
 
-@@project-info{ projectId="akka-projection-cassandra" }
+@@project-info{ projectId="pekko-projection-cassandra" }
 
 ### Transitive dependencies
 
-The table below shows `akka-projection-cassandra`'s direct dependencies and the second tab shows all libraries it depends on transitively.
+The table below shows `pekko-projection-cassandra`'s direct dependencies and the second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-cassandra" }
+@@dependencies{ projectId="pekko-projection-cassandra" }
 
 ## at-least-once
 
@@ -289,7 +289,7 @@ Make your edits/overrides in your application.conf.
 
 The reference configuration file with the default values:
 
-@@snip [reference.conf](/akka-projection-cassandra/src/main/resources/reference.conf) { #config }
+@@snip [reference.conf](/projection-cassandra/src/main/resources/reference.conf) { #config }
 
 ### Cassandra driver configuration
 
@@ -320,7 +320,7 @@ akka.projection.cassandra {
 
 ### Cassandra driver overrides
 
-@@snip [reference.conf](/akka-projection-cassandra/src/main/resources/reference.conf) { #profile }
+@@snip [reference.conf](/projection-cassandra/src/main/resources/reference.conf) { #profile }
 
 ### Contact points configuration
 
diff --git a/docs/src/main/paradox/durable-state.md b/docs/src/main/paradox/durable-state.md
index f82942e..40d0e9c 100644
--- a/docs/src/main/paradox/durable-state.md
+++ b/docs/src/main/paradox/durable-state.md
@@ -10,20 +10,20 @@ Akka Projections has integration with `changes`, which is described here.
 To use the Durable State module of Akka Projections, add the following dependency in your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-durable-state_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-durable-state_$scala.binary.version$
   version=$project.version$
 }
 
 Akka Projections requires Akka $akka.version$ or later, see @ref:[Akka version](overview.md#akka-version).
 
-@@project-info{ projectId="akka-projection-durable-state" }
+@@project-info{ projectId="pekko-projection-durable-state" }
 
 ### Transitive dependencies
 
-The table below shows the `akka-projection-durable-state` direct dependencies.The second tab shows all libraries it depends on transitively.
+The table below shows the `pekko-projection-durable-state` direct dependencies.The second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-durable-state" }
+@@dependencies{ projectId="pekko-projection-durable-state" }
 
 ## SourceProvider for changesByTag
 
diff --git a/docs/src/main/paradox/error.md b/docs/src/main/paradox/error.md
index b26b3f1..1b7bb4d 100644
--- a/docs/src/main/paradox/error.md
+++ b/docs/src/main/paradox/error.md
@@ -32,7 +32,7 @@ Java
 If the recovery strategy is not defined on the `Projection` the default is `fail`, and that can be defined
 in configuration:
 
-@@snip [reference.conf](/akka-projection-core/src/main/resources/reference.conf) { #recovery-strategy }
+@@snip [reference.conf](/projection-core/src/main/resources/reference.conf) { #recovery-strategy }
  
 
 ## Projection restart
@@ -55,4 +55,4 @@ Java
  
 If the recovery strategy is not defined on the `Projection` the default is defined in configuration:
 
-@@snip [reference.conf](/akka-projection-core/src/main/resources/reference.conf) { #restart-backoff }
+@@snip [reference.conf](/projection-core/src/main/resources/reference.conf) { #restart-backoff }
diff --git a/docs/src/main/paradox/eventsourced.md b/docs/src/main/paradox/eventsourced.md
index c4338b5..dd1b60a 100644
--- a/docs/src/main/paradox/eventsourced.md
+++ b/docs/src/main/paradox/eventsourced.md
@@ -10,20 +10,20 @@ Akka Projections has integration with `eventsByTag`, which is described here.
 To use the Event Sourced module of Akka Projections add the following dependency in your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-eventsourced_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-eventsourced_$scala.binary.version$
   version=$project.version$
 }
 
 Akka Projections require Akka $akka.version$ or later, see @ref:[Akka version](overview.md#akka-version).
 
-@@project-info{ projectId="akka-projection-eventsourced" }
+@@project-info{ projectId="pekko-projection-eventsourced" }
 
 ### Transitive dependencies
 
-The table below shows `akka-projection-eventsourced`'s direct dependencies and the second tab shows all libraries it depends on transitively.
+The table below shows `pekko-projection-eventsourced`'s direct dependencies and the second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-eventsourced" }
+@@dependencies{ projectId="pekko-projection-eventsourced" }
 
 ## SourceProvider for eventsByTag
 
diff --git a/docs/src/main/paradox/getting-started/projection-handler.md b/docs/src/main/paradox/getting-started/projection-handler.md
index 8b30f77..7181597 100644
--- a/docs/src/main/paradox/getting-started/projection-handler.md
+++ b/docs/src/main/paradox/getting-started/projection-handler.md
@@ -11,8 +11,8 @@ The Projection itself will be represented as a Cassandra table.
 To proceed we must add the Cassandra Projection library to our project:
 
 @@dependency [sbt,Maven,Gradle] {
-group=com.lightbend.akka
-artifact=akka-projection-cassandra_$scala.binary.version$
+group=org.apache.pekko
+artifact=pekko-projection-cassandra_$scala.binary.version$
 version=$project.version$
 }
 
diff --git a/docs/src/main/paradox/getting-started/running.md b/docs/src/main/paradox/getting-started/running.md
index ca82001..3ae44c1 100644
--- a/docs/src/main/paradox/getting-started/running.md
+++ b/docs/src/main/paradox/getting-started/running.md
@@ -50,8 +50,8 @@ To learn more about the writing events with [Akka Persistence see the Akka docum
 Add the Akka Cluster Sharding library to your project:
 
 @@dependency [sbt,Maven,Gradle] {
-group=com.typesafe.akka
-artifact=akka-cluster-sharding-typed_$scala.binary.version$
+group=org.apache.pekko
+artifact=pekko-cluster-sharding-typed_$scala.binary.version$
 version=$akka.version$
 }
 
diff --git a/docs/src/main/paradox/getting-started/setup-your-app.md b/docs/src/main/paradox/getting-started/setup-your-app.md
index 431f045..acfed40 100644
--- a/docs/src/main/paradox/getting-started/setup-your-app.md
+++ b/docs/src/main/paradox/getting-started/setup-your-app.md
@@ -4,8 +4,8 @@ Add the Akka Projections core library to a new project.
 This isn't strictly required, because as we add other dependencies in the following steps it will transitively include core as a dependency, but it never hurts to be explicit.
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-core_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-core_$scala.binary.version$
   version=$project.version$
 }
 
diff --git a/docs/src/main/paradox/getting-started/source-provider.md b/docs/src/main/paradox/getting-started/source-provider.md
index 6f66501..a7afd02 100644
--- a/docs/src/main/paradox/getting-started/source-provider.md
+++ b/docs/src/main/paradox/getting-started/source-provider.md
@@ -8,8 +8,8 @@ There are several supported Source Provider's available (or you can build your o
 Add the following dependencies to your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-eventsourced_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-eventsourced_$scala.binary.version$
   version=$project.version$
 }
 
diff --git a/docs/src/main/paradox/getting-started/testing.md b/docs/src/main/paradox/getting-started/testing.md
index 5a68806..df2d12b 100644
--- a/docs/src/main/paradox/getting-started/testing.md
+++ b/docs/src/main/paradox/getting-started/testing.md
@@ -4,8 +4,8 @@ Like other Akka libraries, Projections ships with a @ref:[TestKit](../testing.md
 Add the Projections TestKit dependency to your project:
 
 @@dependency [sbt,Maven,Gradle] {
-group=com.lightbend.akka
-artifact=akka-projection-testkit_$scala.binary.version$
+group=org.apache.pekko
+artifact=pekko-projection-testkit_$scala.binary.version$
 version=$project.version$
 }
 
diff --git a/docs/src/main/paradox/jdbc.md b/docs/src/main/paradox/jdbc.md
index 290cf83..2e99cc3 100644
--- a/docs/src/main/paradox/jdbc.md
+++ b/docs/src/main/paradox/jdbc.md
@@ -13,21 +13,21 @@ processing semantics is supported. It also offers @ref:[at-least-once](#at-least
 To use the JDBC module of Akka Projections add the following dependency in your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-jdbc_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-jdbc_$scala.binary.version$
   version=$project.version$
 }
 
 Akka Projections require Akka $akka.version$ or later, see @ref:[Akka version](overview.md#akka-version).
 
-@@project-info{ projectId="akka-projection-jdbc" }
+@@project-info{ projectId="pekko-projection-jdbc" }
 
 
 ### Transitive dependencies
 
-The table below shows `akka-projection-jdbc`'s direct dependencies, and the second tab shows all libraries it depends on transitively.
+The table below shows `pekko-projection-jdbc`'s direct dependencies, and the second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-jdbc" }
+@@dependencies{ projectId="pekko-projection-jdbc" }
 
 ## Required configuration settings
 
@@ -262,7 +262,7 @@ Make your edits/overrides in your application.conf.
 
 The reference configuration file with the default values:
 
-@@snip [reference.conf](/akka-projection-jdbc/src/main/resources/reference.conf) { #config }
+@@snip [reference.conf](/projection-jdbc/src/main/resources/reference.conf) { #config }
 
 @@@ note
 Settings `akka.projection.jdbc.dialect` and `akka.projection.jdbc.blocking-jdbc-dispatcher.thread-pool-executor.fixed-pool-size` do not have a valid default value. You must configured them in your `application.conf` file.  
diff --git a/docs/src/main/paradox/kafka.md b/docs/src/main/paradox/kafka.md
index 85c369c..2ecff5a 100644
--- a/docs/src/main/paradox/kafka.md
+++ b/docs/src/main/paradox/kafka.md
@@ -22,20 +22,20 @@ A `Projection` can also @ref:[send messages to Kafka](#sending-to-kafka).
 To use the Kafka module of Akka Projections add the following dependency in your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-kafka_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-kafka_$scala.binary.version$
   version=$project.version$
 }
 
 Akka Projections require Akka $akka.version$ or later, see @ref:[Akka version](overview.md#akka-version).
 
-@@project-info{ projectId="akka-projection-kafka" }
+@@project-info{ projectId="pekko-projection-kafka" }
 
 ### Transitive dependencies
 
-The table below shows `akka-projection-kafka`'s direct dependencies and the second tab shows all libraries it depends on transitively.
+The table below shows `pekko-projection-kafka`'s direct dependencies and the second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-kafka" }
+@@dependencies{ projectId="pekko-projection-kafka" }
 
 ## KafkaSourceProvider
 
@@ -167,4 +167,4 @@ Make your edits/overrides in your application.conf.
 
 The reference configuration file with the default values:
 
-@@snip [reference.conf](/akka-projection-kafka/src/main/resources/reference.conf) { #config }
+@@snip [reference.conf](/projection-kafka/src/main/resources/reference.conf) { #config }
diff --git a/docs/src/main/paradox/overview.md b/docs/src/main/paradox/overview.md
index dd19079..90754af 100644
--- a/docs/src/main/paradox/overview.md
+++ b/docs/src/main/paradox/overview.md
@@ -46,15 +46,15 @@ each module describes which dependency you should define in your project.
 * @ref:[Offset in a relational DB with JDBC](jdbc.md)
 * @ref:[Offset in a relational DB with Slick](slick.md) (community-driven module)
 
-All of them share a dependency to `akka-projection-core`: 
+All of them share a dependency to `pekko-projection-core`: 
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-core_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-core_$scala.binary.version$
   version=$project.version$
 }
 
-@@project-info{ projectId="akka-projection-core" }
+@@project-info{ projectId="pekko-projection-core" }
 
 ### Akka version
 
@@ -68,7 +68,7 @@ them explicitly to avoid problems with transient dependencies causing an unlucky
   symbol=AkkaVersion
   value=$akka.version$
   group=com.typesafe.akka
-  artifact=akka-cluster-sharding-typed_$scala.binary.version$
+  artifact=pekko-cluster-sharding-typed_$scala.binary.version$
   version=AkkaVersion
   group2=com.typesafe.akka
   artifact2=akka-persistence-query_$scala.binary.version$
@@ -80,9 +80,9 @@ them explicitly to avoid problems with transient dependencies causing an unlucky
 
 ### Transitive dependencies
 
-The table below shows `akka-projection-core`'s direct dependencies and the second tab shows all libraries it depends on transitively.
+The table below shows `pekko-projection-core`'s direct dependencies and the second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-core" }
+@@dependencies{ projectId="pekko-projection-core" }
 
 See the individual modules for their transitive dependencies.
 
diff --git a/docs/src/main/paradox/projection-settings.md b/docs/src/main/paradox/projection-settings.md
index 2c2059e..2af674d 100644
--- a/docs/src/main/paradox/projection-settings.md
+++ b/docs/src/main/paradox/projection-settings.md
@@ -12,4 +12,4 @@ Java
 
 ## Configuration
 
-@@snip [reference.conf](/akka-projection-core/src/main/resources/reference.conf)
+@@snip [reference.conf](/projection-core/src/main/resources/reference.conf)
diff --git a/docs/src/main/paradox/running.md b/docs/src/main/paradox/running.md
index 932c4a7..3a75251 100644
--- a/docs/src/main/paradox/running.md
+++ b/docs/src/main/paradox/running.md
@@ -8,7 +8,7 @@ To distribute the projection over the cluster we recommend the use of [ShardedDa
 
 @@dependency [sbt,Maven,Gradle] {
   group=com.typesafe.akka
-  artifact=akka-cluster-sharding-typed_$scala.binary.version$
+  artifact=pekko-cluster-sharding-typed_$scala.binary.version$
   version=$akka.version$
 }
 
diff --git a/docs/src/main/paradox/slick.md b/docs/src/main/paradox/slick.md
index b87399f..d45d36b 100644
--- a/docs/src/main/paradox/slick.md
+++ b/docs/src/main/paradox/slick.md
@@ -24,20 +24,20 @@ processing semantics is supported. It also offers @ref:[at-least-once](#at-least
 To use the Slick module of Akka Projections add the following dependency in your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-slick_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-slick_$scala.binary.version$
   version=$project.version$
 }
 
 Akka Projections require Akka $akka.version$ or later, see @ref:[Akka version](overview.md#akka-version).
 
-@@project-info{ projectId="akka-projection-slick" }
+@@project-info{ projectId="pekko-projection-slick" }
 
 ### Transitive dependencies
 
-The table below shows `akka-projection-slick`'s direct dependencies and the second tab shows all libraries it depends on transitively.
+The table below shows `pekko-projection-slick`'s direct dependencies and the second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-slick" }
+@@dependencies{ projectId="pekko-projection-slick" }
 
 ## exactly-once
 
@@ -211,4 +211,4 @@ Make your edits/overrides in your application.conf.
 
 The reference configuration file with the default values:
 
-@@snip [reference.conf](/akka-projection-slick/src/main/resources/reference.conf) { #config }
+@@snip [reference.conf](/projection-slick/src/main/resources/reference.conf) { #config }
diff --git a/docs/src/main/paradox/testing.md b/docs/src/main/paradox/testing.md
index e6e3da3..c1e0699 100644
--- a/docs/src/main/paradox/testing.md
+++ b/docs/src/main/paradox/testing.md
@@ -7,21 +7,21 @@ Akka Projections provides a TestKit to ease testing. There are two supported sty
 To use the Akka Projections TestKit add the following dependency in your project:
 
 @@dependency [sbt,Maven,Gradle] {
-  group=com.lightbend.akka
-  artifact=akka-projection-testkit_$scala.binary.version$
+  group=org.apache.pekko
+  artifact=pekko-projection-testkit_$scala.binary.version$
   version=$project.version$
   scope="test"
 }
 
 Akka Projections require Akka $akka.version$ or later, see @ref:[Akka version](overview.md#akka-version).
 
-@@project-info{ projectId="akka-projection-testkit" }
+@@project-info{ projectId="pekko-projection-testkit" }
 
 ### Transitive dependencies
 
-The table below shows `akka-projection-testkit`'s direct dependencies and the second tab shows all libraries it depends on transitively.
+The table below shows `pekko-projection-testkit`'s direct dependencies and the second tab shows all libraries it depends on transitively.
 
-@@dependencies{ projectId="akka-projection-testkit" }
+@@dependencies{ projectId="pekko-projection-testkit" }
 
 ## Initializing the Projection TestKit
 
diff --git a/project/Common.scala b/project/Common.scala
index 499a00b..0dd4e95 100644
--- a/project/Common.scala
+++ b/project/Common.scala
@@ -17,21 +17,23 @@ object Common extends AutoPlugin {
 
   override def globalSettings =
     Seq(
-      organization := "com.lightbend.akka",
-      organizationName := "Lightbend Inc.",
-      organizationHomepage := Some(url("https://www.lightbend.com/")),
-      startYear := Some(2020),
-      homepage := Some(url("https://akka.io")),
+      organization := "org.apache.pekko",
+      organizationName := "Apache Software Foundation",
+      organizationHomepage := Some(url("https://www.apache.org/")),
+      startYear := Some(2022),
+      homepage := Some(url("https://pekko.apache.org/")),
       // apiURL defined in projectSettings because version.value is not correct here
       scmInfo := Some(
-          ScmInfo(url("https://github.com/akka/akka-projection"), "git@github.com:akka/akka-projection.git")),
+          ScmInfo(
+            url("https://github.com/apache/incubator-pekko-projection"),
+            "git@github.com:apache/incubator-pekko-projection.git")),
       developers += Developer(
           "contributors",
           "Contributors",
-          "https://gitter.im/akka/dev",
-          url("https://github.com/akka/akka-projection/graphs/contributors")),
+          "dev@pekko.apache.org",
+          url("https://github.com/apache/incubator-pekko-projection/graphs/contributors")),
       licenses := Seq(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0"))),
-      description := "Akka Projection.")
+      description := "Apache Pekko Projection.")
 
   override lazy val projectSettings = Seq(
     projectInfoVersion := (if (isSnapshot.value) "snapshot" else version.value),
@@ -41,14 +43,14 @@ object Common extends AutoPlugin {
     javacOptions ++= List("-Xlint:unchecked", "-Xlint:deprecation"),
     Compile / doc / scalacOptions := scalacOptions.value ++ Seq(
         "-doc-title",
-        "Akka Projection",
+        "Apache Pekko Projection",
         "-doc-version",
         version.value,
         "-sourcepath",
         (baseDirectory in ThisBuild).value.toString,
         "-doc-source-url", {
-          val branch = if (isSnapshot.value) "master" else s"v${version.value}"
-          s"https://github.com/akka/akka-projection/tree/${branch}€{FILE_PATH_EXT}#L€{FILE_LINE}"
+          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}"
         },
         "-skip-packages",
         "akka.pattern" // for some reason Scaladoc creates this
@@ -65,6 +67,6 @@ object Common extends AutoPlugin {
     Test / logBuffered := false,
     // temporarily disable mima checks
     mimaPreviousArtifacts := Set.empty,
-    sonatypeProfileName := "com.lightbend")
+    sonatypeProfileName := "org.apache.pekko")
 
 }
diff --git a/project/build.properties b/project/build.properties
index 8b9a0b0..46e43a9 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.8.0
+sbt.version=1.8.2
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6a6ed11..98fe310 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -5,7 +5,11 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0")
 addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.10")
 
 // Documentation
-addSbtPlugin("com.lightbend.akka" % "sbt-paradox-akka" % "0.42")
+// We have to deliberately use older versions of sbt-paradox because current Pekko sbt build
+// only loads on JDK 1.8 so we need to bring in older versions of parboiled which support JDK 1.8
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-apidoc" % "0.10.1")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-project-info" % "2.0.0")
 addSbtPlugin("com.lightbend.paradox" % "sbt-paradox-dependencies" % "0.2.2")
 addSbtPlugin("com.lightbend.sbt" % "sbt-publish-rsync" % "0.2")
 addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
diff --git a/project/project-info.conf b/project/project-info.conf
index 08ced31..0349ecd 100644
--- a/project/project-info.conf
+++ b/project/project-info.conf
@@ -9,11 +9,11 @@ project-info {
       new-tab: false
     }
     issues: {
-      url: "https://github.com/akka/akka-projection/issues"
+      url: "https://github.com/apache/incubator-pekko-projection/issues"
       text: "GitHub issues"
     }
     release-notes: {
-      url: "https://github.com/akka/akka-projection/releases"
+      url: "https://github.com/apache/incubator-pekko-projection/releases"
       text: "GitHub releases"
     }
     api-docs: [
@@ -24,136 +24,45 @@ project-info {
     ]
     forums: [
       {
-        text: "Lightbend Discuss"
-        url: "https://discuss.lightbend.com/c/akka/"
+        text: "Apache Pekko Dev mailing list"
+        url: "https://lists.apache.org/list.html?dev@pekko.apache.org"
       }
       {
-        text: "akka/akka Gitter channel"
-        url: "https://gitter.im/akka/akka"
+        text: "apache/incubator-pekko-projection discussion"
+        url: "https://github.com/apache/incubator-pekko-projection/discussions"
       }
     ]
   }
-  akka-projection-core: ${project-info.shared-info} {
-    title: "Akka Projections Core"
-    jpms-name: "akka.projection.core"
-    levels: [
-      {
-        readiness: Supported
-        since: "2020-09-10"
-        since-version: "1.0.0"
-      }
-      {
-        readiness: CommunityDriven
-        since: "2020-04-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-core: ${project-info.shared-info} {
+    title: "Apache Pekko Projections Core"
+    jpms-name: "pekko.projection.core"
   }
-  akka-projection-cassandra: ${project-info.shared-info} {
-    title: "Akka Projections Cassandra"
-    jpms-name: "akka.projection.cassandra"
-    levels: [
-      {
-        readiness: Supported
-        since: "2020-09-10"
-        since-version: "1.0.0"
-      }
-      {
-        readiness: CommunityDriven
-        since: "2020-04-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-cassandra: ${project-info.shared-info} {
+    title: "Apache Pekko Projections Cassandra"
+    jpms-name: "pekko.projection.cassandra"
   }
-  akka-projection-durable-state: ${project-info.shared-info} {
-    title: "Akka Projections Durable State"
-    jpms-name: "akka.projection.durable-state"
-    levels: [
-      {
-        readiness: Supported
-        since: "2021-08-19"
-        since-version: "1.2.2"
-      }
-      {
-        readiness: CommunityDriven
-        since: "2021-06-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-durable-state: ${project-info.shared-info} {
+    title: "Apache Pekko Projections Durable State"
+    jpms-name: "pekko.projection.durable-state"
   }
-  akka-projection-jdbc: ${project-info.shared-info} {
-    title: "Akka Projections JDBC"
-    jpms-name: "akka.projection.jdbc"
-    levels: [
-      {
-        readiness: Supported
-        since: "2020-09-10"
-        since-version: "1.0.0"
-      }
-      {
-        readiness: CommunityDriven
-        since: "2020-04-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-jdbc: ${project-info.shared-info} {
+    title: "Apache Pekko Projections JDBC"
+    jpms-name: "pekko.projection.jdbc"
   }
-  akka-projection-slick: ${project-info.shared-info} {
-    title: "Akka Projections Slick"
-    jpms-name: "akka.projection.slick"
-    levels: [
-      {
-        readiness: CommunityDriven
-        since: "2020-04-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-slick: ${project-info.shared-info} {
+    title: "Apache Pekko Projections Slick"
+    jpms-name: "pekko.projection.slick"
   }
-  akka-projection-eventsourced: ${project-info.shared-info} {
-    title: "Akka Projections Eventsourced"
-    jpms-name: "akka.projection.eventsourced"
-    levels: [
-      {
-        readiness: Supported
-        since: "2020-09-10"
-        since-version: "1.0.0"
-      }
-      {
-        readiness: CommunityDriven
-        since: "2020-04-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-eventsourced: ${project-info.shared-info} {
+    title: "Apache Pekko Projections Eventsourced"
+    jpms-name: "pekko.projection.eventsourced"
   }
-  akka-projection-kafka: ${project-info.shared-info} {
-    title: "Akka Projections Kafka"
-    jpms-name: "akka.projection.kafka"
-    levels: [
-      {
-        readiness: Supported
-        since: "2020-09-10"
-        since-version: "1.0.0"
-      }
-      {
-        readiness: CommunityDriven
-        since: "2020-04-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-kafka: ${project-info.shared-info} {
+    title: "Apache Pekko Projections Kafka"
+    jpms-name: "pekko.projection.kafka"
   }
-  akka-projection-testkit: ${project-info.shared-info} {
-    title: "Akka Projections TestKit"
-    jpms-name: "akka.projection.testkit"
-    levels: [
-      {
-        readiness: Supported
-        since: "2020-09-10"
-        since-version: "1.0.0"
-      }
-      {
-        readiness: CommunityDriven
-        since: "2020-04-01"
-        since-version: "0.0"
-      }
-    ]
+  pekko-projection-testkit: ${project-info.shared-info} {
+    title: "Apache Pekko Projections TestKit"
+    jpms-name: "pekko.projection.testkit"
   }
 }
diff --git a/akka-projection-cassandra/src/it/java/akka/projection/cassandra/CassandraProjectionTest.java b/projection-cassandra/src/it/java/akka/projection/cassandra/CassandraProjectionTest.java
similarity index 100%
rename from akka-projection-cassandra/src/it/java/akka/projection/cassandra/CassandraProjectionTest.java
rename to projection-cassandra/src/it/java/akka/projection/cassandra/CassandraProjectionTest.java
diff --git a/akka-projection-cassandra/src/it/resources/logback-test.xml b/projection-cassandra/src/it/resources/logback-test.xml
similarity index 100%
rename from akka-projection-cassandra/src/it/resources/logback-test.xml
rename to projection-cassandra/src/it/resources/logback-test.xml
diff --git a/akka-projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraOffsetStoreSpec.scala b/projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraOffsetStoreSpec.scala
similarity index 100%
rename from akka-projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraOffsetStoreSpec.scala
rename to projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraOffsetStoreSpec.scala
diff --git a/akka-projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraProjectionSpec.scala b/projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraProjectionSpec.scala
similarity index 100%
rename from akka-projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraProjectionSpec.scala
rename to projection-cassandra/src/it/scala/akka/projection/cassandra/CassandraProjectionSpec.scala
diff --git a/akka-projection-cassandra/src/it/scala/akka/projection/cassandra/ContainerSessionProvider.scala b/projection-cassandra/src/it/scala/akka/projection/cassandra/ContainerSessionProvider.scala
similarity index 100%
rename from akka-projection-cassandra/src/it/scala/akka/projection/cassandra/ContainerSessionProvider.scala
rename to projection-cassandra/src/it/scala/akka/projection/cassandra/ContainerSessionProvider.scala
diff --git a/akka-projection-cassandra/src/main/resources/reference.conf b/projection-cassandra/src/main/resources/reference.conf
similarity index 100%
rename from akka-projection-cassandra/src/main/resources/reference.conf
rename to projection-cassandra/src/main/resources/reference.conf
diff --git a/akka-projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraOffsetStore.scala b/projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraOffsetStore.scala
similarity index 100%
rename from akka-projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraOffsetStore.scala
rename to projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraOffsetStore.scala
diff --git a/akka-projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraProjectionImpl.scala b/projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraProjectionImpl.scala
similarity index 100%
rename from akka-projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraProjectionImpl.scala
rename to projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraProjectionImpl.scala
diff --git a/akka-projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraSettings.scala b/projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraSettings.scala
similarity index 100%
rename from akka-projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraSettings.scala
rename to projection-cassandra/src/main/scala/akka/projection/cassandra/internal/CassandraSettings.scala
diff --git a/akka-projection-cassandra/src/main/scala/akka/projection/cassandra/javadsl/CassandraProjection.scala b/projection-cassandra/src/main/scala/akka/projection/cassandra/javadsl/CassandraProjection.scala
similarity index 100%
rename from akka-projection-cassandra/src/main/scala/akka/projection/cassandra/javadsl/CassandraProjection.scala
rename to projection-cassandra/src/main/scala/akka/projection/cassandra/javadsl/CassandraProjection.scala
diff --git a/akka-projection-cassandra/src/main/scala/akka/projection/cassandra/scaladsl/CassandraProjection.scala b/projection-cassandra/src/main/scala/akka/projection/cassandra/scaladsl/CassandraProjection.scala
similarity index 100%
rename from akka-projection-cassandra/src/main/scala/akka/projection/cassandra/scaladsl/CassandraProjection.scala
rename to projection-cassandra/src/main/scala/akka/projection/cassandra/scaladsl/CassandraProjection.scala
diff --git a/akka-projection-core-test/src/test/java/akka/projection/ProjectionBehaviorCompileTest.java b/projection-core-test/src/test/java/akka/projection/ProjectionBehaviorCompileTest.java
similarity index 100%
rename from akka-projection-core-test/src/test/java/akka/projection/ProjectionBehaviorCompileTest.java
rename to projection-core-test/src/test/java/akka/projection/ProjectionBehaviorCompileTest.java
diff --git a/akka-projection-core-test/src/test/resources/logback-test.xml b/projection-core-test/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-projection-core-test/src/test/resources/logback-test.xml
rename to projection-core-test/src/test/resources/logback-test.xml
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/ProjectionBehaviorSpec.scala b/projection-core-test/src/test/scala/akka/projection/ProjectionBehaviorSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/ProjectionBehaviorSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/ProjectionBehaviorSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/StatusObserverSpec.scala b/projection-core-test/src/test/scala/akka/projection/StatusObserverSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/StatusObserverSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/StatusObserverSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/TestStatusObserver.scala b/projection-core-test/src/test/scala/akka/projection/TestStatusObserver.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/TestStatusObserver.scala
rename to projection-core-test/src/test/scala/akka/projection/TestStatusObserver.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/TestTags.scala b/projection-core-test/src/test/scala/akka/projection/TestTags.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/TestTags.scala
rename to projection-core-test/src/test/scala/akka/projection/TestTags.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/HandlerRecoveryImplSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/HandlerRecoveryImplSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/HandlerRecoveryImplSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/HandlerRecoveryImplSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/OffsetSerializationSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/OffsetSerializationSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/OffsetSerializationSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/OffsetSerializationSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/ProjectionSerializerSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/ProjectionSerializerSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/ProjectionSerializerSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/ProjectionSerializerSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/TelemetryProviderSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/TelemetryProviderSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/TelemetryProviderSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/TelemetryProviderSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/ErrorRateMetricSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/ErrorRateMetricSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/ErrorRateMetricSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/ErrorRateMetricSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/LifecycleMetricSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/LifecycleMetricSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/LifecycleMetricSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/LifecycleMetricSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/OffsetCommittedCounterMetricSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/OffsetCommittedCounterMetricSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/OffsetCommittedCounterMetricSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/OffsetCommittedCounterMetricSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/ServiceTimeMetricSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/ServiceTimeMetricSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/ServiceTimeMetricSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/ServiceTimeMetricSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/WaitTimeMetricSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/WaitTimeMetricSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/WaitTimeMetricSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/WaitTimeMetricSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InMemTelemetry.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InMemTelemetry.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InMemTelemetry.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InMemTelemetry.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InternalProjectionStateMetricsSpec.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InternalProjectionStateMetricsSpec.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InternalProjectionStateMetricsSpec.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/InternalProjectionStateMetricsSpec.scala
diff --git a/akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/TestHandlers.scala b/projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/TestHandlers.scala
similarity index 100%
rename from akka-projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/TestHandlers.scala
rename to projection-core-test/src/test/scala/akka/projection/internal/metrics/tools/TestHandlers.scala
diff --git a/akka-projection-core/src/main/java/akka/projection/internal/protobuf/ProjectionMessages.java b/projection-core/src/main/java/akka/projection/internal/protobuf/ProjectionMessages.java
similarity index 100%
rename from akka-projection-core/src/main/java/akka/projection/internal/protobuf/ProjectionMessages.java
rename to projection-core/src/main/java/akka/projection/internal/protobuf/ProjectionMessages.java
diff --git a/akka-projection-core/src/main/protobuf/ProjectionMessages.proto b/projection-core/src/main/protobuf/ProjectionMessages.proto
similarity index 100%
rename from akka-projection-core/src/main/protobuf/ProjectionMessages.proto
rename to projection-core/src/main/protobuf/ProjectionMessages.proto
diff --git a/akka-projection-core/src/main/resources/reference.conf b/projection-core/src/main/resources/reference.conf
similarity index 100%
rename from akka-projection-core/src/main/resources/reference.conf
rename to projection-core/src/main/resources/reference.conf
diff --git a/akka-projection-core/src/main/scala/akka/projection/BySlicesSourceProvider.scala b/projection-core/src/main/scala/akka/projection/BySlicesSourceProvider.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/BySlicesSourceProvider.scala
rename to projection-core/src/main/scala/akka/projection/BySlicesSourceProvider.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/HandlerRecoveryStrategy.scala b/projection-core/src/main/scala/akka/projection/HandlerRecoveryStrategy.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/HandlerRecoveryStrategy.scala
rename to projection-core/src/main/scala/akka/projection/HandlerRecoveryStrategy.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/MergeableOffset.scala b/projection-core/src/main/scala/akka/projection/MergeableOffset.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/MergeableOffset.scala
rename to projection-core/src/main/scala/akka/projection/MergeableOffset.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/OffsetVerification.scala b/projection-core/src/main/scala/akka/projection/OffsetVerification.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/OffsetVerification.scala
rename to projection-core/src/main/scala/akka/projection/OffsetVerification.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/Projection.scala b/projection-core/src/main/scala/akka/projection/Projection.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/Projection.scala
rename to projection-core/src/main/scala/akka/projection/Projection.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/ProjectionBehavior.scala b/projection-core/src/main/scala/akka/projection/ProjectionBehavior.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/ProjectionBehavior.scala
rename to projection-core/src/main/scala/akka/projection/ProjectionBehavior.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/ProjectionContext.scala b/projection-core/src/main/scala/akka/projection/ProjectionContext.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/ProjectionContext.scala
rename to projection-core/src/main/scala/akka/projection/ProjectionContext.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/ProjectionId.scala b/projection-core/src/main/scala/akka/projection/ProjectionId.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/ProjectionId.scala
rename to projection-core/src/main/scala/akka/projection/ProjectionId.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/StatusObserver.scala b/projection-core/src/main/scala/akka/projection/StatusObserver.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/StatusObserver.scala
rename to projection-core/src/main/scala/akka/projection/StatusObserver.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/ActorHandlerInit.scala b/projection-core/src/main/scala/akka/projection/internal/ActorHandlerInit.scala
similarity index 91%
rename from akka-projection-core/src/main/scala/akka/projection/internal/ActorHandlerInit.scala
rename to projection-core/src/main/scala/akka/projection/internal/ActorHandlerInit.scala
index abbda76..647a443 100644
--- a/akka-projection-core/src/main/scala/akka/projection/internal/ActorHandlerInit.scala
+++ b/projection-core/src/main/scala/akka/projection/internal/ActorHandlerInit.scala
@@ -28,7 +28,7 @@ import akka.annotation.InternalApi
       case None =>
         throw new IllegalStateException(
           "Actor not started, please report issue at " +
-          "https://github.com/akka/akka-projection/issues")
+          "https://github.com/apache/incubator-pekko-projection/issues")
     }
   }
 }
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/HandlerAdapter.scala b/projection-core/src/main/scala/akka/projection/internal/HandlerAdapter.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/HandlerAdapter.scala
rename to projection-core/src/main/scala/akka/projection/internal/HandlerAdapter.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/HandlerRecoveryImpl.scala b/projection-core/src/main/scala/akka/projection/internal/HandlerRecoveryImpl.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/HandlerRecoveryImpl.scala
rename to projection-core/src/main/scala/akka/projection/internal/HandlerRecoveryImpl.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/InternalProjection.scala b/projection-core/src/main/scala/akka/projection/internal/InternalProjection.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/InternalProjection.scala
rename to projection-core/src/main/scala/akka/projection/internal/InternalProjection.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/InternalProjectionState.scala b/projection-core/src/main/scala/akka/projection/internal/InternalProjectionState.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/InternalProjectionState.scala
rename to projection-core/src/main/scala/akka/projection/internal/InternalProjectionState.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/NoopStatusObserver.scala b/projection-core/src/main/scala/akka/projection/internal/NoopStatusObserver.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/NoopStatusObserver.scala
rename to projection-core/src/main/scala/akka/projection/internal/NoopStatusObserver.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/OffsetSerialization.scala b/projection-core/src/main/scala/akka/projection/internal/OffsetSerialization.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/OffsetSerialization.scala
rename to projection-core/src/main/scala/akka/projection/internal/OffsetSerialization.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/OffsetStrategy.scala b/projection-core/src/main/scala/akka/projection/internal/OffsetStrategy.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/OffsetStrategy.scala
rename to projection-core/src/main/scala/akka/projection/internal/OffsetStrategy.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/ProjectionContextImpl.scala b/projection-core/src/main/scala/akka/projection/internal/ProjectionContextImpl.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/ProjectionContextImpl.scala
rename to projection-core/src/main/scala/akka/projection/internal/ProjectionContextImpl.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/ProjectionSerializer.scala b/projection-core/src/main/scala/akka/projection/internal/ProjectionSerializer.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/ProjectionSerializer.scala
rename to projection-core/src/main/scala/akka/projection/internal/ProjectionSerializer.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/ProjectionSettings.scala b/projection-core/src/main/scala/akka/projection/internal/ProjectionSettings.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/ProjectionSettings.scala
rename to projection-core/src/main/scala/akka/projection/internal/ProjectionSettings.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/SourceProviderAdapter.scala b/projection-core/src/main/scala/akka/projection/internal/SourceProviderAdapter.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/SourceProviderAdapter.scala
rename to projection-core/src/main/scala/akka/projection/internal/SourceProviderAdapter.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/internal/Telemetry.scala b/projection-core/src/main/scala/akka/projection/internal/Telemetry.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/internal/Telemetry.scala
rename to projection-core/src/main/scala/akka/projection/internal/Telemetry.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/javadsl/ActorHandler.scala b/projection-core/src/main/scala/akka/projection/javadsl/ActorHandler.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/javadsl/ActorHandler.scala
rename to projection-core/src/main/scala/akka/projection/javadsl/ActorHandler.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/javadsl/Handler.scala b/projection-core/src/main/scala/akka/projection/javadsl/Handler.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/javadsl/Handler.scala
rename to projection-core/src/main/scala/akka/projection/javadsl/Handler.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/javadsl/ProjectionManagement.scala b/projection-core/src/main/scala/akka/projection/javadsl/ProjectionManagement.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/javadsl/ProjectionManagement.scala
rename to projection-core/src/main/scala/akka/projection/javadsl/ProjectionManagement.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/javadsl/Projections.scala b/projection-core/src/main/scala/akka/projection/javadsl/Projections.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/javadsl/Projections.scala
rename to projection-core/src/main/scala/akka/projection/javadsl/Projections.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/javadsl/SourceProvider.scala b/projection-core/src/main/scala/akka/projection/javadsl/SourceProvider.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/javadsl/SourceProvider.scala
rename to projection-core/src/main/scala/akka/projection/javadsl/SourceProvider.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/javadsl/StatefulHandler.scala b/projection-core/src/main/scala/akka/projection/javadsl/StatefulHandler.scala
similarity index 96%
rename from akka-projection-core/src/main/scala/akka/projection/javadsl/StatefulHandler.scala
rename to projection-core/src/main/scala/akka/projection/javadsl/StatefulHandler.scala
index 522dec3..740afe6 100644
--- a/akka-projection-core/src/main/scala/akka/projection/javadsl/StatefulHandler.scala
+++ b/projection-core/src/main/scala/akka/projection/javadsl/StatefulHandler.scala
@@ -56,7 +56,7 @@ import akka.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/akka/akka-projection/issues")
+          "https://github.com/apache/incubator-pekko-projection/issues")
 
     state = newState.thenCompose(s => process(s, envelope))
     state.thenApply(_ => Done)
diff --git a/akka-projection-core/src/main/scala/akka/projection/scaladsl/ActorHandler.scala b/projection-core/src/main/scala/akka/projection/scaladsl/ActorHandler.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/scaladsl/ActorHandler.scala
rename to projection-core/src/main/scala/akka/projection/scaladsl/ActorHandler.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/scaladsl/Handler.scala b/projection-core/src/main/scala/akka/projection/scaladsl/Handler.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/scaladsl/Handler.scala
rename to projection-core/src/main/scala/akka/projection/scaladsl/Handler.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/scaladsl/ProjectionManagement.scala b/projection-core/src/main/scala/akka/projection/scaladsl/ProjectionManagement.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/scaladsl/ProjectionManagement.scala
rename to projection-core/src/main/scala/akka/projection/scaladsl/ProjectionManagement.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/scaladsl/Projections.scala b/projection-core/src/main/scala/akka/projection/scaladsl/Projections.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/scaladsl/Projections.scala
rename to projection-core/src/main/scala/akka/projection/scaladsl/Projections.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/scaladsl/SourceProvider.scala b/projection-core/src/main/scala/akka/projection/scaladsl/SourceProvider.scala
similarity index 100%
rename from akka-projection-core/src/main/scala/akka/projection/scaladsl/SourceProvider.scala
rename to projection-core/src/main/scala/akka/projection/scaladsl/SourceProvider.scala
diff --git a/akka-projection-core/src/main/scala/akka/projection/scaladsl/StatefulHandler.scala b/projection-core/src/main/scala/akka/projection/scaladsl/StatefulHandler.scala
similarity index 96%
rename from akka-projection-core/src/main/scala/akka/projection/scaladsl/StatefulHandler.scala
rename to projection-core/src/main/scala/akka/projection/scaladsl/StatefulHandler.scala
index f7c3c86..0034b87 100644
--- a/akka-projection-core/src/main/scala/akka/projection/scaladsl/StatefulHandler.scala
+++ b/projection-core/src/main/scala/akka/projection/scaladsl/StatefulHandler.scala
@@ -55,7 +55,7 @@ import akka.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/akka/akka-projection/issues")
+          "https://github.com/apache/incubator-pekko-projection/issues")
     }
     state = newState.flatMap(s => process(s, envelope))
     state.map(_ => Done)
diff --git a/akka-projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala b/projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
similarity index 98%
rename from akka-projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
rename to projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
index 4cb322f..0458f37 100644
--- a/akka-projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
+++ b/projection-durable-state/src/main/scala/akka/projection/state/javadsl/DurableStateSourceProvider.scala
@@ -131,7 +131,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/akka/akka-persistence-r2dbc/issues")
+            s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/incubator-pekko-persistence-r2dbc/issues")
       }
 
     override def getObject(persistenceId: String): CompletionStage[GetObjectResult[A]] =
diff --git a/akka-projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala b/projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
similarity index 97%
rename from akka-projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
rename to projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
index 771a8ad..6266991 100644
--- a/akka-projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
+++ b/projection-durable-state/src/main/scala/akka/projection/state/scaladsl/DurableStateSourceProvider.scala
@@ -120,7 +120,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/akka/akka-persistence-r2dbc/issues")
+            s"DurableStateChange [${other.getClass.getName}] not implemented yet. Please report bug at https://github.com/apache/incubator-pekko-persistence-r2dbc/issues")
       }
 
     override def getObject(persistenceId: String): Future[GetObjectResult[A]] =
diff --git a/akka-projection-durable-state/src/test/scala/akka/projection/state/scaladsl/DurableStateSourceProviderSpec.scala b/projection-durable-state/src/test/scala/akka/projection/state/scaladsl/DurableStateSourceProviderSpec.scala
similarity index 100%
rename from akka-projection-durable-state/src/test/scala/akka/projection/state/scaladsl/DurableStateSourceProviderSpec.scala
rename to projection-durable-state/src/test/scala/akka/projection/state/scaladsl/DurableStateSourceProviderSpec.scala
diff --git a/akka-projection-eventsourced/src/main/scala/akka/projection/eventsourced/EventEnvelope.scala b/projection-eventsourced/src/main/scala/akka/projection/eventsourced/EventEnvelope.scala
similarity index 100%
rename from akka-projection-eventsourced/src/main/scala/akka/projection/eventsourced/EventEnvelope.scala
rename to projection-eventsourced/src/main/scala/akka/projection/eventsourced/EventEnvelope.scala
diff --git a/akka-projection-eventsourced/src/main/scala/akka/projection/eventsourced/javadsl/EventSourcedProvider.scala b/projection-eventsourced/src/main/scala/akka/projection/eventsourced/javadsl/EventSourcedProvider.scala
similarity index 100%
rename from akka-projection-eventsourced/src/main/scala/akka/projection/eventsourced/javadsl/EventSourcedProvider.scala
rename to projection-eventsourced/src/main/scala/akka/projection/eventsourced/javadsl/EventSourcedProvider.scala
diff --git a/akka-projection-eventsourced/src/main/scala/akka/projection/eventsourced/scaladsl/EventSourcedProvider.scala b/projection-eventsourced/src/main/scala/akka/projection/eventsourced/scaladsl/EventSourcedProvider.scala
similarity index 100%
rename from akka-projection-eventsourced/src/main/scala/akka/projection/eventsourced/scaladsl/EventSourcedProvider.scala
rename to projection-eventsourced/src/main/scala/akka/projection/eventsourced/scaladsl/EventSourcedProvider.scala
diff --git a/akka-projection-jdbc/src/it/resources/db/default-init.sql b/projection-jdbc/src/it/resources/db/default-init.sql
similarity index 100%
rename from akka-projection-jdbc/src/it/resources/db/default-init.sql
rename to projection-jdbc/src/it/resources/db/default-init.sql
diff --git a/akka-projection-jdbc/src/it/resources/db/oracle-init.sql b/projection-jdbc/src/it/resources/db/oracle-init.sql
similarity index 100%
rename from akka-projection-jdbc/src/it/resources/db/oracle-init.sql
rename to projection-jdbc/src/it/resources/db/oracle-init.sql
diff --git a/akka-projection-jdbc/src/it/resources/logback-test.xml b/projection-jdbc/src/it/resources/logback-test.xml
similarity index 100%
rename from akka-projection-jdbc/src/it/resources/logback-test.xml
rename to projection-jdbc/src/it/resources/logback-test.xml
diff --git a/akka-projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcContainerOffsetStoreSpec.scala b/projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcContainerOffsetStoreSpec.scala
similarity index 100%
rename from akka-projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcContainerOffsetStoreSpec.scala
rename to projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcContainerOffsetStoreSpec.scala
diff --git a/akka-projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcProjectionSpec.scala b/projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcProjectionSpec.scala
similarity index 100%
rename from akka-projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcProjectionSpec.scala
rename to projection-jdbc/src/it/scala/akka/projection/jdbc/JdbcProjectionSpec.scala
diff --git a/akka-projection-jdbc/src/main/resources/reference.conf b/projection-jdbc/src/main/resources/reference.conf
similarity index 100%
rename from akka-projection-jdbc/src/main/resources/reference.conf
rename to projection-jdbc/src/main/resources/reference.conf
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcHandlerLifecycle.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcHandlerLifecycle.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcHandlerLifecycle.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcHandlerLifecycle.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcSession.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcSession.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcSession.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/JdbcSession.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/Dialect.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/internal/Dialect.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/Dialect.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/internal/Dialect.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcHandlerAdapter.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcHandlerAdapter.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcHandlerAdapter.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcHandlerAdapter.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcOffsetStore.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcOffsetStore.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcOffsetStore.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcOffsetStore.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcProjectionImpl.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcProjectionImpl.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcProjectionImpl.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcProjectionImpl.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSessionUtil.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSessionUtil.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSessionUtil.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSessionUtil.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSettings.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSettings.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSettings.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/internal/JdbcSettings.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcHandler.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcHandler.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcHandler.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcHandler.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcProjection.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcProjection.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcProjection.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/javadsl/JdbcProjection.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcHandler.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcHandler.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcHandler.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcHandler.scala
diff --git a/akka-projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcProjection.scala b/projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcProjection.scala
similarity index 100%
rename from akka-projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcProjection.scala
rename to projection-jdbc/src/main/scala/akka/projection/jdbc/scaladsl/JdbcProjection.scala
diff --git a/akka-projection-jdbc/src/test/java/akka/projection/jdbc/JdbcProjectionTest.java b/projection-jdbc/src/test/java/akka/projection/jdbc/JdbcProjectionTest.java
similarity index 100%
rename from akka-projection-jdbc/src/test/java/akka/projection/jdbc/JdbcProjectionTest.java
rename to projection-jdbc/src/test/java/akka/projection/jdbc/JdbcProjectionTest.java
diff --git a/akka-projection-jdbc/src/test/resources/logback-test.xml b/projection-jdbc/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-projection-jdbc/src/test/resources/logback-test.xml
rename to projection-jdbc/src/test/resources/logback-test.xml
diff --git a/akka-projection-jdbc/src/test/scala/akka/projection/jdbc/JdbcOffsetStoreSpec.scala b/projection-jdbc/src/test/scala/akka/projection/jdbc/JdbcOffsetStoreSpec.scala
similarity index 100%
rename from akka-projection-jdbc/src/test/scala/akka/projection/jdbc/JdbcOffsetStoreSpec.scala
rename to projection-jdbc/src/test/scala/akka/projection/jdbc/JdbcOffsetStoreSpec.scala
diff --git a/akka-projection-jdbc/src/test/scala/akka/projection/jdbc/internal/JdbcSettingsSpec.scala b/projection-jdbc/src/test/scala/akka/projection/jdbc/internal/JdbcSettingsSpec.scala
similarity index 100%
rename from akka-projection-jdbc/src/test/scala/akka/projection/jdbc/internal/JdbcSettingsSpec.scala
rename to projection-jdbc/src/test/scala/akka/projection/jdbc/internal/JdbcSettingsSpec.scala
diff --git a/akka-projection-kafka/src/it/resources/application.conf b/projection-kafka/src/it/resources/application.conf
similarity index 100%
rename from akka-projection-kafka/src/it/resources/application.conf
rename to projection-kafka/src/it/resources/application.conf
diff --git a/akka-projection-kafka/src/it/resources/logback-test.xml b/projection-kafka/src/it/resources/logback-test.xml
similarity index 100%
rename from akka-projection-kafka/src/it/resources/logback-test.xml
rename to projection-kafka/src/it/resources/logback-test.xml
diff --git a/akka-projection-kafka/src/it/scala/akka/projection/kafka/KafkaSourceProviderSpec.scala b/projection-kafka/src/it/scala/akka/projection/kafka/KafkaSourceProviderSpec.scala
similarity index 100%
rename from akka-projection-kafka/src/it/scala/akka/projection/kafka/KafkaSourceProviderSpec.scala
rename to projection-kafka/src/it/scala/akka/projection/kafka/KafkaSourceProviderSpec.scala
diff --git a/akka-projection-kafka/src/it/scala/akka/projection/kafka/KafkaSpecBase.scala b/projection-kafka/src/it/scala/akka/projection/kafka/KafkaSpecBase.scala
similarity index 100%
rename from akka-projection-kafka/src/it/scala/akka/projection/kafka/KafkaSpecBase.scala
rename to projection-kafka/src/it/scala/akka/projection/kafka/KafkaSpecBase.scala
diff --git a/akka-projection-kafka/src/it/scala/akka/projection/kafka/integration/KafkaToSlickIntegrationSpec.scala b/projection-kafka/src/it/scala/akka/projection/kafka/integration/KafkaToSlickIntegrationSpec.scala
similarity index 100%
rename from akka-projection-kafka/src/it/scala/akka/projection/kafka/integration/KafkaToSlickIntegrationSpec.scala
rename to projection-kafka/src/it/scala/akka/projection/kafka/integration/KafkaToSlickIntegrationSpec.scala
diff --git a/akka-projection-kafka/src/main/resources/reference.conf b/projection-kafka/src/main/resources/reference.conf
similarity index 100%
rename from akka-projection-kafka/src/main/resources/reference.conf
rename to projection-kafka/src/main/resources/reference.conf
diff --git a/akka-projection-kafka/src/main/scala/akka/projection/kafka/KafkaOffsets.scala b/projection-kafka/src/main/scala/akka/projection/kafka/KafkaOffsets.scala
similarity index 100%
rename from akka-projection-kafka/src/main/scala/akka/projection/kafka/KafkaOffsets.scala
rename to projection-kafka/src/main/scala/akka/projection/kafka/KafkaOffsets.scala
diff --git a/akka-projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderImpl.scala b/projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderImpl.scala
similarity index 100%
rename from akka-projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderImpl.scala
rename to projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderImpl.scala
diff --git a/akka-projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderSettings.scala b/projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderSettings.scala
similarity index 100%
rename from akka-projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderSettings.scala
rename to projection-kafka/src/main/scala/akka/projection/kafka/internal/KafkaSourceProviderSettings.scala
diff --git a/akka-projection-kafka/src/main/scala/akka/projection/kafka/internal/MetadataClientAdapter.scala b/projection-kafka/src/main/scala/akka/projection/kafka/internal/MetadataClientAdapter.scala
similarity index 100%
rename from akka-projection-kafka/src/main/scala/akka/projection/kafka/internal/MetadataClientAdapter.scala
rename to projection-kafka/src/main/scala/akka/projection/kafka/internal/MetadataClientAdapter.scala
diff --git a/akka-projection-kafka/src/main/scala/akka/projection/kafka/javadsl/KafkaSourceProvider.scala b/projection-kafka/src/main/scala/akka/projection/kafka/javadsl/KafkaSourceProvider.scala
similarity index 100%
rename from akka-projection-kafka/src/main/scala/akka/projection/kafka/javadsl/KafkaSourceProvider.scala
rename to projection-kafka/src/main/scala/akka/projection/kafka/javadsl/KafkaSourceProvider.scala
diff --git a/akka-projection-kafka/src/main/scala/akka/projection/kafka/scaladsl/KafkaSourceProvider.scala b/projection-kafka/src/main/scala/akka/projection/kafka/scaladsl/KafkaSourceProvider.scala
similarity index 100%
rename from akka-projection-kafka/src/main/scala/akka/projection/kafka/scaladsl/KafkaSourceProvider.scala
rename to projection-kafka/src/main/scala/akka/projection/kafka/scaladsl/KafkaSourceProvider.scala
diff --git a/akka-projection-kafka/src/test/resources/application.conf b/projection-kafka/src/test/resources/application.conf
similarity index 100%
rename from akka-projection-kafka/src/test/resources/application.conf
rename to projection-kafka/src/test/resources/application.conf
diff --git a/akka-projection-kafka/src/test/resources/logback-test.xml b/projection-kafka/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-projection-kafka/src/test/resources/logback-test.xml
rename to projection-kafka/src/test/resources/logback-test.xml
diff --git a/akka-projection-kafka/src/test/scala/akka/projection/kafka/internal/KafkaSourceProviderImplSpec.scala b/projection-kafka/src/test/scala/akka/projection/kafka/internal/KafkaSourceProviderImplSpec.scala
similarity index 100%
rename from akka-projection-kafka/src/test/scala/akka/projection/kafka/internal/KafkaSourceProviderImplSpec.scala
rename to projection-kafka/src/test/scala/akka/projection/kafka/internal/KafkaSourceProviderImplSpec.scala
diff --git a/akka-projection-slick/src/it/resources/logback-test.xml b/projection-slick/src/it/resources/logback-test.xml
similarity index 100%
rename from akka-projection-slick/src/it/resources/logback-test.xml
rename to projection-slick/src/it/resources/logback-test.xml
diff --git a/akka-projection-slick/src/it/scala/akka/projection/slick/SlickContainerOffsetStoreSpec.scala b/projection-slick/src/it/scala/akka/projection/slick/SlickContainerOffsetStoreSpec.scala
similarity index 100%
rename from akka-projection-slick/src/it/scala/akka/projection/slick/SlickContainerOffsetStoreSpec.scala
rename to projection-slick/src/it/scala/akka/projection/slick/SlickContainerOffsetStoreSpec.scala
diff --git a/akka-projection-slick/src/main/resources/reference.conf b/projection-slick/src/main/resources/reference.conf
similarity index 100%
rename from akka-projection-slick/src/main/resources/reference.conf
rename to projection-slick/src/main/resources/reference.conf
diff --git a/akka-projection-slick/src/main/scala/akka/projection/slick/SlickProjection.scala b/projection-slick/src/main/scala/akka/projection/slick/SlickProjection.scala
similarity index 100%
rename from akka-projection-slick/src/main/scala/akka/projection/slick/SlickProjection.scala
rename to projection-slick/src/main/scala/akka/projection/slick/SlickProjection.scala
diff --git a/akka-projection-slick/src/main/scala/akka/projection/slick/internal/SlickOffsetStore.scala b/projection-slick/src/main/scala/akka/projection/slick/internal/SlickOffsetStore.scala
similarity index 100%
rename from akka-projection-slick/src/main/scala/akka/projection/slick/internal/SlickOffsetStore.scala
rename to projection-slick/src/main/scala/akka/projection/slick/internal/SlickOffsetStore.scala
diff --git a/akka-projection-slick/src/main/scala/akka/projection/slick/internal/SlickProjectionImpl.scala b/projection-slick/src/main/scala/akka/projection/slick/internal/SlickProjectionImpl.scala
similarity index 100%
rename from akka-projection-slick/src/main/scala/akka/projection/slick/internal/SlickProjectionImpl.scala
rename to projection-slick/src/main/scala/akka/projection/slick/internal/SlickProjectionImpl.scala
diff --git a/akka-projection-slick/src/main/scala/akka/projection/slick/internal/SlickSettings.scala b/projection-slick/src/main/scala/akka/projection/slick/internal/SlickSettings.scala
similarity index 100%
rename from akka-projection-slick/src/main/scala/akka/projection/slick/internal/SlickSettings.scala
rename to projection-slick/src/main/scala/akka/projection/slick/internal/SlickSettings.scala
diff --git a/akka-projection-slick/src/test/resources/logback-test.xml b/projection-slick/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-projection-slick/src/test/resources/logback-test.xml
rename to projection-slick/src/test/resources/logback-test.xml
diff --git a/akka-projection-slick/src/test/scala/akka/projection/slick/SlickOffsetStoreSpec.scala b/projection-slick/src/test/scala/akka/projection/slick/SlickOffsetStoreSpec.scala
similarity index 100%
rename from akka-projection-slick/src/test/scala/akka/projection/slick/SlickOffsetStoreSpec.scala
rename to projection-slick/src/test/scala/akka/projection/slick/SlickOffsetStoreSpec.scala
diff --git a/akka-projection-slick/src/test/scala/akka/projection/slick/SlickProjectionSpec.scala b/projection-slick/src/test/scala/akka/projection/slick/SlickProjectionSpec.scala
similarity index 100%
rename from akka-projection-slick/src/test/scala/akka/projection/slick/SlickProjectionSpec.scala
rename to projection-slick/src/test/scala/akka/projection/slick/SlickProjectionSpec.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestClock.scala b/projection-testkit/src/main/scala/akka/projection/testkit/internal/TestClock.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestClock.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/internal/TestClock.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestInMemoryOffsetStoreImpl.scala b/projection-testkit/src/main/scala/akka/projection/testkit/internal/TestInMemoryOffsetStoreImpl.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestInMemoryOffsetStoreImpl.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/internal/TestInMemoryOffsetStoreImpl.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestOffsetStoreAdapter.scala b/projection-testkit/src/main/scala/akka/projection/testkit/internal/TestOffsetStoreAdapter.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestOffsetStoreAdapter.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/internal/TestOffsetStoreAdapter.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestProjectionImpl.scala b/projection-testkit/src/main/scala/akka/projection/testkit/internal/TestProjectionImpl.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestProjectionImpl.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/internal/TestProjectionImpl.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestSourceProviderImpl.scala b/projection-testkit/src/main/scala/akka/projection/testkit/internal/TestSourceProviderImpl.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/internal/TestSourceProviderImpl.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/internal/TestSourceProviderImpl.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/ProjectionTestKit.scala b/projection-testkit/src/main/scala/akka/projection/testkit/javadsl/ProjectionTestKit.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/ProjectionTestKit.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/javadsl/ProjectionTestKit.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestOffsetStore.scala b/projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestOffsetStore.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestOffsetStore.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestOffsetStore.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestProjection.scala b/projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestProjection.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestProjection.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestProjection.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestSourceProvider.scala b/projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestSourceProvider.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestSourceProvider.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/javadsl/TestSourceProvider.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/ProjectionTestKit.scala b/projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/ProjectionTestKit.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/ProjectionTestKit.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/ProjectionTestKit.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestOffsetStore.scala b/projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestOffsetStore.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestOffsetStore.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestOffsetStore.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestProjection.scala b/projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestProjection.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestProjection.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestProjection.scala
diff --git a/akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestSourceProvider.scala b/projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestSourceProvider.scala
similarity index 100%
rename from akka-projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestSourceProvider.scala
rename to projection-testkit/src/main/scala/akka/projection/testkit/scaladsl/TestSourceProvider.scala
diff --git a/akka-projection-testkit/src/test/java/akka/projection/testkit/javadsl/ProjectionTestKitTest.java b/projection-testkit/src/test/java/akka/projection/testkit/javadsl/ProjectionTestKitTest.java
similarity index 100%
rename from akka-projection-testkit/src/test/java/akka/projection/testkit/javadsl/ProjectionTestKitTest.java
rename to projection-testkit/src/test/java/akka/projection/testkit/javadsl/ProjectionTestKitTest.java
diff --git a/akka-projection-testkit/src/test/resources/logback-test.xml b/projection-testkit/src/test/resources/logback-test.xml
similarity index 100%
rename from akka-projection-testkit/src/test/resources/logback-test.xml
rename to projection-testkit/src/test/resources/logback-test.xml
diff --git a/akka-projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/ProjectionTestKitSpec.scala b/projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/ProjectionTestKitSpec.scala
similarity index 100%
rename from akka-projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/ProjectionTestKitSpec.scala
rename to projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/ProjectionTestKitSpec.scala
diff --git a/akka-projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/TestProjectionSpec.scala b/projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/TestProjectionSpec.scala
similarity index 100%
rename from akka-projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/TestProjectionSpec.scala
rename to projection-testkit/src/test/scala/akka/projection/testkit/scaladsl/TestProjectionSpec.scala


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org