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/03/15 12:42:43 UTC
[incubator-pekko] branch main updated: update pekko notice used in jars (#250)
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 fbada2cf16 update pekko notice used in jars (#250)
fbada2cf16 is described below
commit fbada2cf1609622487b6eb114fee04efd955e064
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Mar 15 13:42:37 2023 +0100
update pekko notice used in jars (#250)
Update AddMetaInfLicenseFiles.scala
---
LICENSE | 2 +-
NOTICE | 3 +--
legal/PekkoNotice.txt | 11 +++++++++++
legal/pekko-actor-jar-license.txt | 2 +-
project/AddMetaInfLicenseFiles.scala | 1 +
5 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/LICENSE b/LICENSE
index 72c9b67db9..8a0faeda2d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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.
diff --git a/NOTICE b/NOTICE
index e2a4616fac..e9cd5d5234 100644
--- a/NOTICE
+++ b/NOTICE
@@ -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
diff --git a/legal/PekkoNotice.txt b/legal/PekkoNotice.txt
new file mode 100644
index 0000000000..f629dd12d8
--- /dev/null
+++ b/legal/PekkoNotice.txt
@@ -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.
diff --git a/legal/pekko-actor-jar-license.txt b/legal/pekko-actor-jar-license.txt
index 1f40e06f43..7b41e82ada 100644
--- a/legal/pekko-actor-jar-license.txt
+++ b/legal/pekko-actor-jar-license.txt
@@ -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.
diff --git a/project/AddMetaInfLicenseFiles.scala b/project/AddMetaInfLicenseFiles.scala
index ef30637106..7eeba872b2 100644
--- a/project/AddMetaInfLicenseFiles.scala
+++ b/project/AddMetaInfLicenseFiles.scala
@@ -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"))
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org