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-cassandra.git
The following commit(s) were added to refs/heads/main by this push:
new b7bd1ed Update sbt-multi-jvm & sbt-assembly (#193)
b7bd1ed is described below
commit b7bd1ed937cbbab9066dc7819b826b9a6d4dded7
Author: AndyChen(Jingzhang) <[email protected]>
AuthorDate: Mon Apr 29 22:16:15 2024 +0800
Update sbt-multi-jvm & sbt-assembly (#193)
* Update sbt-multi-jvm & sbt-assembly
* fix group id
* use assemblyOutputPath rather than target
* discard assemblyOutputPath depend
* fix path
* avoid sbt task cyclic depend
* fix launcher
* fix bundler jar loading
---
build.sbt | 3 +--
.../pekko/persistence/cassandra/testkit/CassandraLauncher.scala | 2 +-
project/plugins.sbt | 4 ++--
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/build.sbt b/build.sbt
index e865b2a..631fad0 100644
--- a/build.sbt
+++ b/build.sbt
@@ -45,7 +45,7 @@ lazy val cassandraLauncher = project
.disablePlugins(MimaPlugin)
.settings(
name := "pekko-persistence-cassandra-launcher",
- Compile / managedResourceDirectories += (cassandraBundle / target).value /
"bundle",
+ Compile / managedResourceDirectories += (cassandraBundle / target).value,
Compile / managedResources += (cassandraBundle / Compile /
packageBin).value)
// This project doesn't get published directly, rather the assembled artifact
is included as part of cassandraLaunchers
@@ -61,7 +61,6 @@ lazy val cassandraBundle = project
libraryDependencies += ("org.apache.cassandra" % "cassandra-all" %
"3.11.3")
.exclude("commons-logging", "commons-logging"),
dependencyOverrides += "com.github.jbellis" % "jamm" % "0.3.3", // See
jamm comment in https://issues.apache.org/jira/browse/CASSANDRA-9608
- assembly / target := target.value / "bundle" / "pekko" / "persistence" /
"cassandra" / "launcher",
assembly / assemblyJarName := "cassandra-bundle.jar",
Compile / packageBin := Def.taskDyn {
val store = streams.value.cacheStoreFactory.make("shaded-output")
diff --git
a/cassandra-launcher/src/main/scala/org/apache/pekko/persistence/cassandra/testkit/CassandraLauncher.scala
b/cassandra-launcher/src/main/scala/org/apache/pekko/persistence/cassandra/testkit/CassandraLauncher.scala
index f8430de..4769613 100644
---
a/cassandra-launcher/src/main/scala/org/apache/pekko/persistence/cassandra/testkit/CassandraLauncher.scala
+++
b/cassandra-launcher/src/main/scala/org/apache/pekko/persistence/cassandra/testkit/CassandraLauncher.scala
@@ -288,7 +288,7 @@ object CassandraLauncher {
new File(cassandraDirectory, "cassandra-bundle.jar")
if (!cassandraBundleFile.exists()) {
val is =
-
this.getClass.getClassLoader.getResourceAsStream("pekko/persistence/cassandra/launcher/cassandra-bundle.jar")
+
this.getClass.getClassLoader.getResourceAsStream("cassandra-bundle.jar")
try {
Files.copy(is, cassandraBundleFile.toPath)
} finally {
diff --git a/project/plugins.sbt b/project/plugins.sbt
index f40bd0a..b038f01 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -12,8 +12,8 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" %
"1.10.0")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("com.lightbend.sbt" % "sbt-java-formatter" % "0.8.0")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
-addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
+addSbtPlugin("com.github.sbt" % "sbt-multi-jvm" % "0.6.0")
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
addSbtPlugin("com.github.pjfanning" % "sbt-pekko-build" % "0.3.3")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.12")
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
