From f77819c4c366a471c22bb6de08a2b133c835cf43 Mon Sep 17 00:00:00 2001 From: sarthak khandelwal Date: Fri, 29 Nov 2019 20:51:13 +0530 Subject: [PATCH] docs: switch license to dual MIT and Apache 2 (#1179) --- COPYRIGHT | 5 +++++ LICENSE-APACHE | 5 +++++ LICENSE => LICENSE-MIT | 0 package.json | 2 +- 4 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 COPYRIGHT create mode 100644 LICENSE-APACHE rename LICENSE => LICENSE-MIT (100%) diff --git a/COPYRIGHT b/COPYRIGHT new file mode 100644 index 0000000000..b8b0a702d6 --- /dev/null +++ b/COPYRIGHT @@ -0,0 +1,5 @@ +This project is transitioning from an MIT-only license to a dual MIT/Apache-2.0 license. +Unless otherwise noted, all code contributed prior to 2019-11-26 and not contributed by +a user listed in [this signoff issue](https://github.com/ipfs/js-ipfs-http-client/issues/1189) is +licensed under MIT-only. All new contributions (and past contributions since 2019-11-29) +are licensed under a dual MIT/Apache-2.0 license. diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 0000000000..14478a3b60 --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,5 @@ +Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +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. diff --git a/LICENSE b/LICENSE-MIT similarity index 100% rename from LICENSE rename to LICENSE-MIT diff --git a/package.json b/package.json index 99103fa698..88c1755383 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ ], "homepage": "https://github.com/ipfs/js-ipfs-http-client", "bugs": "https://github.com/ipfs/js-ipfs-http-client/issues", - "license": "MIT", + "license": "(Apache-2.0 OR MIT)", "leadMaintainer": "Alan Shaw ", "files": [ "src",