Skip to content

Commit

Permalink
Merge branch 'main' into update/scala3-library-3.3.3
Browse files Browse the repository at this point in the history
  • Loading branch information
johanandren authored May 17, 2024
2 parents 767a024 + 442165c commit 88100c5
Show file tree
Hide file tree
Showing 18 changed files with 366 additions and 120 deletions.
45 changes: 0 additions & 45 deletions .circleci/config.yml

This file was deleted.

8 changes: 8 additions & 0 deletions .fossa.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 3

# https://github.com/fossas/fossa-cli/blob/master/docs/references/files/fossa-yml.md

paths:
exclude:
- ./example
- ./dse-test
40 changes: 22 additions & 18 deletions .github/workflows/check-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ jobs:
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
# v3.3.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos
fetch-depth: 0

Expand All @@ -32,13 +32,15 @@ jobs:

- name: Set up JDK 11
# https://github.com/coursier/setup-action/releases
# v1.3.0
uses: coursier/setup-action@70323223454ac2a9eb2de46f389b4d045cbcdea5
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

- name: Cache Coursier cache
uses: coursier/[email protected]
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: "Code style, compile tests"
run: sbt "verifyCodeStyle; +Test/compile"
Expand All @@ -54,8 +56,8 @@ jobs:
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
# v3.3.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with: # https://github.com/olafurpg/setup-scala#faster-checkout-of-big-repos
fetch-depth: 100

Expand All @@ -64,15 +66,15 @@ jobs:

- name: Set up JDK 11
# https://github.com/coursier/setup-action/releases
# v1.3.0
uses: coursier/setup-action@70323223454ac2a9eb2de46f389b4d045cbcdea5
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

- name: Cache Coursier cache
# https://github.com/coursier/cache-action/releases/
# v6.4.3
uses: coursier/cache-action@d1039466d0812d6370649b9afb02bbf5f646bacf
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: "Create all API docs and create site with Paradox"
run: sbt "unidoc; docs/makeSite"
Expand Down Expand Up @@ -100,8 +102,8 @@ jobs:
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
# v3.3.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
with:
fetch-depth: 0

Expand All @@ -112,14 +114,16 @@ jobs:
git checkout scratch
- name: Set up JDK ${{ matrix.jdkVersion }}
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: ${{ matrix.jvmName }}

- name: Cache Coursier cache
# https://github.com/coursier/cache-action/releases/
# v6.4.3
uses: coursier/cache-action@d1039466d0812d6370649b9afb02bbf5f646bacf
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Test against ${{ matrix.container }}
run: |-
Expand Down
21 changes: 0 additions & 21 deletions .github/workflows/dependency-submission.yml

This file was deleted.

14 changes: 7 additions & 7 deletions .github/workflows/fossa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@ jobs:
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
# v3.3.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
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: Set up JDK 11
# https://github.com/coursier/setup-action/releases
# v1.3.0
uses: coursier/setup-action@70323223454ac2a9eb2de46f389b4d045cbcdea5
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

- name: Cache Coursier cache
# https://github.com/coursier/cache-action/releases/
# v6.4.3
uses: coursier/cache-action@d1039466d0812d6370649b9afb02bbf5f646bacf
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: FOSSA policy check
run: |-
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,23 @@ jobs:
steps:
- name: Checkout
# https://github.com/actions/checkout/releases
# v3.3.0
uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
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: Set up JDK 11
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11.0.17

- name: Cache Coursier cache
# https://github.com/coursier/cache-action/releases/
# v6.4.3
uses: coursier/cache-action@d1039466d0812d6370649b9afb02bbf5f646bacf
# https://github.com/coursier/cache-action/releases
# v6.4.5
uses: coursier/cache-action@1ff273bff02a8787bc9f1877d347948af647956d

- name: Publish artifacts for all Scala versions
env:
Expand All @@ -52,13 +54,17 @@ jobs:
if: github.event.repository.fork == false
steps:
- name: Checkout
uses: actions/[email protected]
# https://github.com/actions/checkout/releases
# v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
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: Set up JDK 11
uses: coursier/[email protected]
# https://github.com/coursier/setup-action/releases
# v1.3.5
uses: coursier/setup-action@7bde40eee928896f074dbb76d22dd772eed5c65f
with:
jvm: temurin:1.11

Expand Down
10 changes: 7 additions & 3 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,12 @@ Business Source License 1.1
Parameters

Licensor: Lightbend, Inc.
Licensed Work: Akka Persistence Cassandra 1.2.0
The Licensed Work is (c) 2023 Lightbend Inc.
Licensed Work: Akka Persistence Cassandra 1.2.1
This license applies to all sub directories and files
UNLESS another license file is present in a sub
directory, then that other license applies to all files
in its directory and sub directories.
The Licensed Work is (c) 2024 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
Expand All @@ -15,7 +19,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-10-25
Change Date: 2027-05-14

Change License: Apache License, Version 2.0

Expand Down
5 changes: 4 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
Cassandra Plugins for Akka Persistence
======================================

The Akka family of projects is managed by teams at [Lightbend](https://lightbend.com/) with help from the community.

Replicated [Akka Persistence](https://doc.akka.io/docs/akka/current/scala/persistence.html) journal and snapshot store backed by [Apache Cassandra](https://cassandra.apache.org/).

For questions please use the [discuss.akka.io](https://discuss.lightbend.com/c/akka/).
Expand All @@ -23,5 +25,6 @@ It moved to the [Akka](https://github.com/akka/) organisation in 2016 and the fi

## License

Akka Persistence Cassandra is licensed under the Business Source License 1.1, see LICENSE.
Akka is licensed under the Business Source License 1.1, please see the [Akka License FAQ](https://www.lightbend.com/akka/license-faq).

Tests and documentation are under a separate license, see the LICENSE file in each documentation and test root directory for details.
Loading

0 comments on commit 88100c5

Please sign in to comment.