Skip to content

Commit

Permalink
pekko naming (#9)
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Feb 15, 2023
1 parent a06b08e commit b58b353
Show file tree
Hide file tree
Showing 170 changed files with 1,231 additions and 1,203 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/mysql-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
include:
- { name: "MySQL", extraOpts: '' }
- { name: "MySQL (old dao)", extraOpts: ' -Djdbc-journal.dao=akka.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=akka.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }
- { name: "MySQL (old dao)", extraOpts: ' -Djdbc-journal.dao=org.apache.pekko.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=org.apache.pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }

steps:
- name: Checkout
Expand All @@ -43,7 +43,7 @@ jobs:
run: ./scripts/launch-mysql.sh

- name: Run Integration tests for ${{ matrix.name }}
run: sbt "++2.13.8 It/testOnly akka.persistence.jdbc.integration.MySQL*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
run: sbt "++2.13.8 It/testOnly org.apache.pekko.persistence.jdbc.integration.MySQL*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler

- name: Print logs on failure
if: ${{ failure() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/oracle-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
include:
- { name: "Oracle", extraOpts: '' }
- { name: "Oracle (old dao)", extraOpts: ' -Djdbc-journal.dao=akka.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=akka.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }
- { name: "Oracle (old dao)", extraOpts: ' -Djdbc-journal.dao=org.apache.pekko.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=org.apache.pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }

steps:
- name: Checkout
Expand All @@ -43,7 +43,7 @@ jobs:
run: ./scripts/launch-oracle.sh

- name: Run Integration tests for ${{ matrix.name }}
run: sbt "++2.13.8 It/testOnly akka.persistence.jdbc.integration.Oracle*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
run: sbt "++2.13.8 It/testOnly org.apache.pekko.persistence.jdbc.integration.Oracle*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler

- name: Print logs on failure
if: ${{ failure() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/postgres-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
include:
- { name: "Postgres", extraOpts: '' }
- { name: "Postgres (old dao)", extraOpts: ' -Djdbc-journal.dao=akka.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=akka.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }
- { name: "Postgres (old dao)", extraOpts: ' -Djdbc-journal.dao=org.apache.pekko.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=org.apache.pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }

steps:
- name: Checkout
Expand All @@ -43,7 +43,7 @@ jobs:
run: ./scripts/launch-postgres.sh

- name: Run Integration tests for ${{ matrix.name }}
run: sbt "++2.13.8 It/testOnly akka.persistence.jdbc.integration.Postgres*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
run: sbt "++2.13.8 It/testOnly org.apache.pekko.persistence.jdbc.integration.Postgres*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler

- name: Print logs on failure
if: ${{ failure() }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sqlserver-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
matrix:
include:
- { name: "SqlServer", extraOpts: '' }
- { name: "SqlServer (old dao)", extraOpts: ' -Djdbc-journal.dao=akka.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=akka.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }
- { name: "SqlServer (old dao)", extraOpts: ' -Djdbc-journal.dao=org.apache.pekko.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao -Djdbc-snapshot-store.dao=org.apache.pekko.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao -Djdbc-read-journal.dao=org.apache.pekko.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao' }

steps:
- name: Checkout
Expand All @@ -43,7 +43,7 @@ jobs:
run: ./scripts/launch-sqlserver.sh

- name: Run Integration tests for ${{ matrix.name }}
run: sbt "++2.13.8 It/testOnly akka.persistence.jdbc.integration.SqlServer*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
run: sbt "++2.13.8 It/testOnly org.apache.pekko.persistence.jdbc.integration.SqlServer*" ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler

- name: Print logs on failure
if: ${{ failure() }}
Expand Down
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ Please note that the H2 database is not recommended to be used as a production d

## Documentation

* [current Akka Persistence JDBC documentation](https://doc.akka.io/docs/akka-persistence-jdbc/current/)
* [Akka Persistence JDBC 3.5.x documentation](https://doc.akka.io/docs/akka-persistence-jdbc/3.5/)
* [Snapshot documentation](https://doc.akka.io/docs/akka-persistence-jdbc/snapshot/)
* [current Apache Pekko Persistence JDBC documentation](https://pekko.apache.org/docs/pekko-persistence-jdbc/current/)

## Release notes

Expand Down
51 changes: 30 additions & 21 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import com.lightbend.paradox.apidoc.ApidocPlugin.autoImport.apidocRootPackage
import org.apache.pekko.PekkoParadoxPlugin.autoImport._
import sbt.Keys._

// FIXME remove switching to final Akka version
ThisBuild / resolvers += "Akka Snapshots".at("https://oss.sonatype.org/content/repositories/snapshots/")
ThisBuild / resolvers += "Apache Nexus Snapshots".at("https://repository.apache.org/content/repositories/snapshots/")

lazy val `akka-persistence-jdbc` = project
lazy val `pekko-persistence-jdbc` = project
.in(file("."))
.enablePlugins(ScalaUnidocPlugin)
.disablePlugins(MimaPlugin, SitePlugin)
Expand All @@ -19,7 +20,7 @@ lazy val core = project
.settings(Defaults.itSettings)
.settings(MetaInfLicenseNoticeCopy.settings)
.settings(
name := "akka-persistence-jdbc",
name := "pekko-persistence-jdbc",
libraryDependencies ++= Dependencies.Libraries,
mimaReportSignatureProblems := true,
// temporarily disable mima checks
Expand All @@ -32,50 +33,58 @@ lazy val migrator = project
.settings(Defaults.itSettings)
.settings(MetaInfLicenseNoticeCopy.settings)
.settings(
name := "akka-persistence-jdbc-migrator",
name := "pekko-persistence-jdbc-migrator",
libraryDependencies ++= Dependencies.Migration ++ Dependencies.Libraries,
// TODO remove this when ready to publish it
publish / skip := true)
.dependsOn(core % "compile->compile;test->test")

/*
val themeSettings = Seq(
// allow access to snapshots for pekko-sbt-paradox
resolvers += "Apache Nexus Snapshots".at("https://repository.apache.org/content/repositories/snapshots/"),
pekkoParadoxGithub := "https://github.com/apache/incubator-pekko-persistence-jdbc")
*/

lazy val docs = project
.enablePlugins(ProjectAutoPlugin, AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
.enablePlugins(ProjectAutoPlugin, ParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
.disablePlugins(MimaPlugin)
.settings(MetaInfLicenseNoticeCopy.settings)
.settings(
name := "Akka Persistence JDBC",
name := "Apache Pekko Persistence JDBC",
publish / skip := true,
makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
previewPath := (Paradox / siteSubdirName).value,
Preprocess / siteSubdirName := s"api/akka-persistence-jdbc/${if (isSnapshot.value) "snapshot"
Preprocess / siteSubdirName := s"api/pekko-persistence-jdbc/${if (isSnapshot.value) "snapshot"
else version.value}",
Preprocess / sourceDirectory := (LocalRootProject / ScalaUnidoc / unidoc / target).value,
Paradox / siteSubdirName := s"docs/akka-persistence-jdbc/${if (isSnapshot.value) "snapshot" else version.value}",
Paradox / siteSubdirName := s"docs/pekko-persistence-jdbc/${if (isSnapshot.value) "snapshot" else version.value}",
Compile / paradoxProperties ++= Map(
"project.url" -> "https://doc.akka.io/docs/akka-persistence-jdbc/current/",
"github.base_url" -> "https://github.com/akka/akka-persistence-jdbc/",
"canonical.base_url" -> "https://doc.akka.io/docs/akka-persistence-jdbc/current",
"akka.version" -> Dependencies.AkkaVersion,
"project.url" -> "https://pekko.apache.org/docs/pekko-persistence-jdbc/current/",
"github.base_url" -> "https://github.com/apache/incubator-pekko-persistence-jdbc/",
"canonical.base_url" -> "https://pekko.apache.org/docs/pekko-persistence-jdbc/current",
"pekko.version" -> "current",
"slick.version" -> Dependencies.SlickVersion,
"extref.github.base_url" -> s"https://github.com/akka/akka-persistence-jdbc/blob/${if (isSnapshot.value) "master"
"extref.github.base_url" -> s"https://github.com/apache/incubator-pekko-persistence-jdbc/blob/${if (isSnapshot.value) "master"
else "v" + version.value}/%s",
// Slick
"extref.slick.base_url" -> s"https://scala-slick.org/doc/${Dependencies.SlickVersion}/%s",
// Akka
"extref.akka.base_url" -> s"https://doc.akka.io/docs/akka/${Dependencies.AkkaBinaryVersion}/%s",
"scaladoc.akka.base_url" -> s"https://doc.akka.io/api/akka/${Dependencies.AkkaBinaryVersion}/",
"javadoc.akka.base_url" -> s"https://doc.akka.io/japi/akka/${Dependencies.AkkaBinaryVersion}/",
"javadoc.akka.link_style" -> "direct",
// Pekko
"extref.pekko.base_url" -> "https://pekko.apache.org/docs/pekko/current/%s",
"scaladoc.base_url" -> "https://pekko.apache.org/api/pekko-persistence-jdbc/current/",
"scaladoc.pekko.base_url" -> "https://pekko.apache.org/api/pekko/current/",
"javadoc.pekko.base_url" -> "https://pekko.apache.org/japi/pekko/current/",
"javadoc.pekko.link_style" -> "direct",
// Java
"javadoc.base_url" -> "https://docs.oracle.com/javase/8/docs/api/",
// Scala
"scaladoc.scala.base_url" -> s"https://www.scala-lang.org/api/${scalaBinaryVersion.value}.x/",
"scaladoc.akka.persistence.jdbc.base_url" -> s"/${(Preprocess / siteSubdirName).value}/"),
"scaladoc.pekko.persistence.jdbc.base_url" -> s"/${(Preprocess / siteSubdirName).value}/"),
paradoxGroups := Map("Language" -> Seq("Java", "Scala")),
resolvers += Resolver.jcenterRepo,
publishRsyncArtifacts += makeSite.value -> "www/",
publishRsyncHost := "[email protected]",
apidocRootPackage := "akka")
apidocRootPackage := "org.apache.pekko")

Global / onLoad := (Global / onLoad).value.andThen { s =>
val v = version.value
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
AllPersistenceIdsTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
CurrentEventsByPersistenceIdTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
CurrentEventsByTagTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
CurrentPersistenceIdsTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{ EventAdapterTest, MysqlCleaner, OracleCleaner, PostgresCleaner, SqlServerCleaner }
import org.apache.pekko.persistence.jdbc.query.{
EventAdapterTest,
MysqlCleaner,
OracleCleaner,
PostgresCleaner,
SqlServerCleaner
}

class PostgresScalaEventAdapterTest extends EventAdapterTest("postgres-application.conf") with PostgresCleaner

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
EventsByPersistenceIdTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{ EventsByTagTest, MysqlCleaner, OracleCleaner, PostgresCleaner, SqlServerCleaner }
import org.apache.pekko.persistence.jdbc.query.{
EventsByTagTest,
MysqlCleaner,
OracleCleaner,
PostgresCleaner,
SqlServerCleaner
}

class PostgresScalaEventsByTagTest extends EventsByTagTest("postgres-application.conf") with PostgresCleaner

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
HardDeleteQueryTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.journal.JdbcJournalPerfSpec
import akka.persistence.jdbc.testkit.internal.MySQL
import akka.persistence.jdbc.testkit.internal.Oracle
import akka.persistence.jdbc.testkit.internal.Postgres
import akka.persistence.jdbc.testkit.internal.SqlServer
import org.apache.pekko.persistence.jdbc.journal.JdbcJournalPerfSpec
import org.apache.pekko.persistence.jdbc.testkit.internal.MySQL
import org.apache.pekko.persistence.jdbc.testkit.internal.Oracle
import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
import org.apache.pekko.persistence.jdbc.testkit.internal.SqlServer
import com.typesafe.config.ConfigFactory
import com.typesafe.config.ConfigValueFactory

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.journal.JdbcJournalSpec
import akka.persistence.jdbc.testkit.internal.{ MySQL, Oracle, Postgres, SqlServer }
import org.apache.pekko.persistence.jdbc.journal.JdbcJournalSpec
import org.apache.pekko.persistence.jdbc.testkit.internal.{ MySQL, Oracle, Postgres, SqlServer }
import com.typesafe.config.ConfigFactory

class PostgresJournalSpec extends JdbcJournalSpec(ConfigFactory.load("postgres-application.conf"), Postgres)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.snapshot.JdbcSnapshotStoreSpec
import akka.persistence.jdbc.testkit.internal.MySQL
import akka.persistence.jdbc.testkit.internal.Oracle
import akka.persistence.jdbc.testkit.internal.Postgres
import akka.persistence.jdbc.testkit.internal.SqlServer
import org.apache.pekko.persistence.jdbc.snapshot.JdbcSnapshotStoreSpec
import org.apache.pekko.persistence.jdbc.testkit.internal.MySQL
import org.apache.pekko.persistence.jdbc.testkit.internal.Oracle
import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
import org.apache.pekko.persistence.jdbc.testkit.internal.SqlServer
import com.typesafe.config.ConfigFactory

class PostgresSnapshotStoreSpec extends JdbcSnapshotStoreSpec(ConfigFactory.load("postgres-application.conf"), Postgres)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
JournalDaoStreamMessagesMemoryTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.query.{
import org.apache.pekko.persistence.jdbc.query.{
JournalSequenceActorTest,
MysqlCleaner,
OracleCleaner,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import com.typesafe.config.ConfigFactory
import slick.jdbc.PostgresProfile
import akka.persistence.jdbc.state.scaladsl.DurableStateStorePluginSpec
import org.apache.pekko.persistence.jdbc.state.scaladsl.DurableStateStorePluginSpec

class PostgresDurableStateStorePluginSpec
extends DurableStateStorePluginSpec(ConfigFactory.load("postgres-shared-db-application.conf"), PostgresProfile) {}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import com.typesafe.config.ConfigFactory
import akka.actor.ActorSystem
import akka.persistence.jdbc.state.scaladsl.JdbcDurableStateSpec
import akka.persistence.jdbc.testkit.internal.Postgres
import org.apache.pekko.actor.ActorSystem
import org.apache.pekko.persistence.jdbc.state.scaladsl.JdbcDurableStateSpec
import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres

class PostgresScalaJdbcDurableStateStoreQueryTest
extends JdbcDurableStateSpec(ConfigFactory.load("postgres-shared-db-application.conf"), Postgres) {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package akka.persistence.jdbc.integration
package org.apache.pekko.persistence.jdbc.integration

import akka.persistence.jdbc.serialization.StoreOnlySerializableMessagesTest
import akka.persistence.jdbc.testkit.internal.MySQL
import akka.persistence.jdbc.testkit.internal.Oracle
import akka.persistence.jdbc.testkit.internal.Postgres
import akka.persistence.jdbc.testkit.internal.SqlServer
import org.apache.pekko.persistence.jdbc.serialization.StoreOnlySerializableMessagesTest
import org.apache.pekko.persistence.jdbc.testkit.internal.MySQL
import org.apache.pekko.persistence.jdbc.testkit.internal.Oracle
import org.apache.pekko.persistence.jdbc.testkit.internal.Postgres
import org.apache.pekko.persistence.jdbc.testkit.internal.SqlServer

class PostgresStoreOnlySerializableMessagesTest
extends StoreOnlySerializableMessagesTest("postgres-application.conf", Postgres)
Expand Down
Loading

0 comments on commit b58b353

Please sign in to comment.