From 2fcf1749cbd39d0ee068049594424f1d905d386e Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Thu, 9 Mar 2023 15:08:25 +0100 Subject: [PATCH] acknowledge use of netty derived code --- LICENSE | 7 +++---- NOTICE | 20 ++++++++++++++++++++ legal/pekko-actor-jar-license.txt | 6 ++++++ legal/pekko-actor-jar-notice.txt | 19 +++++++++++++++++++ 4 files changed, 48 insertions(+), 4 deletions(-) diff --git a/LICENSE b/LICENSE index 695d07f992..6428be4326 100644 --- a/LICENSE +++ b/LICENSE @@ -210,10 +210,9 @@ 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-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 c8e2fdb7fa..e2a4616fac 100644 --- a/NOTICE +++ b/NOTICE @@ -34,6 +34,26 @@ 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 + ================= + +Please visit the Netty web site for more information: + + * https://netty.io/ + +Copyright 2014 The Netty Project + +The Netty Project licenses this file to you under the Apache License, +version 2.0 (the "License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at: + + https://www.apache.org/licenses/LICENSE-2.0 + --------------- pekko-remote contains CountMinSketch.java which was developed under an Apache 2.0 license. diff --git a/legal/pekko-actor-jar-license.txt b/legal/pekko-actor-jar-license.txt index cdcf9a4866..1f40e06f43 100644 --- a/legal/pekko-actor-jar-license.txt +++ b/legal/pekko-actor-jar-license.txt @@ -214,3 +214,9 @@ pekko-actor contains code from scala-collection-compat in the `org.apache.pekko. 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-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 c4f258278f..dfad7f34f8 100644 --- a/legal/pekko-actor-jar-notice.txt +++ b/legal/pekko-actor-jar-notice.txt @@ -33,3 +33,22 @@ 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 + ================= + +Please visit the Netty web site for more information: + + * https://netty.io/ + +Copyright 2014 The Netty Project + +The Netty Project licenses this file to you under the Apache License, +version 2.0 (the "License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at: + + https://www.apache.org/licenses/LICENSE-2.0