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/03/25 12:03:35 UTC
[incubator-pekko] branch main updated: update pekko-cluster license (#272)
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.git
The following commit(s) were added to refs/heads/main by this push:
new 198d0eb017 update pekko-cluster license (#272)
198d0eb017 is described below
commit 198d0eb017e7b9f31d5e76433f9c3855658b8d4f
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sat Mar 25 13:03:29 2023 +0100
update pekko-cluster license (#272)
---
LICENSE | 7 +++++
build.sbt | 1 +
LICENSE => legal/pekko-cluster-jar-license.txt | 36 +++-----------------------
project/AddMetaInfLicenseFiles.scala | 6 +++++
4 files changed, 18 insertions(+), 32 deletions(-)
diff --git a/LICENSE b/LICENSE
index 8a0faeda2d..6588d32248 100644
--- a/LICENSE
+++ b/LICENSE
@@ -223,6 +223,13 @@ Copyright 2014 The Netty Project
---------------
+pekko-cluster contains VectorClock.scala which is derived from code written
+by Coda Hale <https://github.com/codahale/vlock>.
+He has agreed to allow us to use this code under an Apache 2.0 license
+<https://github.com/apache/incubator-pekko/issues/232#issuecomment-1465281263>.
+
+---------------
+
pekko-remote contains CountMinSketch.java which contains code derived from MurmurHash3,
written by Austin Appleby. He has placed his code in the public domain.
The author has disclaimed copyright to that source code.
diff --git a/build.sbt b/build.sbt
index 4c6f790987..1dde388a24 100644
--- a/build.sbt
+++ b/build.sbt
@@ -149,6 +149,7 @@ lazy val cluster = pekkoModule("cluster")
jackson % "test->test")
.settings(Dependencies.cluster)
.settings(AutomaticModuleName.settings("pekko.cluster"))
+ .settings(AddMetaInfLicenseFiles.clusterSettings)
.settings(OSGi.cluster)
.settings(Protobuf.settings)
.settings(Test / parallelExecution := false)
diff --git a/LICENSE b/legal/pekko-cluster-jar-license.txt
similarity index 89%
copy from LICENSE
copy to legal/pekko-cluster-jar-license.txt
index 8a0faeda2d..550651038b 100644
--- a/LICENSE
+++ b/legal/pekko-cluster-jar-license.txt
@@ -202,35 +202,7 @@
---------------
-pekko-actor contains MurmurHash.scala which is derived from MurmurHash3,
-written by Austin Appleby. He has placed his code in the public domain.
-The author has disclaimed copyright to that source code.
-MurmurHash.scala also contains changes made by the Scala-Lang team under an Apache 2.0 license.
-Copyright (c) 2003-2011, LAMP/EPFL
-
----------------
-
-pekko-actor contains code from scala-collection-compat in the `org.apache.pekko.util.ccompat` package
-which has released under an Apache 2.0 license.
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
-
----------------
-
-pekko-actor contains code from Netty in `org.apache.pekko.io.dns.DnsSettings.scala`
-which was released under an Apache 2.0 license.
-Copyright 2014 The Netty Project
-
----------------
-
-pekko-remote contains CountMinSketch.java which contains code derived from MurmurHash3,
-written by Austin Appleby. He has placed his code in the public domain.
-The author has disclaimed copyright to that source code.
-CountMinSketch.java also contains additional code developed under an Apache 2.0 license.
-Copyright 2016 AddThis
-
----------------
-
-pekko-protobuf contains the sources of Google protobuf 2.5.0 runtime support,
-moved into the source package `org.apache.pekko.protobuf` so as to avoid version conflicts.
-For license information see COPYING.protobuf
+pekko-cluster contains VectorClock.scala which is derived from code written
+by Coda Hale <https://github.com/codahale/vlock>.
+He has agreed to allow us to use this code under an Apache 2.0 license
+<https://github.com/apache/incubator-pekko/issues/232#issuecomment-1465281263>.
diff --git a/project/AddMetaInfLicenseFiles.scala b/project/AddMetaInfLicenseFiles.scala
index 7eeba872b2..d3319cba1e 100644
--- a/project/AddMetaInfLicenseFiles.scala
+++ b/project/AddMetaInfLicenseFiles.scala
@@ -31,6 +31,12 @@ object AddMetaInfLicenseFiles extends AutoPlugin {
apacheSonatypeLicenseFile := baseDir.value / "legal" / "pekko-actor-jar-license.txt",
apacheSonatypeNoticeFile := baseDir.value / "legal" / "pekko-actor-jar-notice.txt")
+ /**
+ * Settings specific for Pekko actor subproject which requires a different license file.
+ */
+ lazy val clusterSettings = Seq(
+ apacheSonatypeLicenseFile := baseDir.value / "legal" / "pekko-cluster-jar-license.txt")
+
/**
* Settings specific for Pekko remote subproject which requires a different license file.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org