From 72720874f00e924229a4f8f453a5185b745c0a91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Drouet?= Date: Thu, 21 Mar 2024 09:30:24 +0100 Subject: [PATCH] chore: switch license to MIT (#388) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Drouet --- LICENSE | 23 ++++++++ license.md | 53 ------------------- packages/mrml-cli/Cargo.toml | 2 +- packages/mrml-cli/LICENSE | 1 + packages/mrml-cli/license.md | 1 - packages/mrml-core/Cargo.toml | 2 +- packages/mrml-core/LICENSE | 1 + .../mrml-core/lib/common-macros/Cargo.toml | 2 +- packages/mrml-core/lib/common-macros/LICENSE | 1 + packages/mrml-core/lib/css-compare/LICENSE | 1 + packages/mrml-core/lib/html-compare/LICENSE | 1 + .../mrml-core/lib/mrml-json-macros/Cargo.toml | 2 +- .../mrml-core/lib/mrml-json-macros/LICENSE | 1 + .../mrml-core/lib/mrml-json-macros/license.md | 1 - packages/mrml-core/lib/mrml-macros/Cargo.toml | 2 +- packages/mrml-core/lib/mrml-macros/LICENSE | 1 + packages/mrml-core/lib/mrml-macros/license.md | 1 - .../lib/mrml-print-macros/Cargo.toml | 2 +- .../mrml-core/lib/mrml-print-macros/LICENSE | 1 + .../lib/mrml-print-macros/license.md | 1 - packages/mrml-core/license.md | 1 - packages/mrml-python/Cargo.toml | 2 +- packages/mrml-python/LICENSE | 1 + packages/mrml-python/license.md | 1 - packages/mrml-wasm/Cargo.toml | 2 +- packages/mrml-wasm/LICENSE | 1 + packages/mrml-wasm/license.md | 1 - 27 files changed, 41 insertions(+), 68 deletions(-) create mode 100644 LICENSE delete mode 100644 license.md create mode 120000 packages/mrml-cli/LICENSE delete mode 120000 packages/mrml-cli/license.md create mode 120000 packages/mrml-core/LICENSE create mode 120000 packages/mrml-core/lib/common-macros/LICENSE create mode 120000 packages/mrml-core/lib/css-compare/LICENSE create mode 120000 packages/mrml-core/lib/html-compare/LICENSE create mode 120000 packages/mrml-core/lib/mrml-json-macros/LICENSE delete mode 120000 packages/mrml-core/lib/mrml-json-macros/license.md create mode 120000 packages/mrml-core/lib/mrml-macros/LICENSE delete mode 120000 packages/mrml-core/lib/mrml-macros/license.md create mode 120000 packages/mrml-core/lib/mrml-print-macros/LICENSE delete mode 120000 packages/mrml-core/lib/mrml-print-macros/license.md delete mode 120000 packages/mrml-core/license.md create mode 120000 packages/mrml-python/LICENSE delete mode 120000 packages/mrml-python/license.md create mode 120000 packages/mrml-wasm/LICENSE delete mode 120000 packages/mrml-wasm/license.md diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..31aa7938 --- /dev/null +++ b/LICENSE @@ -0,0 +1,23 @@ +Permission is hereby granted, free of charge, to any +person obtaining a copy of this software and associated +documentation files (the "Software"), to deal in the +Software without restriction, including without +limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of +the Software, and to permit persons to whom the Software +is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice +shall be included in all copies or substantial portions +of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF +ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED +TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A +PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT +SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR +IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/license.md b/license.md deleted file mode 100644 index 4f5e241f..00000000 --- a/license.md +++ /dev/null @@ -1,53 +0,0 @@ -# Jolimail Source Available License (JSAL) Agreement - -This Agreement sets forth the terms on which the Licensor makes available the Software. BY INSTALLING, -DOWNLOADING, ACCESSING, USING OR DISTRIBUTING ANY OF THE SOFTWARE, YOU AGREE TO THE TERMS AND CONDITIONS -OF THIS AGREEMENT. IF YOU DO NOT AGREE TO SUCH TERMS AND CONDITIONS, YOU MUST NOT USE THE SOFTWARE. -If you are receiving the Software on behalf of a legal entity, you represent and warrant that you have -the actual authority to agree to the terms and conditions of this agreement on behalf of such entity. - -The terms below have the meanings set forth below for purposes of this Agreement: - -**Agreement​:** this Jolimail Source Available License Agreement. - -**Email Product​:** any of the following products or services: (a) email template; (b) email relay; (c) email sender; (d) email box; (e) a product or service exposing the Catapulte API; (f) a product or service exposing the Jolimail API; (g) a product or service exposing the MRML API; (h) a product or service exposing any Jolimail module API; or (i) a product or service exposing the Software API. - -**License​:** the Jolimail Source Available License described in Section 1 - -**Licensor​:** ​as indicated in the source code license. - -**Modification​:​​** a modification of the Software made by You under the License, Section 1.1(c). - -**Jolimail:** the open source Jolimail software as described in jolimail.io. - -**Software​:** certain software components designed to work with Jolimail and provided to you under this Agreement. - -**You​:** the recipient of this Software, an individual, or the entity on whose behalf you are receiving the Software. - -**Your Application​:** an application developed by or for You, where such application is not an Email Product or service. - -1) LICENSE GRANT AND CONDITIONS - -1.1) Subject to the terms and conditions of this Section 1, Licensor hereby grants to You a non-exclusive, royalty-free, worldwide, non-transferable license during the term of this Agreement to: - -a) **distribute** ​or make available the Software or your Modifications under the terms of this Agreement, only as part of Your Application, so long as you include the following notice on any copy you distribute: “This software is subject to the terms of the Jolimail Source Available License Agreement”. - -b) **use​** the Software, or your Modifications, only as part of Your Application, but not in connection with any Email Product that is distributed or otherwise made available by any third party. - -c) **modify** ​the Software, provided that Modifications remain subject to the terms of this License. - -d) **reproduce**​ the Software as necessary for the above. - -1.2) **Sublicensing​.** You may sublicense the right to use the Software fully embedded in Your Application as distributed by you in accordance with Section 1.1(a), pursuant to a written license that disclaims all warranties and liabilities on behalf of Licensor. - -1.3) **Notices​.** On all copies of the Software that you make, you must retain all copyright or other proprietary notices. - -2) **TERM AND TERMINATION​.** This Agreement will continue unless and until earlier terminated as set forth herein. If You breach any of its conditions or obligations under this Agreement, this Agreement will terminate automatically and the licenses granted herein will terminate automatically. - -3) **INTELLECTUAL PROPERTY​.** As between the parties, Licensor retains all right, title, and interest in the Software, and to Jolimail or other Licensor trademarks or service marks, and all intellectual property rights therein. Licensor hereby reserves all rights not expressly granted to You in this Agreement. - -4) **DISCLAIMER​.** TO THE EXTENT ALLOWABLE UNDER LAW, LICENSOR HEREBY DISCLAIMS ANY AND ALL WARRANTIES AND CONDITIONS, EXPRESS, IMPLIED, STATUTORY, OR OTHERWISE, AND SPECIFICALLY DISCLAIMS ANY WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, WITH RESPECT TO THE SOFTWARE. Licensor has no obligation to support the Software. - -5) **LIMITATION OF LIABILITY​.** TO THE EXTENT ALLOWABLE UNDER LAW, LICENSOR WILL NOT BE LIABLE FOR ANY DAMAGES OF ANY KIND, INCLUDING BUT NOT LIMITED TO, LOST PROFITS OR ANY CONSEQUENTIAL, SPECIAL, INCIDENTAL, INDIRECT, OR DIRECT DAMAGES, ARISING OUT OF OR RELATING TO THIS AGREEMENT. - -6) **GENERAL​.** You are not authorized to assign Your rights under this Agreement to any third party. Licensor may freely assign its rights under this Agreement to any third party. This Agreement is the entire agreement between the parties on the subject matter hereof. No amendment or modification hereof will be valid or binding upon the parties unless made in writing and signed by the duly authorized representatives of both parties. In the event that any provision, including without limitation any condition, of this Agreement is held to be unenforceable, this Agreement and all licenses and rights granted hereunder will immediately terminate. Failure by Licensor to exercise any right hereunder will not be construed as a waiver of any subsequent breach of that right or as a waiver of any other right. diff --git a/packages/mrml-cli/Cargo.toml b/packages/mrml-cli/Cargo.toml index 5684093d..b8b38bc1 100644 --- a/packages/mrml-cli/Cargo.toml +++ b/packages/mrml-cli/Cargo.toml @@ -4,7 +4,7 @@ description = "CLI for the Rust implementation of MJML renderer" keywords = ["cli", "email", "mjml"] version = "1.5.3" authors = ["Jérémie Drouet "] -license-file = "license.md" +license = "MIT" edition = "2018" readme = "readme.md" diff --git a/packages/mrml-cli/LICENSE b/packages/mrml-cli/LICENSE new file mode 120000 index 00000000..30cff740 --- /dev/null +++ b/packages/mrml-cli/LICENSE @@ -0,0 +1 @@ +../../LICENSE \ No newline at end of file diff --git a/packages/mrml-cli/license.md b/packages/mrml-cli/license.md deleted file mode 120000 index 671859c6..00000000 --- a/packages/mrml-cli/license.md +++ /dev/null @@ -1 +0,0 @@ -../../license.md \ No newline at end of file diff --git a/packages/mrml-core/Cargo.toml b/packages/mrml-core/Cargo.toml index c4010487..c0ffbc13 100644 --- a/packages/mrml-core/Cargo.toml +++ b/packages/mrml-core/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["email", "mjml"] version = "3.1.1" authors = ["Jérémie Drouet "] edition = "2018" -license-file = "license.md" +license = "MIT" repository = "https://github.com/jdrouet/mrml/" readme = "readme.md" diff --git a/packages/mrml-core/LICENSE b/packages/mrml-core/LICENSE new file mode 120000 index 00000000..30cff740 --- /dev/null +++ b/packages/mrml-core/LICENSE @@ -0,0 +1 @@ +../../LICENSE \ No newline at end of file diff --git a/packages/mrml-core/lib/common-macros/Cargo.toml b/packages/mrml-core/lib/common-macros/Cargo.toml index 00eebf43..2d666768 100644 --- a/packages/mrml-core/lib/common-macros/Cargo.toml +++ b/packages/mrml-core/lib/common-macros/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["email", "mjml"] version = "0.1.2" authors = ["Jérémie Drouet "] edition = "2021" -license-file = "license.md" +license = "MIT" repository = "https://github.com/jolimail/mrml-core/" readme = "readme.md" diff --git a/packages/mrml-core/lib/common-macros/LICENSE b/packages/mrml-core/lib/common-macros/LICENSE new file mode 120000 index 00000000..14776154 --- /dev/null +++ b/packages/mrml-core/lib/common-macros/LICENSE @@ -0,0 +1 @@ +../../../../LICENSE \ No newline at end of file diff --git a/packages/mrml-core/lib/css-compare/LICENSE b/packages/mrml-core/lib/css-compare/LICENSE new file mode 120000 index 00000000..14776154 --- /dev/null +++ b/packages/mrml-core/lib/css-compare/LICENSE @@ -0,0 +1 @@ +../../../../LICENSE \ No newline at end of file diff --git a/packages/mrml-core/lib/html-compare/LICENSE b/packages/mrml-core/lib/html-compare/LICENSE new file mode 120000 index 00000000..14776154 --- /dev/null +++ b/packages/mrml-core/lib/html-compare/LICENSE @@ -0,0 +1 @@ +../../../../LICENSE \ No newline at end of file diff --git a/packages/mrml-core/lib/mrml-json-macros/Cargo.toml b/packages/mrml-core/lib/mrml-json-macros/Cargo.toml index c5a3cecf..e6d0717b 100644 --- a/packages/mrml-core/lib/mrml-json-macros/Cargo.toml +++ b/packages/mrml-core/lib/mrml-json-macros/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["email", "mjml"] version = "0.1.2" authors = ["Jérémie Drouet "] edition = "2021" -license-file = "license.md" +license = "MIT" repository = "https://github.com/jolimail/mrml-core/" readme = "readme.md" diff --git a/packages/mrml-core/lib/mrml-json-macros/LICENSE b/packages/mrml-core/lib/mrml-json-macros/LICENSE new file mode 120000 index 00000000..14776154 --- /dev/null +++ b/packages/mrml-core/lib/mrml-json-macros/LICENSE @@ -0,0 +1 @@ +../../../../LICENSE \ No newline at end of file diff --git a/packages/mrml-core/lib/mrml-json-macros/license.md b/packages/mrml-core/lib/mrml-json-macros/license.md deleted file mode 120000 index 671859c6..00000000 --- a/packages/mrml-core/lib/mrml-json-macros/license.md +++ /dev/null @@ -1 +0,0 @@ -../../license.md \ No newline at end of file diff --git a/packages/mrml-core/lib/mrml-macros/Cargo.toml b/packages/mrml-core/lib/mrml-macros/Cargo.toml index b3776951..7a9b4a2d 100644 --- a/packages/mrml-core/lib/mrml-macros/Cargo.toml +++ b/packages/mrml-core/lib/mrml-macros/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["email", "mjml"] version = "0.1.2" authors = ["Jérémie Drouet "] edition = "2021" -license-file = "license.md" +license = "MIT" repository = "https://github.com/jolimail/mrml-core/" readme = "readme.md" diff --git a/packages/mrml-core/lib/mrml-macros/LICENSE b/packages/mrml-core/lib/mrml-macros/LICENSE new file mode 120000 index 00000000..14776154 --- /dev/null +++ b/packages/mrml-core/lib/mrml-macros/LICENSE @@ -0,0 +1 @@ +../../../../LICENSE \ No newline at end of file diff --git a/packages/mrml-core/lib/mrml-macros/license.md b/packages/mrml-core/lib/mrml-macros/license.md deleted file mode 120000 index 671859c6..00000000 --- a/packages/mrml-core/lib/mrml-macros/license.md +++ /dev/null @@ -1 +0,0 @@ -../../license.md \ No newline at end of file diff --git a/packages/mrml-core/lib/mrml-print-macros/Cargo.toml b/packages/mrml-core/lib/mrml-print-macros/Cargo.toml index 92576a4b..50644337 100644 --- a/packages/mrml-core/lib/mrml-print-macros/Cargo.toml +++ b/packages/mrml-core/lib/mrml-print-macros/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["email", "mjml"] version = "0.1.2" authors = ["Jérémie Drouet "] edition = "2021" -license-file = "license.md" +license = "MIT" repository = "https://github.com/jolimail/mrml-core/" readme = "readme.md" diff --git a/packages/mrml-core/lib/mrml-print-macros/LICENSE b/packages/mrml-core/lib/mrml-print-macros/LICENSE new file mode 120000 index 00000000..14776154 --- /dev/null +++ b/packages/mrml-core/lib/mrml-print-macros/LICENSE @@ -0,0 +1 @@ +../../../../LICENSE \ No newline at end of file diff --git a/packages/mrml-core/lib/mrml-print-macros/license.md b/packages/mrml-core/lib/mrml-print-macros/license.md deleted file mode 120000 index 671859c6..00000000 --- a/packages/mrml-core/lib/mrml-print-macros/license.md +++ /dev/null @@ -1 +0,0 @@ -../../license.md \ No newline at end of file diff --git a/packages/mrml-core/license.md b/packages/mrml-core/license.md deleted file mode 120000 index 671859c6..00000000 --- a/packages/mrml-core/license.md +++ /dev/null @@ -1 +0,0 @@ -../../license.md \ No newline at end of file diff --git a/packages/mrml-python/Cargo.toml b/packages/mrml-python/Cargo.toml index 092500f8..1522f75a 100644 --- a/packages/mrml-python/Cargo.toml +++ b/packages/mrml-python/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["email", "mjml"] version = "0.1.8" authors = ["Jérémie Drouet "] edition = "2021" -license-file = "license.md" +license = "MIT" repository = "https://github.com/jdrouet/mrml/" readme = "readme.md" diff --git a/packages/mrml-python/LICENSE b/packages/mrml-python/LICENSE new file mode 120000 index 00000000..30cff740 --- /dev/null +++ b/packages/mrml-python/LICENSE @@ -0,0 +1 @@ +../../LICENSE \ No newline at end of file diff --git a/packages/mrml-python/license.md b/packages/mrml-python/license.md deleted file mode 120000 index 671859c6..00000000 --- a/packages/mrml-python/license.md +++ /dev/null @@ -1 +0,0 @@ -../../license.md \ No newline at end of file diff --git a/packages/mrml-wasm/Cargo.toml b/packages/mrml-wasm/Cargo.toml index 3b489e9b..de0b2eab 100644 --- a/packages/mrml-wasm/Cargo.toml +++ b/packages/mrml-wasm/Cargo.toml @@ -5,7 +5,7 @@ keywords = ["email", "mjml"] version = "1.4.6" authors = ["Jérémie Drouet "] edition = "2018" -license-file = "license.md" +license = "MIT" repository = "https://github.com/jdrouet/mrml/" readme = "README.md" diff --git a/packages/mrml-wasm/LICENSE b/packages/mrml-wasm/LICENSE new file mode 120000 index 00000000..30cff740 --- /dev/null +++ b/packages/mrml-wasm/LICENSE @@ -0,0 +1 @@ +../../LICENSE \ No newline at end of file diff --git a/packages/mrml-wasm/license.md b/packages/mrml-wasm/license.md deleted file mode 120000 index 671859c6..00000000 --- a/packages/mrml-wasm/license.md +++ /dev/null @@ -1 +0,0 @@ -../../license.md \ No newline at end of file