update pekko notice used in jars (#250)

Update AddMetaInfLicenseFiles.scala
apache · Mar 15, 2023 · fbada2c · fbada2c
1 parent 54470b2
commit fbada2c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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"))
 
   /**