Skip to content

Commit

Permalink
Merge branch 'apache:main' into reproducible
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning authored Jul 25, 2023
2 parents 33d07b5 + 2b2d218 commit ffff0f7
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 48 deletions.
22 changes: 8 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,33 @@
Cassandra Plugins for Apache Pekko Persistence
======================================
# Cassandra Plugins for Apache Pekko Persistence

Replicated Apache Pekko Persistence journal and snapshot store backed by [Apache Cassandra](https://cassandra.apache.org/).

Apache Pekko Persistence Cassandra is a fork of [Akka Persistence Cassandra](https://github.com/akka/akka-persistence-cassandra)

Documentation
-------------
## Documentation

**TODO add documentation links**
See the [pekko-persistence-cassandra website](https://pekko.apache.org/docs/pekko-persistence-cassandra/current/) for the application documentation. The docs for all the Apache Pekko modules can be found at https://pekko.apache.org.


Community
---------
## Community

There are several ways to interact with the Apache Pekko community:

- [GitHub discussions](https://github.com/apache/incubator-pekko-persistence-cassandra/discussions): for questions and general discussion.
- [Pekko dev mailing list](https://lists.apache.org/[email protected]): for Pekko development discussions.
- [Pekko users mailing list](https://lists.apache.org/[email protected]): for Pekko user discussions.
- [GitHub issues](https://github.com/apache/incubator-pekko-persistence-cassandra/issues): for bug reports and feature requests. Please search the existing issues before creating new ones. If you are unsure whether you have found a bug, consider asking in GitHub discussions or the mailing list first.

Contributing
------------
## Contributing

Contributions are very welcome. If you have an idea on how to improve Apache Pekko Cassandra Persistence, don't hesitate to create an issue or submit a pull request.

See [CONTRIBUTING.md](https://github.com/apache/incubator-pekko-persistence-cassandra/blob/main/CONTRIBUTING.md) for details on the development workflow and how to create your pull request.


Code of Conduct
---------------
## Code of Conduct

Apache Pekko Persistence Cassandra is governed by the [Apache code of conduct](https://www.apache.org/foundation/policies/conduct.html). By participating in this project you agree to abide by its terms.

License
-------
## License

Apache Pekko Persistence Cassandra is available under the Apache License, version 2.0. See [LICENSE](https://github.com/apache/incubator-pekko-persistence-cassandra/blob/main/LICENSE) file for details.
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ import com.typesafe.sbt.packager.docker._

ThisBuild / apacheSonatypeProjectProfile := "pekko"
ThisBuild / versionScheme := Some(VersionScheme.SemVerSpec)
sourceDistName := "incubating-pekko-persistence-cassandra"
sourceDistName := "apache-pekko-persistence-cassandra"
sourceDistIncubating := true

ThisBuild / resolvers += Resolver.jcenterRepo
// TODO: Remove when Pekko has a proper release
Expand Down
4 changes: 0 additions & 4 deletions docs/src/main/paradox/_template/projectSpecificFooter.st

This file was deleted.

23 changes: 0 additions & 23 deletions docs/src/main/paradox/assets/js/warnOldVersion.js

This file was deleted.

2 changes: 1 addition & 1 deletion project/Common.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ object Common extends AutoPlugin {

override def globalSettings =
Seq(
startYear := Some(2016),
startYear := Some(2022),
homepage := Some(url("https://pekko.apache.org/")),
// apiURL defined in projectSettings because version.value is not correct here
scmInfo := Some(
Expand Down
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,18 +17,18 @@ object Dependencies {
val scala3Version = "3.1.2" // not yet enabled - missing pekko-http/pekko-management Scala 3 artifacts
val scalaVersions = Seq(scala212Version, scala213Version)

val pekkoVersion = System.getProperty("override.pekko.version", "0.0.0+26669-ec5b6764-SNAPSHOT")
val pekkoVersion = System.getProperty("override.pekko.version", "1.0.0")
val pekkoVersionInDocs = "current"
val cassandraVersionInDocs = "4.0"

// Should be sync with the version of the driver in Pekko Connectors Cassandra
val driverVersion = "4.15.0"
val driverVersionInDocs = "4.14"

val pekkoConnectorsVersion = "0.0.0+123-178795f6-SNAPSHOT"
val pekkoConnectorsVersion = "0.0.0+131-79ec6fa6-SNAPSHOT"
val pekkoConnectorsVersionInDocs = "current"
// for example
val pekkoManagementVersion = "0.0.0+752-95cdd415-SNAPSHOT"
val pekkoManagementVersion = "0.0.0+757-f7d48cde-SNAPSHOT"

val logback = "ch.qos.logback" % "logback-classic" % "1.2.10"

Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-multi-jvm" % "0.4.0")
addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1")
addSbtPlugin("net.bzzt" % "sbt-reproducible-builds" % "0.30")
addSbtPlugin("org.mdedetrich" % "sbt-apache-sonatype" % "0.1.10")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.6")
addSbtPlugin("com.github.pjfanning" % "sbt-source-dist" % "0.1.8")

// Documentation
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
Expand All @@ -28,7 +28,7 @@ updateOptions := updateOptions.value.withLatestSnapshots(false)

// 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(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+38-68da3106-SNAPSHOT").excludeAll(
addSbtPlugin(("org.apache.pekko" % "pekko-sbt-paradox" % "0.0.0+43-d9643c78-SNAPSHOT").excludeAll(
"com.lightbend.paradox", "sbt-paradox",
"com.lightbend.paradox" % "sbt-paradox-apidoc",
"com.lightbend.paradox" % "sbt-paradox-project-info"))
Expand Down

0 comments on commit ffff0f7

Please sign in to comment.