From 4a6d43a4375ab7f850e667174d5ed94688cf7646 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotrek=20Koszuli=C5=84ski?= Date: Wed, 25 Apr 2018 10:24:23 +0200 Subject: [PATCH] Other: Changed the license to GPL2+ only. See ckeditor/ckeditor5#991. BREAKING CHANGE: The license under which CKEditor 5 is released has been changed from a triple GPL, LGPL and MPL license to a GPL2+ only. See ckeditor/ckeditor5#991 for more information. --- LICENSE.md | 8 +------- README.md | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/LICENSE.md b/LICENSE.md index efb893c..a9f0a1a 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -4,13 +4,7 @@ Software License Agreement **Inline Editor** – https://github.com/ckeditor/ckeditor5-editor-inline
Copyright (c) 2003-2018, [CKSource](http://cksource.com) Frederico Knabben. All rights reserved. -Licensed under the terms of any of the following licenses at your choice: - -* [GNU General Public License Version 2 or later (the "GPL")](http://www.gnu.org/licenses/gpl.html) -* [GNU Lesser General Public License Version 2.1 or later (the "LGPL")](http://www.gnu.org/licenses/lgpl.html) -* [Mozilla Public License Version 1.1 or later (the "MPL")](http://www.mozilla.org/MPL/MPL-1.1.html) - -You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice. In any case, your choice will not restrict any recipient of your version of this software to use, reproduce, modify and distribute this software under any of the above licenses. +Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). Sources of Intellectual Property Included in CKEditor ----------------------------------------------------- diff --git a/README.md b/README.md index a2cd892..ae817be 100644 --- a/README.md +++ b/README.md @@ -22,4 +22,4 @@ See the [`@ckeditor/ckeditor5-editor-inline` package](https://docs.ckeditor.com/ ## License -Licensed under the GPL, LGPL and MPL licenses, at your choice. For full details about the license, please check the `LICENSE.md` file. +Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html). For full details about the license, please check the `LICENSE.md` file. diff --git a/package.json b/package.json index 53dc187..fbd165d 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "npm": ">=3.0.0" }, "author": "CKSource (http://cksource.com/)", - "license": "(GPL-2.0 OR LGPL-2.1 OR MPL-1.1)", + "license": "GPL-2.0-or-later", "homepage": "https://ckeditor.com", "bugs": "https://github.com/ckeditor/ckeditor5-editor-inline/issues", "repository": {