Skip to content

Commit

Permalink
update license and notice with akka-see license/notice
Browse files Browse the repository at this point in the history
  • Loading branch information
pjfanning committed Jul 19, 2023
1 parent d4b846e commit 0d789d3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 0 deletions.
13 changes: 13 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -279,6 +279,19 @@ pekko-http-core contains code based on code by Tim Kienzle with his permission t

---------------

pekko-http-core contains 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>.

Expand Down
7 changes: 7 additions & 0 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ limitations under the License.

---------------

pekko-http-core contains 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>.

0 comments on commit 0d789d3

Please sign in to comment.