[pull] master from akka:master

.github/workflows/checks.yml

@@ -63,9 +63,12 @@ jobs:
         with:
           jvm: temurin:1.11.0
 
-      - name: Compile all code with fatal warnings for Java 11, Scala 2.12 and Scala 2.13
+      - name: Compile all code with fatal warnings for Java 11 and Scala 2.13
         # Run locally with: sbt 'clean ; +Test/compile ; +It/compile'
-        run: sbt "; Test/compile; It/compile"
+        run: sbt "; Test/compile"
+
+      - name: Compile all code with fatal warnings for Java 11 and Scala 3.3
+        run: sbt "++3.3; Test/compile"
 
   check-docs:
     name: Check Docs

.github/workflows/h2-test.yml

@@ -20,15 +20,9 @@ jobs:
       matrix:
         include:
           # leaving out some combinations (note that `checks.yml` doesn't run H2 test)
-          - { scalaVersion: "2.12", jdkVersion: "1.8.0",  jvmName: "temurin:1.8.0",  extraOpts: '' }
-          - { scalaVersion: "2.12", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
-          # { scalaVersion: "2.12", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '' }
-
-          - { scalaVersion: "2.13", jdkVersion: "1.8.0",  jvmName: "temurin:1.8.0",  extraOpts: '' }
           # { scalaVersion: "2.13", jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
           - { scalaVersion: "2.13", jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '' }
 
-          # { scalaVersion: "3.1",  jdkVersion: "1.8.0",  jvmName: "temurin:1.8.0",  extraOpts: '' }
           # { scalaVersion: "3.1",  jdkVersion: "1.11.0", jvmName: "temurin:1.11.0", extraOpts: '-J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler' }
           # { scalaVersion: "3.1",  jdkVersion: "1.17.0", jvmName: "temurin:1.17.0", extraOpts: '' }
     steps:

.github/workflows/mysql-tests.yml

@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-mysql.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "It/testOnly akka.persistence.jdbc.integration.MySQL*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt "integration/testOnly akka.persistence.jdbc.integration.MySQL*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

.github/workflows/oracle-tests.yml

@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-oracle.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "It/testOnly akka.persistence.jdbc.integration.Oracle*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt "integration/testOnly akka.persistence.jdbc.integration.Oracle*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

.github/workflows/postgres-tests.yml

@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-postgres.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "It/testOnly akka.persistence.jdbc.integration.Postgres*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt "integration/testOnly akka.persistence.jdbc.integration.Postgres*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

.github/workflows/release.yml

@@ -13,7 +13,7 @@ permissions:
 jobs:
   release:
     # runs on main repo only
-    if: github.repository == 'akka/akka-persistence-jdbc'
+    if: github.event.repository.fork == false
     name: Release
     # the release environment provides access to secrets required in the release process
     # https://github.com/akka/akka-persistence-jdbc/settings/environments/164872635/edit
@@ -35,55 +35,40 @@ jobs:
       - name: Cache Coursier cache
         uses: coursier/[email protected]
 
-      - name: Set up JDK 8
+      - name: Set up JDK 11
         uses: coursier/[email protected]
         with:
-          jvm: temurin:1.8.0-352
+          jvm: temurin:1.11.0.17
 
       - name: Publish artifacts for all Scala versions
         env:
           PGP_SECRET: ${{ secrets.PGP_SECRET }}
-          SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
-          SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
-        run: sbt ci-release
+          PUBLISH_USER: ${{ secrets.PUBLISH_USER }}
+          PUBLISH_PASSWORD: ${{ secrets.PUBLISH_PASSWORD }}
+        run: sbt +publishSigned
 
   documentation:
-    # runs on main repo only
-    if: github.repository == 'akka/akka-persistence-jdbc'
     name: Documentation
-    # the release environment provides access to secrets required in the release process
-    # https://github.com/akka/akka-persistence-jdbc/settings/environments/164872635/edit
-    environment: release
     runs-on: ubuntu-22.04
+    if: github.event.repository.fork == false
     steps:
       - name: Checkout
         uses: actions/[email protected]
         with:
           # we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
           fetch-depth: 0
 
-      - name: Checkout GitHub merge
-        if: github.event.pull_request
-        run: |-
-          git fetch origin pull/${{ github.event.pull_request.number }}/merge:scratch
-          git checkout scratch
-
-      - name: Cache Coursier cache
-        uses: coursier/[email protected]
-
       - name: Set up JDK 11
         uses: coursier/[email protected]
         with:
-          jvm: temurin:1.11.0
+          jvm: temurin:1.11
 
-      - name: Publish API and reference documentation
-        env:
-          GUSTAV_KEY: ${{ secrets.GUSTAV_KEY }}
-          GUSTAV_PASSPHRASE: ${{ secrets.GUSTAV_PASSPHRASE }}
-        run: |+
+      - name: Publish
+        run: |-
           eval "$(ssh-agent -s)"
-          echo $GUSTAV_KEY | base64 -di > .github/id_rsa
+          echo $AKKA_RSYNC_GUSTAV | base64 -d > .github/id_rsa
           chmod 600 .github/id_rsa
-          ssh-keygen -p -P "$GUSTAV_PASSPHRASE" -N "" -f .github/id_rsa
           ssh-add .github/id_rsa
-          sbt "docs/publishRsync"
+          sbt publishRsync
+        env:
+          AKKA_RSYNC_GUSTAV: ${{ secrets.AKKA_RSYNC_GUSTAV }}

.github/workflows/sqlserver-tests.yml

@@ -46,7 +46,7 @@ jobs:
         run: ./scripts/launch-sqlserver.sh
 
       - name: Run Integration tests for  ${{ matrix.name }}
-        run: sbt "It/testOnly akka.persistence.jdbc.integration.SqlServer*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
+        run: sbt "integration/testOnly akka.persistence.jdbc.integration.SqlServer*"  ${{ matrix.extraOpts }} -J-XX:+UnlockExperimentalVMOptions -J-XX:+UseJVMCICompiler
 
       - name: Print logs on failure
         if: ${{ failure() }}

.gitignore

@@ -13,3 +13,4 @@ target
 .bloop
 .metals
 metals.sbt
+.DS_Store

CONTRIBUTING.md

@@ -78,6 +78,5 @@ Example:
 
 ## How To Enforce These Guidelines?
 
-1. [Travis CI](https://travis-ci.org/akka/akka-persistence-jdbc) automatically merges the code, builds it, runs the tests and sets Pull Request status accordingly of results in GitHub.
-2. [Scalafmt](https://scalameta.org/scalafmt/) enforces some of the code style rules.
-3. [sbt-header plugin](https://github.com/sbt/sbt-header) manages consistent copyright headers in every source file.
+1. [Scalafmt](https://scalameta.org/scalafmt/) enforces some of the code style rules.
+2. [sbt-header plugin](https://github.com/sbt/sbt-header) manages consistent copyright headers in every source file.

LICENSE

@@ -3,8 +3,8 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Lightbend, Inc.
-Licensed Work:        Akka Persistence JDBC 5.2.1
-                      The Licensed Work is (c) 2022 Lightbend Inc.
+Licensed Work:        Akka Persistence JDBC 5.3.0
+                      The Licensed Work is (c) 2023 Lightbend Inc.
 Additional Use Grant:
     If you develop an application using a version of Play Framework that
     utilizes binary versions of akka-streams and its dependencies, you may
@@ -15,7 +15,7 @@ Additional Use Grant:
     Connecting to a Play Framework websocket and/or Play Framework
     request/response bodies for server and play-ws client.
 
-Change Date:          2026-02-21
+Change Date:          2026-10-24
 
 Change License:       Apache License, Version 2.0
 

README.md

@@ -1,8 +1,6 @@
 # Akka Persistence JDBC
 ## Use JDBC-compatible databases with Akka Persistence
 
-[![Build Status](https://travis-ci.com/akka/akka-persistence-jdbc.svg?branch=master)](https://travis-ci.com/github/akka/akka-persistence-jdbc)
-
 akka-persistence-jdbc writes journal and snapshot entries to a configured JDBC store. It implements the full akka-persistence-query API and is therefore very useful for implementing DDD-style 
 application models using Akka for creating reactive applications.
 
@@ -25,7 +23,6 @@ For the change log prior to v3.2.0, visit [Version History Page (wiki)](https://
 You can join these groups and chats to discuss and ask Akka related questions:
 
 - Forums: [discuss.akka.io](https://discuss.lightbend.com/c/akka/)
-- Chat room about **Akka**: [![gitter: akka/akka](https://img.shields.io/badge/gitter%3A-akka%2Fakka-blue.svg?style=flat-square)](https://gitter.im/akka/akka)
 - Issue tracker: [![github: akka/akka-persistence-jdbc](https://img.shields.io/badge/github%3A-issues-blue.svg?style=flat-square)](https://github.com/akka/akka-persistence-jdbc/issues)
 
 In addition to that, you may enjoy following:

build.sbt

@@ -1,46 +1,62 @@
 import com.lightbend.paradox.apidoc.ApidocPlugin.autoImport.apidocRootPackage
+import com.geirsson.CiReleasePlugin
 
-// FIXME remove switching to final Akka version
-ThisBuild / resolvers += "Akka Snapshots".at("https://oss.sonatype.org/content/repositories/snapshots/")
+ThisBuild / resolvers += "Akka library repository".at("https://repo.akka.io/maven")
 
 lazy val `akka-persistence-jdbc` = project
   .in(file("."))
   .enablePlugins(ScalaUnidocPlugin)
-  .disablePlugins(MimaPlugin, SitePlugin)
+  .disablePlugins(MimaPlugin, SitePlugin, CiReleasePlugin)
   .aggregate(core, docs, migrator)
-  .settings(publish / skip := true)
+  .settings(name := "akka-persistence-jdbc-root", publish / skip := true)
 
 lazy val core = project
   .in(file("core"))
   .enablePlugins(MimaPlugin)
-  .disablePlugins(SitePlugin)
-  .configs(IntegrationTest.extend(Test))
-  .settings(Defaults.itSettings)
+  .disablePlugins(SitePlugin, CiReleasePlugin)
   .settings(
     name := "akka-persistence-jdbc",
     libraryDependencies ++= Dependencies.Libraries,
     mimaReportSignatureProblems := true,
-    mimaPreviousArtifacts := Set(
-      organization.value %% name.value % previousStableVersion.value.getOrElse(
-        throw new Error("Unable to determine previous version for MiMa"))))
+    mimaPreviousArtifacts := {
+      if (scalaVersion.value.startsWith("3")) {
+        Set.empty
+      } else {
+        Set(
+          organization.value %% name.value % previousStableVersion.value.getOrElse(
+            throw new Error("Unable to determine previous version for MiMa")))
+      }
+    })
+
+lazy val integration = project
+  .in(file("integration"))
+  .settings(IntegrationTests.settings)
+  .settings(name := "akka-persistence-jdbc-integration", libraryDependencies ++= Dependencies.Libraries)
+  .disablePlugins(MimaPlugin, SitePlugin, CiReleasePlugin)
+  .dependsOn(core % "compile->compile;test->test")
 
 lazy val migrator = project
   .in(file("migrator"))
-  .disablePlugins(SitePlugin, MimaPlugin)
-  .configs(IntegrationTest.extend(Test))
-  .settings(Defaults.itSettings)
+  .disablePlugins(SitePlugin, MimaPlugin, CiReleasePlugin)
   .settings(
     name := "akka-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")
 
+lazy val `migrator-integration` = project
+  .in(file("migrator-integration"))
+  .settings(IntegrationTests.settings)
+  .settings(name := "akka-persistence-jdbc-migrator-integration", libraryDependencies ++= Dependencies.Libraries)
+  .disablePlugins(MimaPlugin, SitePlugin, CiReleasePlugin)
+  .dependsOn(migrator)
+
 lazy val docs = project
   .enablePlugins(ProjectAutoPlugin, AkkaParadoxPlugin, ParadoxSitePlugin, PreprocessPlugin, PublishRsyncPlugin)
-  .disablePlugins(MimaPlugin)
+  .disablePlugins(MimaPlugin, CiReleasePlugin)
   .settings(
-    name := "Akka Persistence JDBC",
+    name := "Akka Persistence plugin for JDBC",
     publish / skip := true,
     makeSite := makeSite.dependsOn(LocalRootProject / ScalaUnidoc / doc).value,
     previewPath := (Paradox / siteSubdirName).value,
@@ -94,3 +110,10 @@ TaskKey[Unit]("verifyCodeFmt") := {
 }
 
 addCommandAlias("verifyCodeStyle", "headerCheck; verifyCodeFmt")
+
+val isJdk11orHigher: Boolean = {
+  val result = VersionNumber(sys.props("java.specification.version")).matchesSemVer(SemanticSelector(">=11"))
+  if (!result)
+    throw new IllegalArgumentException("JDK 11 or higher is required")
+  result
+}

core/src/main/mima-filters/5.4.0.backwards.excludes/issue-710-tag-fk.excludes

@@ -0,0 +1,9 @@
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.persistence.jdbc.journal.dao.JournalTables#EventTags.eventId")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.journal.dao.JournalTables#TagRow.eventId")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.persistence.jdbc.journal.dao.JournalTables#TagRow.copy")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.journal.dao.JournalTables#TagRow.copy$default$1")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.journal.dao.JournalTables#TagRow.copy$default$2")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.persistence.jdbc.journal.dao.JournalTables#TagRow.this")
+ProblemFilters.exclude[MissingTypesProblem]("akka.persistence.jdbc.journal.dao.JournalTables$TagRow$")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.persistence.jdbc.journal.dao.JournalTables#TagRow.apply")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.persistence.jdbc.journal.dao.JournalTables#TagRow.unapply")

core/src/main/mima-filters/5.4.0.backwards.excludes/issue-775-slick-3.50.excludes

@@ -0,0 +1,43 @@
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.apply")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.unapply")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.tupled")
+ProblemFilters.exclude[IncompatibleSignatureProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.curried")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.database")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.copy")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.copy$default$1")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.db.EagerSlickDatabase.this")
+
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.db.LazySlickDatabase.database")
+
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.db.SlickDatabase.forConfig")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.db.SlickDatabase.database")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.persistence.jdbc.db.SlickDatabase.database")
+
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.journal.JdbcAsyncWriteJournal.db")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.journal.dao.DefaultJournalDao.db")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.journal.dao.DefaultJournalDao.this")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.journal.dao.legacy.BaseByteArrayJournalDao.db")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.persistence.jdbc.journal.dao.legacy.BaseByteArrayJournalDao.db")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao.db")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.journal.dao.legacy.ByteArrayJournalDao.this")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.query.dao.DefaultReadJournalDao.db")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.query.dao.DefaultReadJournalDao.this")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.query.dao.legacy.BaseByteArrayReadJournalDao.db")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.persistence.jdbc.query.dao.legacy.BaseByteArrayReadJournalDao.db")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao.db")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.query.dao.legacy.ByteArrayReadJournalDao.this")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.query.dao.legacy.OracleReadJournalDao.db")
+ProblemFilters.exclude[ReversedMissingMethodProblem]("akka.persistence.jdbc.query.dao.legacy.OracleReadJournalDao.db")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.snapshot.JdbcSnapshotStore.db")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.snapshot.dao.DefaultSnapshotDao.this")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.snapshot.dao.legacy.ByteArraySnapshotDao.this")
+ProblemFilters.exclude[IncompatibleResultTypeProblem]("akka.persistence.jdbc.state.JdbcDurableStateStoreProvider.db")
+ProblemFilters.exclude[IncompatibleMethTypeProblem]("akka.persistence.jdbc.state.scaladsl.JdbcDurableStateStore.this")
+
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.persistence.jdbc.query.JournalSequenceActor.receive")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.persistence.jdbc.query.JournalSequenceActor.receive$default$4")
+ProblemFilters.exclude[DirectMissingMethodProblem]("akka.persistence.jdbc.query.JournalSequenceActor.findGaps")
+
+
+
+