From 0a3a2431bdbabb7c0362932f18631e126bec3ec6 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pjfanning@users.noreply.github.com>
Date: Wed, 21 Jun 2023 12:18:49 +0100
Subject: [PATCH] better acknowledge code derived from scala-library (#436)

---
 LICENSE                                         | 11 ++++++++---
 .../org/apache/pekko/util/ccompat/package.scala | 14 ++++++++++++++
 .../scala/org/apache/pekko/util/Helpers.scala   | 13 +++++++++++++
 legal/pekko-actor-jar-license.txt               | 17 ++++++++++++-----
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/LICENSE b/LICENSE
index 0ac68c6884..e47bad667a 100644
--- a/LICENSE
+++ b/LICENSE
@@ -212,6 +212,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-2.12/org/apache/pekko/util/ccompat/package.scala
 
 Scala (https://www.scala-lang.org)
 
@@ -220,9 +221,13 @@ Copyright EPFL and Lightbend, Inc.
 ---------------
 
 pekko-actor contains code from scala-library in the `org.apache.pekko.util.ccompat` package
-which has released under an Apache 2.0 license.
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
+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
+- actor/src/main/scala/org/apache/pekko/util/Helpers.scala
+
+Scala (https://www.scala-lang.org)
+
+Copyright EPFL and Lightbend, Inc.
 
 ---------------
 
diff --git a/actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala b/actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala
index 86b3a9241a..d44086562f 100644
--- a/actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala
+++ b/actor/src/main/scala-2.12/org/apache/pekko/util/ccompat/package.scala
@@ -11,6 +11,18 @@
  * Copyright (C) 2018-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc.
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package org.apache.pekko.util
 
 import scala.{ collection => c }
@@ -78,6 +90,8 @@ package object ccompat {
   }
 
   private[pekko] implicit final class IterableExtensions(private val fact: Iterable.type) extends AnyVal {
+    // derived from https://github.com/scala/scala/blob/0842f23f6017f93160b115b8bf29ec5347cdbe94/src/library/scala/Predef.scala#L356-L361
+    // Apache License 2.0 (see Scala license header at top of this file)
     def single[A](a: A): Iterable[A] = new Iterable[A] {
       override def iterator = Iterator.single(a)
       override def sizeHintIfCheap: Int = 1
diff --git a/actor/src/main/scala/org/apache/pekko/util/Helpers.scala b/actor/src/main/scala/org/apache/pekko/util/Helpers.scala
index e67d011f8a..2ce1d42fb0 100644
--- a/actor/src/main/scala/org/apache/pekko/util/Helpers.scala
+++ b/actor/src/main/scala/org/apache/pekko/util/Helpers.scala
@@ -11,6 +11,19 @@
  * Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
  */
 
+//The 'Requiring' class is derived from scala-library code <https://github.com/scala/scala>.
+/*
+ * Scala (https://www.scala-lang.org)
+ *
+ * Copyright EPFL and Lightbend, Inc.
+ *
+ * Licensed under Apache License 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0).
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
 package org.apache.pekko.util
 
 import java.time.{ Instant, LocalDateTime, ZoneId }
diff --git a/legal/pekko-actor-jar-license.txt b/legal/pekko-actor-jar-license.txt
index bb147b1c36..7d2419e6d3 100644
--- a/legal/pekko-actor-jar-license.txt
+++ b/legal/pekko-actor-jar-license.txt
@@ -212,15 +212,22 @@ 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.
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
+- actor/src/main/scala-2.12/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
-which has released under an Apache 2.0 license.
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
+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
+- actor/src/main/scala/org/apache/pekko/util/Helpers.scala
+
+Scala (https://www.scala-lang.org)
+
+Copyright EPFL and Lightbend, Inc.
 
 ---------------