From 48eb1c5e54a301f5aca69a0969d5a8f923036d2f Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Mon, 8 Jan 2024 21:32:26 +0600 Subject: [PATCH] Update license --- LICENSE-APACHE | 201 ++++++++++++++++++++++++++++++++++ LICENSE => LICENSE-MIT | 2 +- README.md | 11 +- ntex-async-std/Cargo.toml | 2 +- ntex-async-std/LICENSE | 1 - ntex-async-std/LICENSE-APACHE | 1 + ntex-async-std/LICENSE-MIT | 1 + ntex-bytes/Cargo.toml | 2 +- ntex-codec/Cargo.toml | 2 +- ntex-codec/LICENSE | 1 - ntex-codec/LICENSE-APACHE | 1 + ntex-codec/LICENSE-MIT | 1 + ntex-connect/Cargo.toml | 2 +- ntex-connect/LICENSE | 1 - ntex-connect/LICENSE-APACHE | 1 + ntex-connect/LICENSE-MIT | 1 + ntex-glommio/Cargo.toml | 2 +- ntex-glommio/LICENSE | 1 - ntex-glommio/LICENSE-APACHE | 1 + ntex-glommio/LICENSE-MIT | 1 + ntex-http/Cargo.toml | 2 +- ntex-http/LICENSE | 1 - ntex-http/LICENSE-APACHE | 1 + ntex-http/LICENSE-MIT | 1 + ntex-io/Cargo.toml | 2 +- ntex-io/LICENSE | 1 - ntex-io/LICENSE-APACHE | 1 + ntex-io/LICENSE-MIT | 1 + ntex-macros/Cargo.toml | 2 +- ntex-macros/LICENSE | 1 - ntex-macros/LICENSE-APACHE | 1 + ntex-macros/LICENSE-MIT | 1 + ntex-router/Cargo.toml | 2 +- ntex-router/LICENSE | 1 - ntex-router/LICENSE-APACHE | 1 + ntex-router/LICENSE-MIT | 1 + ntex-rt/Cargo.toml | 2 +- ntex-rt/LICENSE | 1 - ntex-rt/LICENSE-APACHE | 1 + ntex-rt/LICENSE-MIT | 1 + ntex-service/Cargo.toml | 2 +- ntex-service/LICENSE | 1 - ntex-service/LICENSE-APACHE | 1 + ntex-service/LICENSE-MIT | 1 + ntex-tls/Cargo.toml | 2 +- ntex-tls/LICENSE | 1 - ntex-tls/LICENSE-APACHE | 1 + ntex-tls/LICENSE-MIT | 1 + ntex-tokio/Cargo.toml | 2 +- ntex-tokio/LICENSE | 1 - ntex-tokio/LICENSE-APACHE | 1 + ntex-tokio/LICENSE-MIT | 1 + ntex-util/Cargo.toml | 2 +- ntex-util/LICENSE | 1 - ntex-util/LICENSE-APACHE | 1 + ntex-util/LICENSE-MIT | 1 + ntex/Cargo.toml | 2 +- ntex/LICENSE | 1 - ntex/LICENSE-APACHE | 1 + ntex/LICENSE-MIT | 1 + 60 files changed, 252 insertions(+), 34 deletions(-) create mode 100644 LICENSE-APACHE rename LICENSE => LICENSE-MIT (94%) delete mode 120000 ntex-async-std/LICENSE create mode 120000 ntex-async-std/LICENSE-APACHE create mode 120000 ntex-async-std/LICENSE-MIT delete mode 120000 ntex-codec/LICENSE create mode 120000 ntex-codec/LICENSE-APACHE create mode 120000 ntex-codec/LICENSE-MIT delete mode 120000 ntex-connect/LICENSE create mode 120000 ntex-connect/LICENSE-APACHE create mode 120000 ntex-connect/LICENSE-MIT delete mode 120000 ntex-glommio/LICENSE create mode 120000 ntex-glommio/LICENSE-APACHE create mode 120000 ntex-glommio/LICENSE-MIT delete mode 120000 ntex-http/LICENSE create mode 120000 ntex-http/LICENSE-APACHE create mode 120000 ntex-http/LICENSE-MIT delete mode 120000 ntex-io/LICENSE create mode 120000 ntex-io/LICENSE-APACHE create mode 120000 ntex-io/LICENSE-MIT delete mode 120000 ntex-macros/LICENSE create mode 120000 ntex-macros/LICENSE-APACHE create mode 120000 ntex-macros/LICENSE-MIT delete mode 120000 ntex-router/LICENSE create mode 120000 ntex-router/LICENSE-APACHE create mode 120000 ntex-router/LICENSE-MIT delete mode 120000 ntex-rt/LICENSE create mode 120000 ntex-rt/LICENSE-APACHE create mode 120000 ntex-rt/LICENSE-MIT delete mode 120000 ntex-service/LICENSE create mode 120000 ntex-service/LICENSE-APACHE create mode 120000 ntex-service/LICENSE-MIT delete mode 120000 ntex-tls/LICENSE create mode 120000 ntex-tls/LICENSE-APACHE create mode 120000 ntex-tls/LICENSE-MIT delete mode 120000 ntex-tokio/LICENSE create mode 120000 ntex-tokio/LICENSE-APACHE create mode 120000 ntex-tokio/LICENSE-MIT delete mode 120000 ntex-util/LICENSE create mode 120000 ntex-util/LICENSE-APACHE create mode 120000 ntex-util/LICENSE-MIT delete mode 120000 ntex/LICENSE create mode 120000 ntex/LICENSE-APACHE create mode 120000 ntex/LICENSE-MIT diff --git a/LICENSE-APACHE b/LICENSE-APACHE new file mode 100644 index 00000000..7580956f --- /dev/null +++ b/LICENSE-APACHE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2021-NOW ntex contributors + + 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 94% rename from LICENSE rename to LICENSE-MIT index 0bb47f12..b552b4f5 100644 --- a/LICENSE +++ b/LICENSE-MIT @@ -1,4 +1,4 @@ -Copyright (c) 2021 ntex contributors +Copyright (c) 2021-NOW ntex contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated diff --git a/README.md b/README.md index 425903fb..2545c767 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![build status](https://github.com/ntex-rs/ntex/workflows/CI%20%28Linux%29/badge.svg?branch=master&event=push)](https://github.com/ntex-rs/ntex/actions?query=workflow%3A"CI+(Linux)") [![crates.io](https://img.shields.io/crates/v/ntex.svg)](https://crates.io/crates/ntex) [![Documentation](https://img.shields.io/docsrs/ntex/latest)](https://docs.rs/ntex) -[![Version](https://img.shields.io/badge/rustc-1.66+-lightgray.svg)](https://blog.rust-lang.org/2022/12/15/Rust-1.66.0.html) +[![Version](https://img.shields.io/badge/rustc-1.75+-lightgray.svg)](https://blog.rust-lang.org/2023/12/28/Rust-1.75.0.html) ![License](https://img.shields.io/crates/l/ntex.svg) [![codecov](https://codecov.io/gh/ntex-rs/ntex/branch/master/graph/badge.svg)](https://codecov.io/gh/ntex-rs/ntex) [![Chat on Discord](https://img.shields.io/discord/919288597826387979?label=chat&logo=discord)](https://discord.gg/zBNyhVRz) @@ -29,17 +29,20 @@ Starting ntex v0.5 async runtime must be selected as a feature. Available option ```toml [dependencies] -ntex = { version = "0.7", features = ["tokio"] } +ntex = { version = "1.0", features = ["tokio"] } ``` ## Documentation & community resources * [Documentation](https://ntex.rs) * [Docs.rs](https://docs.rs/ntex) -* Minimum supported Rust version: 1.65 or later +* Minimum supported Rust version: 1.75 or later ## License This project is licensed under -* MIT license ([LICENSE](LICENSE) or [http://opensource.org/licenses/MIT](http://opensource.org/licenses/MIT)) +* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or + [http://www.apache.org/licenses/LICENSE-2.0]) +* MIT license ([LICENSE-MIT](LICENSE-MIT) or + [http://opensource.org/licenses/MIT]) diff --git a/ntex-async-std/Cargo.toml b/ntex-async-std/Cargo.toml index 4b841de1..e2e1dab7 100644 --- a/ntex-async-std/Cargo.toml +++ b/ntex-async-std/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-rt-async-std/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-async-std/LICENSE b/ntex-async-std/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-async-std/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-async-std/LICENSE-APACHE b/ntex-async-std/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-async-std/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-async-std/LICENSE-MIT b/ntex-async-std/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-async-std/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-bytes/Cargo.toml b/ntex-bytes/Cargo.toml index 3bdf5385..220591cc 100644 --- a/ntex-bytes/Cargo.toml +++ b/ntex-bytes/Cargo.toml @@ -1,7 +1,6 @@ [package] name = "ntex-bytes" version = "0.1.21" -license = "MIT" authors = ["Nikolay Kim ", "Carl Lerche "] description = "Types and traits for working with bytes (bytes crate fork)" documentation = "https://docs.rs/ntex-bytes" @@ -10,6 +9,7 @@ readme = "README.md" keywords = ["buffers", "zero-copy", "io"] categories = ["network-programming", "data-structures"] edition = "2021" +license = "MIT OR Apache-2.0" [features] default = [] diff --git a/ntex-codec/Cargo.toml b/ntex-codec/Cargo.toml index 6efb4282..1b0cd442 100644 --- a/ntex-codec/Cargo.toml +++ b/ntex-codec/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-codec/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-codec/LICENSE b/ntex-codec/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-codec/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-codec/LICENSE-APACHE b/ntex-codec/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-codec/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-codec/LICENSE-MIT b/ntex-codec/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-codec/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-connect/Cargo.toml b/ntex-connect/Cargo.toml index e15d5daa..dd4d4177 100644 --- a/ntex-connect/Cargo.toml +++ b/ntex-connect/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-connect/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-connect/LICENSE b/ntex-connect/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-connect/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-connect/LICENSE-APACHE b/ntex-connect/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-connect/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-connect/LICENSE-MIT b/ntex-connect/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-connect/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-glommio/Cargo.toml b/ntex-glommio/Cargo.toml index fa930154..5acb7e99 100644 --- a/ntex-glommio/Cargo.toml +++ b/ntex-glommio/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-rt-glommio/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-glommio/LICENSE b/ntex-glommio/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-glommio/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-glommio/LICENSE-APACHE b/ntex-glommio/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-glommio/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-glommio/LICENSE-MIT b/ntex-glommio/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-glommio/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-http/Cargo.toml b/ntex-http/Cargo.toml index 256b9e58..f570b02c 100644 --- a/ntex-http/Cargo.toml +++ b/ntex-http/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-http/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-http/LICENSE b/ntex-http/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-http/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-http/LICENSE-APACHE b/ntex-http/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-http/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-http/LICENSE-MIT b/ntex-http/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-http/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml index d2a825de..887a8281 100644 --- a/ntex-io/Cargo.toml +++ b/ntex-io/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-io/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-io/LICENSE b/ntex-io/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-io/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-io/LICENSE-APACHE b/ntex-io/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-io/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-io/LICENSE-MIT b/ntex-io/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-io/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-macros/Cargo.toml b/ntex-macros/Cargo.toml index a63be68f..cd7ada42 100644 --- a/ntex-macros/Cargo.toml +++ b/ntex-macros/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.3" description = "ntex proc macros" readme = "README.md" authors = ["ntex contributors "] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-macros/LICENSE b/ntex-macros/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-macros/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-macros/LICENSE-APACHE b/ntex-macros/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-macros/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-macros/LICENSE-MIT b/ntex-macros/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-macros/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-router/Cargo.toml b/ntex-router/Cargo.toml index 8d78fa3c..bd50d3e1 100644 --- a/ntex-router/Cargo.toml +++ b/ntex-router/Cargo.toml @@ -6,7 +6,7 @@ description = "Path router" keywords = ["ntex"] repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-router/" -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-router/LICENSE b/ntex-router/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-router/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-router/LICENSE-APACHE b/ntex-router/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-router/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-router/LICENSE-MIT b/ntex-router/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-router/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-rt/Cargo.toml b/ntex-rt/Cargo.toml index 6bec636e..0818a0e9 100644 --- a/ntex-rt/Cargo.toml +++ b/ntex-rt/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-rt/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-rt/LICENSE b/ntex-rt/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-rt/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-rt/LICENSE-APACHE b/ntex-rt/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-rt/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-rt/LICENSE-MIT b/ntex-rt/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-rt/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-service/Cargo.toml b/ntex-service/Cargo.toml index baf6f967..3594920c 100644 --- a/ntex-service/Cargo.toml +++ b/ntex-service/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-service/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-service/LICENSE b/ntex-service/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-service/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-service/LICENSE-APACHE b/ntex-service/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-service/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-service/LICENSE-MIT b/ntex-service/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-service/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-tls/Cargo.toml b/ntex-tls/Cargo.toml index e0273be7..74f8cac2 100644 --- a/ntex-tls/Cargo.toml +++ b/ntex-tls/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-openssl/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-tls/LICENSE b/ntex-tls/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-tls/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-tls/LICENSE-APACHE b/ntex-tls/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-tls/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-tls/LICENSE-MIT b/ntex-tls/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-tls/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-tokio/Cargo.toml b/ntex-tokio/Cargo.toml index c4f49331..62508a0f 100644 --- a/ntex-tokio/Cargo.toml +++ b/ntex-tokio/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-rt-tokio/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-tokio/LICENSE b/ntex-tokio/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-tokio/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-tokio/LICENSE-APACHE b/ntex-tokio/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-tokio/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-tokio/LICENSE-MIT b/ntex-tokio/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-tokio/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex-util/Cargo.toml b/ntex-util/Cargo.toml index bc325ed7..473b4a2d 100644 --- a/ntex-util/Cargo.toml +++ b/ntex-util/Cargo.toml @@ -8,7 +8,7 @@ homepage = "https://ntex.rs" repository = "https://github.com/ntex-rs/ntex.git" documentation = "https://docs.rs/ntex-util/" categories = ["network-programming", "asynchronous"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [lib] diff --git a/ntex-util/LICENSE b/ntex-util/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex-util/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex-util/LICENSE-APACHE b/ntex-util/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex-util/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex-util/LICENSE-MIT b/ntex-util/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex-util/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml index f6886da7..f4bd219b 100644 --- a/ntex/Cargo.toml +++ b/ntex/Cargo.toml @@ -10,7 +10,7 @@ documentation = "https://docs.rs/ntex/" categories = ["network-programming", "asynchronous", "web-programming::http-server", "web-programming::websocket"] -license = "MIT" +license = "MIT OR Apache-2.0" edition = "2021" [package.metadata.docs.rs] diff --git a/ntex/LICENSE b/ntex/LICENSE deleted file mode 120000 index ea5b6064..00000000 --- a/ntex/LICENSE +++ /dev/null @@ -1 +0,0 @@ -../LICENSE \ No newline at end of file diff --git a/ntex/LICENSE-APACHE b/ntex/LICENSE-APACHE new file mode 120000 index 00000000..965b606f --- /dev/null +++ b/ntex/LICENSE-APACHE @@ -0,0 +1 @@ +../LICENSE-APACHE \ No newline at end of file diff --git a/ntex/LICENSE-MIT b/ntex/LICENSE-MIT new file mode 120000 index 00000000..76219eb7 --- /dev/null +++ b/ntex/LICENSE-MIT @@ -0,0 +1 @@ +../LICENSE-MIT \ No newline at end of file