diff --git a/LICENSE b/LICENSE index 76701cf517f..cf3768a7aad 100644 --- a/LICENSE +++ b/LICENSE @@ -210,18 +210,7 @@ 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. -- actor/src/main/scala/org/apache/pekko/util/ccompat/package.scala - -Scala (https://www.scala-lang.org) - -Copyright EPFL and Lightbend, Inc. - ---------------- - -pekko-actor contains code from scala-library in the `org.apache.pekko.util.ccompat` package -and in `org.apache.pekko.util.Helpers.scala` which was released under an Apache 2.0 license. +pekko-actor contains code from scala-library which was released under an Apache 2.0 license. - actor/src/main/scala/org/apache/pekko/util/Helpers.scala Scala (https://www.scala-lang.org) diff --git a/NOTICE b/NOTICE index 2aeba4431a5..cafc28013bf 100644 --- a/NOTICE +++ b/NOTICE @@ -23,18 +23,6 @@ Lightbend, Inc. (https://www.lightbend.com/). --------------- -pekko-actor contains code from scala-collection-compat which was released 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-actor contains code from scala-library which was released under an Apache 2.0 license. Scala diff --git a/legal/pekko-actor-jar-license.txt b/legal/pekko-actor-jar-license.txt index 28e5a16abf4..4b85ecbc52e 100644 --- a/legal/pekko-actor-jar-license.txt +++ b/legal/pekko-actor-jar-license.txt @@ -210,19 +210,7 @@ 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. -- actor/src/main/scala/org/apache/pekko/util/ccompat/package.scala - -Scala (https://www.scala-lang.org) - -Copyright EPFL and Lightbend, Inc. - ---------------- - -pekko-actor contains code from scala-library in the `org.apache.pekko.util.ccompat` package -and in `org.apache.pekko.util.Helpers.scala` which was released under an Apache 2.0 license. -- actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala +pekko-actor contains code from scala-library which was released under an Apache 2.0 license. - actor/src/main/scala/org/apache/pekko/util/Helpers.scala Scala (https://www.scala-lang.org) diff --git a/legal/pekko-actor-jar-notice.txt b/legal/pekko-actor-jar-notice.txt index 011e919d66b..410578fa36e 100644 --- a/legal/pekko-actor-jar-notice.txt +++ b/legal/pekko-actor-jar-notice.txt @@ -23,19 +23,6 @@ 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-actor contains code from scala-library which was released under an Apache 2.0 license. Scala