Skip to content

Commit 89b91dd

Browse files
committed
cleanup licensing to be 2-clause BSD simplified + credit Cloudflare in NOTICE file
1 parent a875f7a commit 89b91dd

File tree

4 files changed

+48
-17
lines changed

4 files changed

+48
-17
lines changed

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (C) 2018-2019, Cloudflare, Inc.
1+
Copyright (C) 1995-2021, Mort Bay Consulting Pty Ltd and others.
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without

NOTICE.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
The Cloudflare Quiche library native builds used by the Jetty project.
2+
Copyright (C) 1995-2021, Mort Bay Consulting Pty Ltd and others.
3+
4+
This product includes software developed at Cloudflare, Inc.
5+
Copyright (C) 2018-2019, Cloudflare, Inc.

header-template.txt

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1-
========================================================================
2-
Copyright (c) ${copyright-range} Mort Bay Consulting Pty Ltd and others.
1+
Copyright (C) ${copyright-range}, Mort Bay Consulting Pty Ltd and others.
2+
All rights reserved.
33

4-
This program and the accompanying materials are made available under the
5-
terms of the Eclipse Public License v. 2.0 which is available at
6-
https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
7-
which is available at https://www.apache.org/licenses/LICENSE-2.0.
4+
Redistribution and use in source and binary forms, with or without
5+
modification, are permitted provided that the following conditions are met:
86

9-
SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
10-
========================================================================
7+
* Redistributions of source code must retain the above copyright
8+
notice, this list of conditions and the following disclaimer.
9+
10+
* Redistributions in binary form must reproduce the above copyright
11+
notice, this list of conditions and the following disclaimer in the
12+
documentation and/or other materials provided with the distribution.
13+
14+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
15+
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16+
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17+
DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
18+
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19+
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20+
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
21+
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23+
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/main/java/module-info.java

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,27 @@
11
//
2-
// ========================================================================
3-
// Copyright (c) 1995-2021 Mort Bay Consulting Pty Ltd and others.
2+
// Copyright (C) 1995-2021, Mort Bay Consulting Pty Ltd and others.
3+
// All rights reserved.
44
//
5-
// This program and the accompanying materials are made available under the
6-
// terms of the Eclipse Public License v. 2.0 which is available at
7-
// https://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
8-
// which is available at https://www.apache.org/licenses/LICENSE-2.0.
5+
// Redistribution and use in source and binary forms, with or without
6+
// modification, are permitted provided that the following conditions are met:
97
//
10-
// SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
11-
// ========================================================================
8+
// * Redistributions of source code must retain the above copyright
9+
// notice, this list of conditions and the following disclaimer.
10+
//
11+
// * Redistributions in binary form must reproduce the above copyright
12+
// notice, this list of conditions and the following disclaimer in the
13+
// documentation and/or other materials provided with the distribution.
14+
//
15+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
16+
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17+
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18+
// DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
19+
// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20+
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21+
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22+
// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23+
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24+
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1225
//
1326

1427
module org.mortbay.jetty.quic.libquiche

0 commit comments

Comments
 (0)