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/07 21:04:09 UTC
[incubator-pekko] branch main updated: acknowledge use of scala-collection-compat code (#236)
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 defddc6af5 acknowledge use of scala-collection-compat code (#236)
defddc6af5 is described below
commit defddc6af5ec57b6c60f0675b76ac43e48efd901
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Tue Mar 7 22:04:03 2023 +0100
acknowledge use of scala-collection-compat code (#236)
---
LICENSE | 7 +++++++
NOTICE | 13 +++++++++++++
legal/pekko-actor-jar-license.txt | 7 +++++++
legal/pekko-actor-jar-notice.txt | 13 +++++++++++++
4 files changed, 40 insertions(+)
diff --git a/LICENSE b/LICENSE
index 018050af41..695d07f992 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,6 +210,13 @@ Copyright (c) 2003-2011, LAMP/EPFL
---------------
+pekko-actor contains code from scala-collection-compat in the `org.apache.pekko.util.ccompat` package
+which has written by the Scala-Lang team under an Apache 2.0 license.
+Copyright (c) 2002-2023 EPFL
+Copyright (c) 2011-2023 Lightbend, Inc.
+
+---------------
+
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/NOTICE b/NOTICE
index f823e4125c..c8e2fdb7fa 100644
--- a/NOTICE
+++ b/NOTICE
@@ -23,6 +23,19 @@ Lightbend, Inc. (https://www.lightbend.com/).
---------------
+pekko-actor contains code from scala-collection-compat which has changes made by the Scala-Lang team
+under an Apache 2.0 license.
+
+scala-collection-compat
+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
diff --git a/legal/pekko-actor-jar-license.txt b/legal/pekko-actor-jar-license.txt
index ef6bc1a47a..cdcf9a4866 100644
--- a/legal/pekko-actor-jar-license.txt
+++ b/legal/pekko-actor-jar-license.txt
@@ -207,3 +207,10 @@ 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 written by the Scala-Lang team under an Apache 2.0 license.
+Copyright (c) 2002-2023 EPFL
+Copyright (c) 2011-2023 Lightbend, Inc.
diff --git a/legal/pekko-actor-jar-notice.txt b/legal/pekko-actor-jar-notice.txt
index b22048b834..c4f258278f 100644
--- a/legal/pekko-actor-jar-notice.txt
+++ b/legal/pekko-actor-jar-notice.txt
@@ -20,3 +20,16 @@ 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-actor contains code from scala-collection-compat which has changes made by the Scala-Lang team
+under an Apache 2.0 license.
+
+scala-collection-compat
+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/).
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org