TINY-10578: License change from MIT to GPL 2 or later (tinymce#9410)

* TINY-10578: Replaced license.txt with license.md * TINY-10578: Updated readme.md files with GPL license change * TINY-10578: Updated package.json license to GPL * TINY-10578: Updated distribution file generation to GPL license * TINY-10578: Updated grunt-nuget-pack to latest and removed deprecated options * TINY-10578: Added changelog item about GPL change * TINY-10578: Update version.txt
lisac · Feb 28, 2024 · 1cfe7f6 · 1cfe7f6
1 parent 282f1eb
commit 1cfe7f6
Show file tree

Hide file tree

Showing 31 changed files with 82 additions and 76 deletions.
diff --git a/.changes/unreleased/tinymce-TINY-10578-2024-02-22.yaml b/.changes/unreleased/tinymce-TINY-10578-2024-02-22.yaml
@@ -0,0 +1,6 @@
+project: tinymce
+kind: Changed
+body: TinyMCE is now GPL Version 2 or later licensed.
+time: 2024-02-22T08:43:23.304334+01:00
+custom:
+  Issue: TINY-10578
diff --git a/LICENSE.TXT b/LICENSE.TXT
diff --git a/LICENSE.md b/LICENSE.md
@@ -0,0 +1,6 @@
+# Software License Agreement
+
+**TinyMCE** – <https://github.com/tinymce/tinymce>](https://github.com/tinymce/tinymce)
+Copyright (c) 2024, Ephox Corporation DBA Tiny Technologies, Inc.
+
+Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).
diff --git a/README.md b/README.md
@@ -71,3 +71,7 @@ As an open source product, we encourage and support the active development of ou
 ## Want more information?
 
 Visit the [TinyMCE website](https://tiny.cloud/) and check out the [TinyMCE documentation](https://www.tiny.cloud/docs/).
+
+## License
+
+Licensed under the terms of GNU General Public License Version 2 or later. For full details about the license, please check the LICENSE.md file.
diff --git a/modules/acid/package.json b/modules/acid/package.json
@@ -14,7 +14,7 @@
     "@ephox/sugar": "^9.3.1"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "files": [
     "lib/main",
     "lib/demo",

diff --git a/modules/agar/package.json b/modules/agar/package.json
@@ -23,7 +23,7 @@
     "test"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "dependencies": {
     "@ephox/bedrock-client": "11 || 12 || 13",
     "@ephox/bedrock-common": "11 || 12 || 13",

diff --git a/modules/alloy/package.json b/modules/alloy/package.json
@@ -37,7 +37,7 @@
     "ui"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/alloy/api/Main.js",
   "module": "./lib/main/ts/ephox/alloy/api/Main.js",
   "types": "./lib/main/ts/ephox/alloy/api/Main.d.ts"

diff --git a/modules/boss/package.json b/modules/boss/package.json
@@ -33,7 +33,7 @@
     "lint": "eslint --config ../../.eslintrc.json src/**/*.ts"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/boss/api/Main.js",
   "module": "./lib/main/ts/ephox/boss/api/Main.js",
   "types": "./lib/main/ts/ephox/boss/api/Main.d.ts"

diff --git a/modules/boulder/package.json b/modules/boulder/package.json
@@ -36,7 +36,7 @@
     "LICENSE.txt"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/boulder/api/Main.js",
   "module": "./lib/main/ts/ephox/boulder/api/Main.js",
   "types": "./lib/main/ts/ephox/boulder/api/Main.d.ts"

diff --git a/modules/bridge/package.json b/modules/bridge/package.json
@@ -18,7 +18,7 @@
     "@ephox/katamari": "^9.1.6"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "files": [
     "lib/main",
     "lib/demo",

diff --git a/modules/darwin/package.json b/modules/darwin/package.json
@@ -27,7 +27,7 @@
     "@ephox/sugar": "^9.3.1"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/darwin/api/Main.js",
   "module": "./lib/main/ts/ephox/darwin/api/Main.js",
   "types": "./lib/main/ts/ephox/darwin/api/Main.d.ts",

diff --git a/modules/dragster/package.json b/modules/dragster/package.json
@@ -31,7 +31,7 @@
     "build": "tsc"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/dragster/api/Main.js",
   "module": "./lib/main/ts/ephox/dragster/api/Main.js",
   "types": "./lib/main/ts/ephox/dragster/api/Main.d.ts"

diff --git a/modules/jax/package.json b/modules/jax/package.json
@@ -20,7 +20,7 @@
     "ajax"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "dependencies": {
     "@ephox/katamari": "^9.1.6"
   },

diff --git a/modules/katamari-assertions/package.json b/modules/katamari-assertions/package.json
@@ -15,7 +15,7 @@
     "lint": "eslint --config ../../.eslintrc.json src/**/*.ts"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "dependencies": {
     "@ephox/bedrock-client": "11 || 12 || 13",
     "@ephox/dispute": "^1.0.3",

diff --git a/modules/katamari/package.json b/modules/katamari/package.json
@@ -15,7 +15,7 @@
     "lint": "eslint --config ../../.eslintrc.json src/**/*.ts"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "dependencies": {
     "@ephox/dispute": "^1.0.3"
   },

diff --git a/modules/mcagar/package.json b/modules/mcagar/package.json
@@ -23,7 +23,7 @@
     "build": "tsc"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "dependencies": {
     "@ephox/agar": "^8.0.1",
     "@ephox/katamari": "^9.1.6",

diff --git a/modules/oxide-icons-default/package.json b/modules/oxide-icons-default/package.json
@@ -23,7 +23,7 @@
     "LICENSE.txt"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "devDependencies": {
     "gulp": "^4.0.2",
     "gulp-clean": "^0.4.0",

diff --git a/modules/oxide/package.json b/modules/oxide/package.json
@@ -18,7 +18,7 @@
     "TinyMCE"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "files": [
     "build/skins/content/**/*.css",
     "build/skins/content/**/*.css.map",

diff --git a/modules/phoenix/package.json b/modules/phoenix/package.json
@@ -34,7 +34,7 @@
     "build": "tsc"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/phoenix/api/Main.js",
   "module": "./lib/main/ts/ephox/phoenix/api/Main.js",
   "types": "./lib/main/ts/ephox/phoenix/api/Main.d.ts"

diff --git a/modules/polaris/package.json b/modules/polaris/package.json
@@ -32,7 +32,7 @@
     "lint": "eslint --config ../../.eslintrc.json src/**/*.ts"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/polaris/api/Main.js",
   "module": "./lib/main/ts/ephox/polaris/api/Main.js",
   "types": "./lib/main/ts/ephox/polaris/api/Main.d.ts"

diff --git a/modules/porkbun/package.json b/modules/porkbun/package.json
@@ -29,7 +29,7 @@
     "build": "tsc"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/porkbun/api/Main.js",
   "module": "./lib/main/ts/ephox/porkbun/api/Main.js",
   "types": "./lib/main/ts/ephox/porkbun/api/Main.d.ts"

diff --git a/modules/robin/package.json b/modules/robin/package.json
@@ -30,7 +30,7 @@
     "@ephox/katamari-assertions": "^4.0.10"
   },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/robin/api/Main.js",
   "module": "./lib/main/ts/ephox/robin/api/Main.js",
   "types": "./lib/main/ts/ephox/robin/api/Main.d.ts",

diff --git a/modules/sand/package.json b/modules/sand/package.json
@@ -29,7 +29,7 @@
     "platform"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "dependencies": {
     "@ephox/katamari": "^9.1.6"
   },

diff --git a/modules/snooker/package.json b/modules/snooker/package.json
@@ -28,11 +28,8 @@
   "devDependencies": {
     "@ephox/agar": "^8.0.1"
   },
-  "devDependencies": {
-    "@ephox/agar": "^8.0.0"
-  },
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "main": "./lib/main/ts/ephox/snooker/api/Main.js",
   "module": "./lib/main/ts/ephox/snooker/api/Main.js",
   "types": "./lib/main/ts/ephox/snooker/api/Main.d.ts",

diff --git a/modules/sugar/package.json b/modules/sugar/package.json
@@ -21,7 +21,7 @@
     "predicate"
   ],
   "author": "Ephox Corporation DBA Tiny Technologies, Inc",
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "dependencies": {
     "@ephox/katamari": "^9.1.6",
     "@ephox/sand": "^6.0.10"

diff --git a/modules/tinymce/Gruntfile.js b/modules/tinymce/Gruntfile.js
@@ -369,8 +369,8 @@ module.exports = function (grunt) {
             dest: 'js/tinymce/langs/README.md'
           },
           {
-            src: '../../LICENSE.TXT',
-            dest: 'js/tinymce/license.txt'
+            src: '../../LICENSE.md',
+            dest: 'js/tinymce/license.md'
           },
           {
             src: '../../README.md',
@@ -461,9 +461,9 @@ module.exports = function (grunt) {
           'js/tinymce/models',
           'js/tinymce/tinymce.d.ts',
           'js/tinymce/tinymce.min.js',
-          'js/tinymce/license.txt',
+          'js/tinymce/license.md',
           'CHANGELOG.md',
-          'LICENSE.TXT',
+          'LICENSE.md',
           'README.md'
         ]
       },
@@ -504,7 +504,7 @@ module.exports = function (grunt) {
               'bin',
               'patches',
               '.yarnrc',
-              'LICENSE.TXT',
+              'LICENSE.md',
               'README.md',
               'lerna.json',
               'package.json',
@@ -588,7 +588,7 @@ module.exports = function (grunt) {
           'js/tinymce/icons',
           'js/tinymce/themes',
           'js/tinymce/models',
-          'js/tinymce/license.txt'
+          'js/tinymce/license.md'
         ]
       },
 
@@ -628,7 +628,7 @@ module.exports = function (grunt) {
             zip.addData('bower.json', jsonToBuffer({
               'name': 'tinymce',
               'description': 'Web based JavaScript HTML WYSIWYG editor control.',
-              'license': 'MIT',
+              'license': 'GPL-2.0-or-later',
               'keywords': keywords,
               'homepage': 'https://www.tiny.cloud/',
               'ignore': ['README.md', 'composer.json', 'package.json', '.npmignore', 'CHANGELOG.md']
@@ -646,7 +646,7 @@ module.exports = function (grunt) {
               'author': 'Ephox Corporation DBA Tiny Technologies, Inc',
               'main': 'tinymce.js',
               'types': 'tinymce.d.ts',
-              'license': 'MIT',
+              'license': 'GPL-2.0-or-later',
               'keywords': keywords,
               'homepage': 'https://www.tiny.cloud/',
               'bugs': { 'url': 'https://github.com/tinymce/tinymce/issues' }
@@ -656,7 +656,7 @@ module.exports = function (grunt) {
               'name': 'tinymce/tinymce',
               'version': packageData.version,
               'description': 'Web based JavaScript HTML WYSIWYG editor control.',
-              'license': ['MIT-only'],
+              'license': ['GPL-2.0-or-later'],
               'keywords': keywords,
               'homepage': 'https://www.tiny.cloud/',
               'type': 'component',
@@ -723,7 +723,7 @@ module.exports = function (grunt) {
           'js/tinymce/tinymce.js',
           'js/tinymce/tinymce.d.ts',
           'js/tinymce/tinymce.min.js',
-          'js/tinymce/license.txt',
+          'js/tinymce/license.md',
           'CHANGELOG.md',
           'js/tinymce/README.md'
         ]
@@ -738,15 +738,15 @@ module.exports = function (grunt) {
           authors: 'Ephox Corporation DBA Tiny Technologies, Inc',
           owners: 'Ephox Corporation DBA Tiny Technologies, Inc',
           description: 'The best WYSIWYG editor! TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor ' +
-          'control released as Open Source under MIT by Tiny Technologies, Inc. TinyMCE has the ability to convert HTML ' +
+          'control released as Open Source under GNU General Public License Version 2 or later by Tiny Technologies, Inc. TinyMCE has the ability to convert HTML ' +
           'TEXTAREA fields or other HTML elements to editor instances. TinyMCE is very easy to integrate ' +
           'into other Content Management Systems.',
           releaseNotes: 'Release notes for my package.',
           summary: 'TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor ' +
-          'control released as Open Source under MIT by Tiny Technologies, Inc.',
+          'control released as Open Source under GNU General Public License Version 2 or later by Tiny Technologies, Inc.',
           projectUrl: 'https://www.tiny.cloud/',
-          iconUrl: 'https://www.tiny.cloud/favicon-32x32.png',
-          licenseUrl: 'https://www.tiny.cloud/license',
+          license: 'GPL-2.0-or-later',
+          licenseUrl: 'https://licenses.nuget.org/GPL-2.0-or-later',
           requireLicenseAcceptance: true,
           tags: 'Editor TinyMCE HTML HTMLEditor',
           excludes: [
@@ -774,7 +774,7 @@ module.exports = function (grunt) {
           { src: 'js/tinymce/tinymce.js', dest: '/content/scripts/tinymce/tinymce.js' },
           { src: 'js/tinymce/tinymce.d.ts', dest: '/content/scripts/tinymce/tinymce.d.ts' },
           { src: 'js/tinymce/tinymce.min.js', dest: '/content/scripts/tinymce/tinymce.min.js' },
-          { src: 'js/tinymce/license.txt', dest: '/content/scripts/tinymce/license.txt' },
+          { src: 'js/tinymce/license.md', dest: '/content/scripts/tinymce/license.md' },
           { src: 'tools/nuget/build/TinyMCE.targets', dest: '/build/TinyMCE.targets' }
         ]
       },

diff --git a/modules/tinymce/README.md b/modules/tinymce/README.md
@@ -60,12 +60,12 @@ TinyMCE is an open source software project and we encourage developers to contri
 
 __Basic Rules__
 
-* Contributed code will be licensed under the MIT license
+* Contributed code will be licensed under the GNU General Public License Version 2 or later
 * Copyright notices will be changed to Ephox Corporation, contributors will get credit for their work
 * All third party code will be reviewed, tested and possibly modified before being released
 * All contributors will have to have signed the Contributor License Agreement
 
-These basic rules ensures that the contributed code remains open source and under the MIT license.
+These basic rules ensures that the contributed code remains open source and under the GNU General Public License Version 2 or later license.
 
 __How to Contribute to the Code__
 

diff --git a/modules/tinymce/package.json b/modules/tinymce/package.json
@@ -11,7 +11,7 @@
   "bugs": {
     "url": "https://github.com/tinymce/tinymce/issues"
   },
-  "license": "MIT",
+  "license": "GPL-2.0-or-later",
   "engines": {
     "node": ">=0.10.26"
   },

diff --git a/package.json b/package.json
@@ -60,7 +60,7 @@
     "grunt-contrib-symlink": "^1.0.0",
     "grunt-contrib-watch": "^1.1.0",
     "grunt-eslint": "^24.0.0",
-    "grunt-nuget-pack": "^0.0.6",
+    "grunt-nuget-pack": "^1.0.1",
     "grunt-shell": "^4.0.0",
     "grunt-terser": "^2.0.0",
     "grunt-webpack": "^5.0.0",