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/06/09 15:50:19 UTC
[incubator-pekko] branch main updated: acknowledge use of scala-library code (#381)
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 687d7247b6 acknowledge use of scala-library code (#381)
687d7247b6 is described below
commit 687d7247b68b9ca1275bc0c4433d736e869183e5
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Fri Jun 9 16:50:12 2023 +0100
acknowledge use of scala-library code (#381)
---
LICENSE | 7 +++++++
NOTICE | 11 +++++++++++
legal/pekko-actor-jar-license.txt | 7 +++++++
legal/pekko-actor-jar-notice.txt | 12 ++++++++++++
4 files changed, 37 insertions(+)
diff --git a/LICENSE b/LICENSE
index 27cc0a20d9..7b97470f5b 100644
--- a/LICENSE
+++ b/LICENSE
@@ -217,6 +217,13 @@ Copyright (c) 2011-2023 Lightbend, Inc.
---------------
+pekko-actor contains code from scala-library 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
diff --git a/NOTICE b/NOTICE
index e9cd5d5234..61c1427d50 100644
--- a/NOTICE
+++ b/NOTICE
@@ -33,6 +33,17 @@ Scala includes software developed at
LAMP/EPFL (https://lamp.epfl.ch/) and
Lightbend, Inc. (https://www.lightbend.com/).
+---------------
+
+pekko-actor contains code from scala-library which was released under an Apache 2.0 license.
+
+Scala
+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/legal/pekko-actor-jar-license.txt b/legal/pekko-actor-jar-license.txt
index 7b41e82ada..10843eac18 100644
--- a/legal/pekko-actor-jar-license.txt
+++ b/legal/pekko-actor-jar-license.txt
@@ -217,6 +217,13 @@ Copyright (c) 2011-2023 Lightbend, Inc.
---------------
+pekko-actor contains code from scala-library 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
diff --git a/legal/pekko-actor-jar-notice.txt b/legal/pekko-actor-jar-notice.txt
index dfad7f34f8..a6dc32cb01 100644
--- a/legal/pekko-actor-jar-notice.txt
+++ b/legal/pekko-actor-jar-notice.txt
@@ -36,6 +36,18 @@ Lightbend, Inc. (https://www.lightbend.com/).
---------------
+pekko-actor contains code from scala-library which was released under an Apache 2.0 license.
+
+Scala
+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-actor contains code from Netty which was released under an Apache 2.0 license.
The Netty Project
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org