Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update pekko notice used in jars #250

Merged
merged 1 commit into from
Mar 15, 2023
Merged

update pekko notice used in jars #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,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 written by the Scala-Lang team under an Apache 2.0 license.
which has released under an Apache 2.0 license.
Copyright (c) 2002-2023 EPFL
Copyright (c) 2011-2023 Lightbend, Inc.

Expand Down
3 changes: 1 addition & 2 deletions NOTICE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ 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.
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
Expand Down
11 changes: 11 additions & 0 deletions legal/PekkoNotice.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
Apache Pekko
Copyright 2022, 2023 The Apache Software Foundation

This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

This product contains significant parts that were originally based on software from Lightbend (Akka <https://akka.io/>).
Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>

Apache Pekko is derived from Akka 2.6.x, the last version that was distributed under the
Apache License, Version 2.0 License.
2 changes: 1 addition & 1 deletion legal/pekko-actor-jar-license.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,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 written by the Scala-Lang team under an Apache 2.0 license.
which has released under an Apache 2.0 license.
Copyright (c) 2002-2023 EPFL
Copyright (c) 2011-2023 Lightbend, Inc.

Expand Down
1 change: 1 addition & 0 deletions project/AddMetaInfLicenseFiles.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ object AddMetaInfLicenseFiles extends AutoPlugin {

override lazy val projectSettings = Seq(
apacheSonatypeLicenseFile := baseDir.value / "legal" / "StandardLicense.txt",
apacheSonatypeNoticeFile := baseDir.value / "legal" / "PekkoNotice.txt",
apacheSonatypeDisclaimerFile := Some(baseDir.value / "DISCLAIMER"))

/**
Expand Down