You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by fa...@apache.org on 2023/01/18 09:03:17 UTC
[incubator-pekko-persistence-r2dbc] branch main updated: use Pekko name and add license/notice to jars (#4)
This is an automated email from the ASF dual-hosted git repository.
fanningpj pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-persistence-r2dbc.git
The following commit(s) were added to refs/heads/main by this push:
new 0685439 use Pekko name and add license/notice to jars (#4)
0685439 is described below
commit 068543960c1e53453301699338d49ecd95304284
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Jan 18 10:03:11 2023 +0100
use Pekko name and add license/notice to jars (#4)
---
CONTRIBUTING.md | 12 +++++-------
NOTICE | 11 +++++++++++
README.md | 16 ++++------------
build.sbt | 26 +++++++++++++++-----------
project/MetaInfLicenseNoticeCopy.scala | 30 ++++++++++++++++++++++++++++++
project/build.properties | 2 +-
6 files changed, 66 insertions(+), 31 deletions(-)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0a15b60..4e5c5d5 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-# Contributing to Akka Persistence R2DBC
+# Contributing to Apache Pekko Persistence R2DBC
## Running the tests Postgres
@@ -76,16 +76,14 @@ docker exec -it yb-tserver-n1 /home/yugabyte/bin/ysqlsh -h yb-tserver-n1
This is the process for committing code into main.
-1. Make sure you have signed the Lightbend CLA, if not, [sign it online](http://www.lightbend.com/contribute/cla).
-2. Before starting to work on a feature or a fix, make sure that there is a ticket for your work in the [issue tracker](https://github.com/akka/akka-persistence-r2dbc/issues). If not, create it first.
+1. For non-trivial changes, you will be asked to sign the [CLA](https://www.apache.org/licenses/contributor-agreements.html) if you have not done so before.
+2. Before starting to work on a feature or a fix, make sure that there is a ticket for your work in the [issue tracker](https://github.com/apache/incubator-pekko-persistence-r2dbc/issues). If not, create it first.
3. Perform your work according to the [pull request requirements](#pull-request-requirements).
-4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on [GitHub](https://github.com/akka/akka-persistence-r2dbc/pulls).
-5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Note that the maintainers can consist of outside contributors, both within and outside Lightbend. Outside contributors are encouraged to participate in the review process, it is not a closed process.
+4. When the feature or fix is completed you should open a [Pull Request](https://help.github.com/articles/using-pull-requests) on [GitHub](https://github.com/apache/incubator-pekko-persistence-r2dbc/pulls).
+5. The Pull Request should be reviewed by other maintainers (as many as feasible/practical). Outside contributors are encouraged to participate in the review process, it is not a closed process.
6. After the review you should fix the issues (review comments, CI failures) by pushing a new commit for new review, iterating until the reviewers give their thumbs up and CI tests pass.
7. If the branch merge conflicts with its target, rebase your branch onto the target branch.
-In case of questions about the contribution process or for discussion of specific issues please visit the [akka/dev gitter chat](https://gitter.im/akka/dev).
-
## Pull Request Requirements
For a Pull Request to be considered at all it has to meet these requirements:
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..db5b868
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,11 @@
+Apache Pekko Persistence R2DBC
+Copyright 2022, 2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
+
+This product contains significant parts that were originally based on software from Lightbend (Akka <https://akka.io/>).
+Copyright (C) 2021-2022 Lightbend Inc. <https://www.lightbend.com>
+
+Apache Pekko Persistence R2DBC is derived from Akka Persistence R2DBC 0.7.x, the last version that was distributed under the
+Apache License, Version 2.0 License.
diff --git a/README.md b/README.md
index 3ff9ff1..329c0f7 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,7 @@
-# R2DBC Plugin for Akka Persistence
+# R2DBC Plugin for Apache Pekko Persistence
-[Akka Persistence](https://doc.akka.io/docs/akka/current/scala/persistence.html) journal and snapshot
-store for SQL datbases with RD2BC connectivity.
-
-For questions please use the [discuss.akka.io](https://discuss.akka.io). Tag any new questions with `akka-persistence` and `r2dbc`.
-
-The documentation can be found [here](https://doc.akka.io/docs/akka-persistence-r2dbc/current/index.html)
+Pekko Persistence journal and snapshot
+store for SQL databases with RD2BC connectivity.
## Project status
@@ -13,8 +9,4 @@ Under development.
## License
-Akka Persistence RD2BC is Open Source and available under the Apache 2 License.
-
-## Support
-
-This project is under development and not ready for production usage yet. The Lightbend subscription does not cover support for this project.
+Pekko Persistence RD2BC is Open Source and available under the Apache 2 License.
diff --git a/build.sbt b/build.sbt
index 886a7d5..3479332 100644
--- a/build.sbt
+++ b/build.sbt
@@ -6,22 +6,22 @@ Global / concurrentRestrictions += Tags.limit(Tags.Test, 1)
inThisBuild(
Seq(
- organization := "com.lightbend.akka",
- organizationName := "Lightbend Inc.",
- homepage := Some(url("https://doc.akka.io/docs/akka-persistence-r2dbc/current")),
+ organization := "org.apache.pekko",
+ organizationName := "Apache Software Foundation",
+ homepage := Some(url("https://pekko.apache.org/")),
scmInfo := Some(
ScmInfo(
- url("https://github.com/akka/akka-persistence-r2dbc"),
- "https://github.com/akka/akka-persistence-r2dbc.git")),
+ url("https://github.com/apache/incubator-pekko-persistence-r2dbc"),
+ "https://github.com/apache/incubator-pekko-persistence-r2dbc.git")),
startYear := Some(2021),
developers += Developer(
"contributors",
"Contributors",
- "https://gitter.im/akka/dev",
- url("https://github.com/akka/akka-persistence-r2dbc/graphs/contributors")),
+ "dev@pekko.apache.org",
+ url("https://github.com/apache/incubator-pekko-persistence-r2dbc/graphs/contributors")),
licenses := Seq(("Apache-2.0", url("http://www.apache.org/licenses/LICENSE-2.0"))),
- description := "An Akka Persistence backed by SQL database with R2DBC",
- // add snapshot repo when Akka version overriden
+ description := "An Apache Pekko Persistence backed by SQL database with R2DBC",
+ // add snapshot repo when Pekko version overridden
resolvers ++=
(if (System.getProperty("override.akka.version") != null)
Seq("Akka Snapshots".at("https://oss.sonatype.org/content/repositories/snapshots/"))
@@ -33,7 +33,7 @@ def common: Seq[Setting[_]] =
scalaVersion := Dependencies.Scala213,
crossVersion := CrossVersion.binary,
scalafmtOnCompile := true,
- sonatypeProfileName := "com.lightbend",
+ sonatypeProfileName := "org.apache.pekko",
// Setting javac options in common allows IntelliJ IDEA to import them automatically
Compile / javacOptions ++= Seq("-encoding", "UTF-8", "-source", "1.8", "-target", "1.8"),
headerLicense := Some(HeaderLicense.Custom("""Copyright (C) 2021 Lightbend Inc. <https://www.lightbend.com>""")),
@@ -72,16 +72,19 @@ def suffixFileFilter(suffix: String): FileFilter = new SimpleFileFilter(f => f.g
lazy val core = (project in file("core"))
.settings(common)
.settings(name := "akka-persistence-r2dbc", libraryDependencies ++= Dependencies.core)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.enablePlugins(AutomateHeaderPlugin)
lazy val projection = (project in file("projection"))
.dependsOn(core)
.settings(common)
.settings(name := "akka-projection-r2dbc", libraryDependencies ++= Dependencies.projection)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.enablePlugins(AutomateHeaderPlugin)
lazy val migration = (project in file("migration"))
.settings(common)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(
name := "akka-persistence-r2dbc-migration",
libraryDependencies ++= Dependencies.migration,
@@ -104,9 +107,10 @@ lazy val docs = project
.enablePlugins(AkkaParadoxPlugin, ParadoxSitePlugin, PublishRsyncPlugin)
.dependsOn(core, projection, migration)
.settings(common)
+ .settings(MetaInfLicenseNoticeCopy.settings)
.settings(dontPublish)
.settings(
- name := "Akka Persistence R2DBC",
+ name := "Apache Pekko Persistence R2DBC",
libraryDependencies ++= Dependencies.docs,
previewPath := (Paradox / siteSubdirName).value,
Paradox / siteSubdirName := s"docs/akka-persistence-r2dbc/${projectInfoVersion.value}",
diff --git a/project/MetaInfLicenseNoticeCopy.scala b/project/MetaInfLicenseNoticeCopy.scala
new file mode 100644
index 0000000..1965dc5
--- /dev/null
+++ b/project/MetaInfLicenseNoticeCopy.scala
@@ -0,0 +1,30 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * license agreements; and to You under the Apache License, version 2.0:
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * This file is part of the Apache Pekko project, which was derived from Akka.
+ */
+
+import sbt.Keys._
+import sbt._
+
+/**
+ * Copies LICENSE and NOTICE files into jar META-INF dir
+ */
+object MetaInfLicenseNoticeCopy {
+
+ val settings: Seq[Setting[_]] = inConfig(Compile)(
+ Seq(
+ resourceGenerators += copyFileToMetaInf(resourceManaged, "LICENSE"),
+ resourceGenerators += copyFileToMetaInf(resourceManaged, "NOTICE")))
+
+ def copyFileToMetaInf(dir: SettingKey[File], fileName: String) = Def.task[Seq[File]] {
+ val fromFile = (LocalRootProject / baseDirectory).value / fileName
+ val toFile = resourceManaged.value / "META-INF" / fileName
+ IO.copyFile(fromFile, toFile)
+ Seq(toFile)
+ }
+
+}
diff --git a/project/build.properties b/project/build.properties
index 38c0109..6cd347f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1,2 +1,2 @@
-sbt.version=1.7.1
+sbt.version=1.8.2
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org