This is an automated email from the ASF dual-hosted git repository.
engelen pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-persistence-r2dbc.git
The following commit(s) were added to refs/heads/main by this push:
new 33d5f49 try to fix issue in nightly build (#131)
33d5f49 is described below
commit 33d5f49f3ff6ae6c0dc7fc05afec255ffd3de09d
Author: PJ Fanning <[email protected]>
AuthorDate: Sun Jun 30 11:01:24 2024 +0100
try to fix issue in nightly build (#131)
* try to fix issue in nightly build
* Update Dependencies.scala
* Update build.sbt
* Update Dependencies.scala
* migration tests
* Update nightly-tests-pekko1.0.yml
---
build.sbt | 4 +++-
project/Dependencies.scala | 58 +++++++++++++++++++++++++++++++---------------
2 files changed, 42 insertions(+), 20 deletions(-)
diff --git a/build.sbt b/build.sbt
index d68dec1..f6bde43 100644
--- a/build.sbt
+++ b/build.sbt
@@ -61,13 +61,15 @@ lazy val projection = (project in file("projection"))
.settings(
name := "pekko-projection-r2dbc",
crossScalaVersions += Dependencies.Scala3,
- libraryDependencies ++= Dependencies.projection)
+ libraryDependencies ++= Dependencies.projection,
+ dependencyOverrides ++= Dependencies.pekkoTestDependencyOverrides)
lazy val migration = (project in file("migration"))
.enablePlugins(ReproducibleBuildsPlugin)
.settings(
name := "pekko-persistence-r2dbc-migration",
libraryDependencies ++= Dependencies.migration,
+ dependencyOverrides ++= Dependencies.pekkoTestDependencyOverrides,
Test / mainClass :=
Some("org.apache.pekko.persistence.r2dbc.migration.MigrationTool"),
Test / run / fork := true,
Test / run / javaOptions += "-Dlogback.configurationFile=logback-main.xml")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 4103cb6..8d68b95 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -39,12 +39,20 @@ object Dependencies {
}
object TestDeps {
+ val pekkoActor = "org.apache.pekko" %% "pekko-actor" % PekkoVersion % Test
+ val pekkoActorTyped = "org.apache.pekko" %% "pekko-actor-typed" %
PekkoVersion % Test
+ val pekkoActorTestkitTyped = "org.apache.pekko" %%
"pekko-actor-testkit-typed" % PekkoVersion % Test
+ val pekkoJackson = "org.apache.pekko" %% "pekko-serialization-jackson" %
PekkoVersion % Test
+ val pekkoPersistence = "org.apache.pekko" %% "pekko-persistence" %
PekkoVersion % Test
+ val pekkoPersistenceQuery = "org.apache.pekko" %%
"pekko-persistence-query" % PekkoVersion % Test
val pekkoPersistenceTyped = "org.apache.pekko" %%
"pekko-persistence-typed" % PekkoVersion % Test
- val pekkoShardingTyped = "org.apache.pekko" %%
"pekko-cluster-sharding-typed" % PekkoVersion % Test
val pekkoPersistenceTck = "org.apache.pekko" %% "pekko-persistence-tck" %
PekkoVersion % Test
- val pekkoTestkit = "org.apache.pekko" %% "pekko-actor-testkit-typed" %
PekkoVersion % Test
+ val pekkoProtobuf = "org.apache.pekko" %% "pekko-protobuf-v3" %
PekkoVersion % Test
+ val pekkoSlf4j = "org.apache.pekko" %% "pekko-slf4j" % PekkoVersion % Test
+ val pekkoShardingTyped = "org.apache.pekko" %%
"pekko-cluster-sharding-typed" % PekkoVersion % Test
+ val pekkoStream = "org.apache.pekko" %% "pekko-stream" % PekkoVersion %
Test
val pekkoStreamTestkit = "org.apache.pekko" %% "pekko-stream-testkit" %
PekkoVersion % Test
- val pekkoJackson = "org.apache.pekko" %% "pekko-serialization-jackson" %
PekkoVersion % Test
+ val pekkoTestkit = "org.apache.pekko" %% "pekko-testkit" % PekkoVersion %
Test
val pekkoProjectionEventSourced =
"org.apache.pekko" %% "pekko-projection-eventsourced" %
PekkoProjectionVersion % Test
@@ -69,7 +77,7 @@ object Dependencies {
r2dbcPool,
TestDeps.pekkoPersistenceTck,
TestDeps.pekkoStreamTestkit,
- TestDeps.pekkoTestkit,
+ TestDeps.pekkoActorTestkitTyped,
TestDeps.pekkoJackson,
TestDeps.logback,
TestDeps.scalaTest) ++ r2dbcPostgres
@@ -81,24 +89,36 @@ object Dependencies {
pekkoProjectionCore,
TestDeps.pekkoProjectionEventSourced,
TestDeps.pekkoProjectionDurableState,
- TestDeps.pekkoStreamTestkit,
- TestDeps.pekkoTestkit,
TestDeps.pekkoProjectionTestKit,
+ TestDeps.pekkoActorTestkitTyped,
TestDeps.pekkoJackson,
+ TestDeps.pekkoStreamTestkit,
TestDeps.logback,
TestDeps.scalaTest) ++ r2dbcPostgres
- val migration =
- Seq(
- "org.apache.pekko" %% "pekko-persistence-jdbc" %
PekkoPersistenceJdbcVersion % Test,
- TestDeps.postgresql,
- TestDeps.logback,
- TestDeps.scalaTest)
-
- val docs =
- Seq(
- TestDeps.pekkoPersistenceTyped,
- TestDeps.pekkoProjectionEventSourced,
- TestDeps.pekkoProjectionDurableState,
- TestDeps.pekkoShardingTyped)
+ val migration = Seq(
+ "org.apache.pekko" %% "pekko-persistence-jdbc" %
PekkoPersistenceJdbcVersion % Test,
+ TestDeps.postgresql,
+ TestDeps.logback,
+ TestDeps.scalaTest)
+
+ val docs = Seq(
+ TestDeps.pekkoPersistenceTyped,
+ TestDeps.pekkoProjectionEventSourced,
+ TestDeps.pekkoProjectionDurableState,
+ TestDeps.pekkoShardingTyped)
+
+ val pekkoTestDependencyOverrides = Seq(
+ TestDeps.pekkoActor,
+ TestDeps.pekkoActorTyped,
+ TestDeps.pekkoActorTestkitTyped,
+ TestDeps.pekkoJackson,
+ TestDeps.pekkoPersistence,
+ TestDeps.pekkoPersistenceQuery,
+ TestDeps.pekkoProtobuf,
+ TestDeps.pekkoSlf4j,
+ TestDeps.pekkoStream,
+ TestDeps.pekkoStreamTestkit,
+ TestDeps.pekkoTestkit)
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
