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/06 14:05:05 UTC
[incubator-pekko] branch main updated: license/notice reqs for CountMinSketch.java (#229)
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 a1ee96633c license/notice reqs for CountMinSketch.java (#229)
a1ee96633c is described below
commit a1ee96633c84831718f1569c63b7344eb13d6188
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Mon Mar 6 15:04:59 2023 +0100
license/notice reqs for CountMinSketch.java (#229)
---
LICENSE | 8 ++++++++
NOTICE | 20 ++++++++++++++++++++
build.sbt | 1 +
NOTICE => legal/pekko-actor-jar-notice.txt | 11 +++++++++++
LICENSE => legal/pekko-remote-jar-license.txt | 12 +++---------
NOTICE => legal/pekko-remote-jar-notice.txt | 9 +++++++++
project/AddMetaInfLicenseFiles.scala | 10 +++++++++-
7 files changed, 61 insertions(+), 10 deletions(-)
diff --git a/LICENSE b/LICENSE
index 9fdbc9c8d2..018050af41 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,6 +210,14 @@ Copyright (c) 2003-2011, LAMP/EPFL
---------------
+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
diff --git a/NOTICE b/NOTICE
index f629dd12d8..f823e4125c 100644
--- a/NOTICE
+++ b/NOTICE
@@ -9,3 +9,23 @@ Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
Apache Pekko is derived from Akka 2.6.x, the last version that was distributed under the
Apache License, Version 2.0 License.
+
+---------------
+
+pekko-actor contains MurmurHash.scala which has changes made by the Scala-Lang team under an Apache 2.0 license.
+
+Copyright (c) 2002-2023 EPFL
+Copyright (c) 2011-2023 Lightbend, Inc.
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
+
+---------------
+
+pekko-remote contains CountMinSketch.java which was developed under an Apache 2.0 license.
+
+stream-lib
+Copyright 2016 AddThis
+
+This product includes software developed by AddThis.
diff --git a/build.sbt b/build.sbt
index e2e10e1d8c..4c6f790987 100644
--- a/build.sbt
+++ b/build.sbt
@@ -402,6 +402,7 @@ lazy val remote =
jackson % "test->test")
.settings(Dependencies.remote)
.settings(AutomaticModuleName.settings("pekko.remote"))
+ .settings(AddMetaInfLicenseFiles.remoteSettings)
.settings(OSGi.remote)
.settings(Protobuf.settings)
.settings(Test / parallelExecution := false)
diff --git a/NOTICE b/legal/pekko-actor-jar-notice.txt
similarity index 59%
copy from NOTICE
copy to legal/pekko-actor-jar-notice.txt
index f629dd12d8..b22048b834 100644
--- a/NOTICE
+++ b/legal/pekko-actor-jar-notice.txt
@@ -9,3 +9,14 @@ Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
Apache Pekko is derived from Akka 2.6.x, the last version that was distributed under the
Apache License, Version 2.0 License.
+
+---------------
+
+pekko-actor contains MurmurHash.scala which has changes made by the Scala-Lang team under an Apache 2.0 license.
+
+Copyright (c) 2002-2023 EPFL
+Copyright (c) 2011-2023 Lightbend, Inc.
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
diff --git a/LICENSE b/legal/pekko-remote-jar-license.txt
similarity index 96%
copy from LICENSE
copy to legal/pekko-remote-jar-license.txt
index 9fdbc9c8d2..dec675625d 100644
--- a/LICENSE
+++ b/legal/pekko-remote-jar-license.txt
@@ -202,14 +202,8 @@
---------------
-pekko-actor contains MurmurHash.scala which is derived from MurmurHash3,
+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.
-MurmurHash.scala also contains changes made by the Scala-Lang team under an Apache 2.0 license.
-Copyright (c) 2003-2011, LAMP/EPFL
-
----------------
-
-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
+CountMinSketch.java also contains additional code developed under an Apache 2.0 license.
+Copyright 2016 AddThis
diff --git a/NOTICE b/legal/pekko-remote-jar-notice.txt
similarity index 70%
copy from NOTICE
copy to legal/pekko-remote-jar-notice.txt
index f629dd12d8..d58ac104d4 100644
--- a/NOTICE
+++ b/legal/pekko-remote-jar-notice.txt
@@ -9,3 +9,12 @@ Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
Apache Pekko is derived from Akka 2.6.x, the last version that was distributed under the
Apache License, Version 2.0 License.
+
+---------------
+
+pekko-remote contains CountMinSketch.java which was developed under an Apache 2.0 license.
+
+stream-lib
+Copyright 2016 AddThis
+
+This product includes software developed by AddThis.
diff --git a/project/AddMetaInfLicenseFiles.scala b/project/AddMetaInfLicenseFiles.scala
index f156b1a2ee..ef30637106 100644
--- a/project/AddMetaInfLicenseFiles.scala
+++ b/project/AddMetaInfLicenseFiles.scala
@@ -27,7 +27,15 @@ object AddMetaInfLicenseFiles extends AutoPlugin {
* Settings specific for Pekko actor subproject which requires a different license file.
*/
lazy val actorSettings = Seq(
- apacheSonatypeLicenseFile := baseDir.value / "legal" / "pekko-actor-jar-license.txt")
+ apacheSonatypeLicenseFile := baseDir.value / "legal" / "pekko-actor-jar-license.txt",
+ apacheSonatypeNoticeFile := baseDir.value / "legal" / "pekko-actor-jar-notice.txt")
+
+ /**
+ * Settings specific for Pekko remote subproject which requires a different license file.
+ */
+ lazy val remoteSettings = Seq(
+ apacheSonatypeLicenseFile := baseDir.value / "legal" / "pekko-remote-jar-license.txt",
+ apacheSonatypeNoticeFile := baseDir.value / "legal" / "pekko-remote-jar-notice.txt")
/**
* Settings specific for Pekko protobuf 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