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/07/12 09:01:48 UTC

[incubator-pekko-http] branch main updated: update collection-compat license headers (#225)

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-http.git


The following commit(s) were added to refs/heads/main by this push:
     new d0732d229 update collection-compat license headers (#225)
d0732d229 is described below

commit d0732d229913e807dd9822a819736dfc73cb8875
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Jul 12 10:01:44 2023 +0100

    update collection-compat license headers (#225)
---
 LICENSE                                                    |  6 ++++--
 NOTICE                                                     |  7 +++++++
 .../org/apache/pekko/http/ccompat/CompatImpl.scala         | 14 +++++++++++++-
 .../org/apache/pekko/http/ccompat/package.scala            | 14 +++++++++++++-
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 41a88a619..f42d15ef5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -212,8 +212,10 @@ Copyright 2014 Twitter, Inc.
 
 pekko-http-core contains code from scala-collection-compat in the `org.apache.pekko.http.ccompat` package
 distributed under the Apache 2.0 license.
-Copyright (c) 2002-2023 EPFL
-Copyright (c) 2011-2023 Lightbend, Inc.
+- http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
+- http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/CompatImpl.scala
+
+Copyright EPFL and Lightbend, Inc.
 
 ---------------
 
diff --git a/NOTICE b/NOTICE
index ff4ae404f..e38fbfda8 100644
--- a/NOTICE
+++ b/NOTICE
@@ -22,6 +22,13 @@ Scala includes software developed at
 LAMP/EPFL (https://lamp.epfl.ch/) and
 Lightbend, Inc. (https://www.lightbend.com/).
 
+Licensed under the Apache License, Version 2.0 (the "License").
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
 ---------------
 
 pekko-http-cors contains code that was donated by Lomig Mégard to the Apache Software Foundation
diff --git a/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/CompatImpl.scala b/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/CompatImpl.scala
index 6a24e8db1..0e27de2c9 100644
--- a/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/CompatImpl.scala
+++ b/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/CompatImpl.scala
@@ -11,6 +11,18 @@
  * Copyright (C) 2019-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.http.ccompat
 
 import scala.collection.generic.CanBuildFrom
@@ -19,7 +31,7 @@ import scala.collection.mutable
 /**
  * INTERNAL API
  *
- * Based on https://github.com/scala/scala-collection-compat/blob/master/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
+ * Based on https://github.com/scala/scala-collection-compat/blob/main/compat/src/main/scala-2.11_2.12/scala/collection/compat/CompatImpl.scala
  * but reproduced here so we don't need to add a dependency on this library. It contains much more than we need right now, and is
  * not promising binary compatibility yet at the time of writing.
  */
diff --git a/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala b/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
index 4e889181c..478ca1f19 100644
--- a/http-core/src/main/scala-2.13-/org/apache/pekko/http/ccompat/package.scala
+++ b/http-core/src/main/scala-2.13-/org/apache/pekko/http/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.http
 
 import org.apache.pekko
@@ -21,7 +33,7 @@ import scala.{ collection => c }
 /**
  * INTERNAL API
  *
- * Partly based on https://github.com/scala/scala-collection-compat/blob/master/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
+ * Partly based on https://github.com/scala/scala-collection-compat/blob/main/compat/src/main/scala-2.11_2.12/scala/collection/compat/PackageShared.scala
  * but reproduced here so we don't need to add a dependency on this library. It contains much more than we need right now, and is
  * not promising binary compatibility yet at the time of writing.
  */


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org