Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 0 additions & 12 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 1 addition & 13 deletions legal/pekko-actor-jar-license.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
13 changes: 0 additions & 13 deletions legal/pekko-actor-jar-notice.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down