Skip to content

Commit 485ca71

Browse files
scottgonzalezscottgonzalez
committed
Simplify licensing.
1 parent bde4392 commit 485ca71

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+55
-340
lines changed

‎GPL-LICENSE.txt

-278
This file was deleted.

‎grunt.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ function createBanner( files ) {
114114
"<%= grunt.template.today('isoDate') %>\n" +
115115
"<%= pkg.homepage ? '* ' + pkg.homepage + '\n' : '' %>" +
116116
"* Includes: " + (files ? fileNames.join(", ") : "<%= stripDirectory(grunt.task.current.file.src[1]) %>") + "\n" +
117-
"* Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
117+
"* Copyright <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
118118
" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */";
119119
}
120120

@@ -158,7 +158,6 @@ grunt.initConfig({
158158
dist: {
159159
src: [
160160
"AUTHORS.txt",
161-
"GPL-LICENSE.txt",
162161
"jquery-*.js",
163162
"MIT-LICENSE.txt",
164163
"README.md",
@@ -204,7 +203,6 @@ grunt.initConfig({
204203
cdn: {
205204
src: [
206205
"AUTHORS.txt",
207-
"GPL-LICENSE.txt",
208206
"MIT-LICENSE.txt",
209207
"ui/*.js",
210208
"package.json"
@@ -247,7 +245,6 @@ grunt.initConfig({
247245
themes: {
248246
src: [
249247
"AUTHORS.txt",
250-
"GPL-LICENSE.txt",
251248
"MIT-LICENSE.txt",
252249
"package.json"
253250
],

‎package.json

+2-6
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"homepage": "http://jqueryui.com",
77
"author": {
88
"name": "jQuery Foundation and other contributors",
9-
"url": "http://jqueryui.com"
9+
"url": "https://github.com/jquery/jquery-ui/blob/master/AUTHORS.txt"
1010
},
1111
"maintainers": [
1212
{
@@ -43,11 +43,7 @@
4343
"licenses": [
4444
{
4545
"type": "MIT",
46-
"url": "http://www.opensource.org/licenses/MIT"
47-
},
48-
{
49-
"type": "GPL",
50-
"url": "http://www.opensource.org/licenses/GPL-2.0"
46+
"url": "https://github.com/jquery/jquery-ui/blob/master/MIT-LICENSE.txt"
5147
}
5248
],
5349
"dependencies": {},

‎tests/jquery.simulate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://jqueryui.com
44
*
55
* Copyright 2012 jQuery Foundation and other contributors
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* Released under the MIT license.
77
* http://jquery.org/license
88
*/
99

‎themes/base/jquery.ui.accordion.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://jqueryui.com
44
*
55
* Copyright 2012 jQuery Foundation and other contributors
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* Released under the MIT license.
77
* http://jquery.org/license
88
*
99
* http://docs.jquery.com/UI/Accordion#theming

‎themes/base/jquery.ui.all.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://jqueryui.com
44
*
55
* Copyright 2012 jQuery Foundation and other contributors
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* Released under the MIT license.
77
* http://jquery.org/license
88
*
99
* http://docs.jquery.com/UI/Theming

‎themes/base/jquery.ui.autocomplete.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://jqueryui.com
44
*
55
* Copyright 2012 jQuery Foundation and other contributors
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* Released under the MIT license.
77
* http://jquery.org/license
88
*
99
* http://docs.jquery.com/UI/Autocomplete#theming

‎themes/base/jquery.ui.base.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://jqueryui.com
44
*
55
* Copyright 2012 jQuery Foundation and other contributors
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* Released under the MIT license.
77
* http://jquery.org/license
88
*
99
* http://docs.jquery.com/UI/Theming

‎themes/base/jquery.ui.button.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://jqueryui.com
44
*
55
* Copyright 2012 jQuery Foundation and other contributors
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* Released under the MIT license.
77
* http://jquery.org/license
88
*
99
* http://docs.jquery.com/UI/Button#theming

‎themes/base/jquery.ui.core.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* http://jqueryui.com
44
*
55
* Copyright 2012 jQuery Foundation and other contributors
6-
* Dual licensed under the MIT or GPL Version 2 licenses.
6+
* Released under the MIT license.
77
* http://jquery.org/license
88
*
99
* http://docs.jquery.com/UI/Theming/API

0 commit comments

Comments
 (0)