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/19 16:17:46 UTC
[incubator-pekko-http] branch main updated: update license and notice with akka-see license/notice (#253)
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 bebc8ea63 update license and notice with akka-see license/notice (#253)
bebc8ea63 is described below
commit bebc8ea630f45c2198b521d2bbe8fb62e19a7613
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Wed Jul 19 17:17:41 2023 +0100
update license and notice with akka-see license/notice (#253)
* update license and notice with akka-see license/notice
* mention http-tests
---
LICENSE | 13 +++++++++++++
NOTICE | 7 +++++++
2 files changed, 20 insertions(+)
diff --git a/LICENSE b/LICENSE
index bebefaf52..5782dafd8 100644
--- a/LICENSE
+++ b/LICENSE
@@ -279,6 +279,19 @@ pekko-http-core contains code based on code by Tim Kienzle with his permission t
---------------
+pekko-http-core and pekko-http-tests contain code based on akka-sse <https://github.com/hseeberger/akka-sse>
+distributed under the Apache 2.0 license.
+
+ - http-tests/src/test/java/org/apache/pekko/http/javadsl/marshalling/sse/EventStreamMarshallingTest.java
+ - http-tests/src/test/java/org/apache/pekko/http/javadsl/unmarshalling/sse/EventStreamUnmarshallingTest.java
+ - http-core/src/test/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEventTest.java
+ - http-core/src/main/java/org/apache/pekko/http/javadsl/model/sse/ServerSentEvent.java
+ - http-core/src/main/java/org/apache/pekko/http/javadsl/model/headers/LastEventId.java
+
+Copyright 2015 Heiko Seeberger
+
+---------------
+
pekko-http-core contains code from sbt 0.12 which was distributed under a BSD-style license
<https://github.com/sbt/sbt/blob/0.12/LICENSE>.
diff --git a/NOTICE b/NOTICE
index e38fbfda8..423bf7e59 100644
--- a/NOTICE
+++ b/NOTICE
@@ -31,6 +31,13 @@ limitations under the License.
---------------
+pekko-http-core and pekko-http-tests contain code based on akka-sse <https://github.com/hseeberger/akka-sse>
+distributed under the Apache 2.0 license.
+
+Copyright 2015 Heiko Seeberger
+
+---------------
+
pekko-http-cors contains code that was donated by Lomig Mégard to the Apache Software Foundation
via a Software Grant Agreement <https://www.apache.org/licenses/contributor-agreements.html#grants>
See <https://github.com/lomigmegard/pekko-http-cors/issues/33>.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org