浏览代码

Merge branch 'master' into soft-breaks

Alex Eckermann 7 年之前
父节点
当前提交
b67e5c668e

+ 11 - 0
packages/ckeditor5-enter/CHANGELOG.md

@@ -1,6 +1,17 @@
 Changelog
 =========
 
+## [10.0.0](https://github.com/ckeditor/ckeditor5-enter/compare/v1.0.0-beta.4...v10.0.0) (2018-04-25)
+
+### Other changes
+
+* Changed the license to GPL2+ only. See [ckeditor/ckeditor5#991](https://github.com/ckeditor/ckeditor5/issues/991). ([9f003b6](https://github.com/ckeditor/ckeditor5-enter/commit/9f003b6))
+
+### BREAKING CHANGES
+
+* 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](https://github.com/ckeditor/ckeditor5/issues/991) for more information.
+
+
 ## [1.0.0-beta.4](https://github.com/ckeditor/ckeditor5-enter/compare/v1.0.0-beta.2...v1.0.0-beta.4) (2018-04-19)
 
 Internal changes only (updated dependencies, documentation, etc.).

+ 1 - 7
packages/ckeditor5-enter/LICENSE.md

@@ -4,13 +4,7 @@ Software License Agreement
 **CKEditor 5 Enter Feature** – https://github.com/ckeditor/ckeditor5-enter <br>
 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
 -----------------------------------------------------

+ 1 - 1
packages/ckeditor5-enter/README.md

@@ -19,4 +19,4 @@ See the [`@ckeditor/ckeditor5-enter` package](https://docs.ckeditor.com/ckeditor
 
 ## 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.

+ 10 - 10
packages/ckeditor5-enter/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-enter",
-  "version": "1.0.0-beta.4",
+  "version": "10.0.0",
   "description": "Enter feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -9,16 +9,16 @@
     "ckeditor5-feature"
   ],
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "^1.0.0-beta.4",
-    "@ckeditor/ckeditor5-engine": "^1.0.0-beta.4",
-    "@ckeditor/ckeditor5-utils": "^1.0.0-beta.4"
+    "@ckeditor/ckeditor5-core": "^10.0.0",
+    "@ckeditor/ckeditor5-engine": "^10.0.0",
+    "@ckeditor/ckeditor5-utils": "^10.0.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^1.0.0-beta.4",
-    "@ckeditor/ckeditor5-editor-classic": "^1.0.0-beta.4",
-    "@ckeditor/ckeditor5-heading": "^1.0.0-beta.4",
-    "@ckeditor/ckeditor5-typing": "^1.0.0-beta.4",
-    "@ckeditor/ckeditor5-undo": "^1.0.0-beta.4",
+    "@ckeditor/ckeditor5-basic-styles": "^10.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^10.0.0",
+    "@ckeditor/ckeditor5-heading": "^10.0.0",
+    "@ckeditor/ckeditor5-typing": "^10.0.0",
+    "@ckeditor/ckeditor5-undo": "^10.0.0",
     "eslint": "^4.15.0",
     "eslint-config-ckeditor5": "^1.0.7",
     "husky": "^0.14.3",
@@ -29,7 +29,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-enter/issues",
   "repository": {