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/12 11:24:28 UTC
[incubator-pekko-http] branch main updated: add scala-collection-compat to license/notice (#119)
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 2a739fdf8 add scala-collection-compat to license/notice (#119)
2a739fdf8 is described below
commit 2a739fdf801d73886c18a2cff46796a03b7083f0
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Sun Mar 12 12:24:23 2023 +0100
add scala-collection-compat to license/notice (#119)
* add scala-collection-compat to license/notice
* Update LICENSE
Co-authored-by: Johannes Rudolph <jo...@gmail.com>
* Update NOTICE
Co-authored-by: Johannes Rudolph <jo...@gmail.com>
---------
Co-authored-by: Johannes Rudolph <jo...@gmail.com>
---
LICENSE | 7 +++++++
NOTICE | 14 +++++++++++++-
NOTICE => legal/PekkoNotice.txt | 2 +-
project/AddMetaInfLicenseFiles.scala | 4 +++-
4 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/LICENSE b/LICENSE
index fb6e2db6b..7443648d1 100644
--- a/LICENSE
+++ b/LICENSE
@@ -207,3 +207,10 @@ pekko-http-core contains the sources of Twitter HPACK runtime support,
moved into the source package `org.apache.pekko.http.shaded.com.twitter.hpack`
so as to avoid version conflicts. This code is under an Apache 2.0 license.
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.
diff --git a/NOTICE b/NOTICE
index cfcf45322..0dc736ea9 100644
--- a/NOTICE
+++ b/NOTICE
@@ -8,4 +8,16 @@ This product contains significant parts that were originally based on software f
Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
Apache Pekko-HTTP is derived from Akka-HTTP 10.2.x, the last version that was distributed under the
-Apache License, Version 2.0 License.
\ No newline at end of file
+Apache License, Version 2.0 License.
+
+---------------
+
+pekko-http-core contains code from scala-collection-compat distributed under the Apache 2.0 license.
+
+scala-collection-compat
+Copyright (c) 2002-2023 EPFL
+Copyright (c) 2011-2023 Lightbend, Inc.
+
+Scala includes software developed at
+LAMP/EPFL (https://lamp.epfl.ch/) and
+Lightbend, Inc. (https://www.lightbend.com/).
diff --git a/NOTICE b/legal/PekkoNotice.txt
similarity index 92%
copy from NOTICE
copy to legal/PekkoNotice.txt
index cfcf45322..4671ee18e 100644
--- a/NOTICE
+++ b/legal/PekkoNotice.txt
@@ -8,4 +8,4 @@ This product contains significant parts that were originally based on software f
Copyright (C) 2009-2022 Lightbend Inc. <https://www.lightbend.com>
Apache Pekko-HTTP is derived from Akka-HTTP 10.2.x, the last version that was distributed under the
-Apache License, Version 2.0 License.
\ No newline at end of file
+Apache License, Version 2.0 License.
diff --git a/project/AddMetaInfLicenseFiles.scala b/project/AddMetaInfLicenseFiles.scala
index 2f337ead7..55ce73b0f 100644
--- a/project/AddMetaInfLicenseFiles.scala
+++ b/project/AddMetaInfLicenseFiles.scala
@@ -23,13 +23,15 @@ object AddMetaInfLicenseFiles extends AutoPlugin {
override lazy val projectSettings = Seq(
apacheSonatypeLicenseFile := baseDir.value / "legal" / "StandardLicense.txt",
+ apacheSonatypeNoticeFile := baseDir.value / "legal" / "PekkoNotice.txt",
apacheSonatypeDisclaimerFile := Some((LocalRootProject / baseDirectory).value / "DISCLAIMER"))
/**
* Settings specific for Pekko http-core subproject which require a different license file.
*/
lazy val httpCoreSettings = Seq(
- apacheSonatypeLicenseFile := baseDir.value / "LICENSE")
+ apacheSonatypeLicenseFile := baseDir.value / "LICENSE",
+ apacheSonatypeNoticeFile := baseDir.value / "NOTICE")
override def trigger = allRequirements
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org