Simplify licensing.

jquery · Aug 9, 2012 · 485ca71 · 485ca71
1 parent bde4392
commit 485ca71
Show file tree

Hide file tree

Showing 55 changed files with 55 additions and 340 deletions.
diff --git a/GPL-LICENSE.txt b/GPL-LICENSE.txt
diff --git a/grunt.js b/grunt.js
@@ -114,7 +114,7 @@ function createBanner( files ) {
 		"<%= grunt.template.today('isoDate') %>\n" +
 		"<%= pkg.homepage ? '* ' + pkg.homepage + '\n' : '' %>" +
 		"* Includes: " + (files ? fileNames.join(", ") : "<%= stripDirectory(grunt.task.current.file.src[1]) %>") + "\n" +
-		"* Copyright (c) <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
+		"* Copyright <%= grunt.template.today('yyyy') %> <%= pkg.author.name %>;" +
 		" Licensed <%= _.pluck(pkg.licenses, 'type').join(', ') %> */";
 }
 
@@ -158,7 +158,6 @@ grunt.initConfig({
 		dist: {
 			src: [
 				"AUTHORS.txt",
-				"GPL-LICENSE.txt",
 				"jquery-*.js",
 				"MIT-LICENSE.txt",
 				"README.md",
@@ -204,7 +203,6 @@ grunt.initConfig({
 		cdn: {
 			src: [
 				"AUTHORS.txt",
-				"GPL-LICENSE.txt",
 				"MIT-LICENSE.txt",
 				"ui/*.js",
 				"package.json"
@@ -247,7 +245,6 @@ grunt.initConfig({
 		themes: {
 			src: [
 				"AUTHORS.txt",
-				"GPL-LICENSE.txt",
 				"MIT-LICENSE.txt",
 				"package.json"
 			],

diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
 	"homepage": "http://jqueryui.com",
 	"author": {
 		"name": "jQuery Foundation and other contributors",
-		"url": "http://jqueryui.com"
+		"url": "https://github.com/jquery/jquery-ui/blob/master/AUTHORS.txt"
 	},
 	"maintainers": [
 		{
@@ -43,11 +43,7 @@
 	"licenses": [
 		{
 			"type": "MIT",
-			"url": "http://www.opensource.org/licenses/MIT"
-		},
-		{
-			"type": "GPL",
-			"url": "http://www.opensource.org/licenses/GPL-2.0"
+			"url": "https://github.com/jquery/jquery-ui/blob/master/MIT-LICENSE.txt"
 		}
 	],
 	"dependencies": {},

diff --git a/tests/jquery.simulate.js b/tests/jquery.simulate.js
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  */
 

diff --git a/themes/base/jquery.ui.accordion.css b/themes/base/jquery.ui.accordion.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Accordion#theming

diff --git a/themes/base/jquery.ui.all.css b/themes/base/jquery.ui.all.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming

diff --git a/themes/base/jquery.ui.autocomplete.css b/themes/base/jquery.ui.autocomplete.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Autocomplete#theming

diff --git a/themes/base/jquery.ui.base.css b/themes/base/jquery.ui.base.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming

diff --git a/themes/base/jquery.ui.button.css b/themes/base/jquery.ui.button.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Button#theming

diff --git a/themes/base/jquery.ui.core.css b/themes/base/jquery.ui.core.css
@@ -3,7 +3,7 @@
  * http://jqueryui.com
  *
  * Copyright 2012 jQuery Foundation and other contributors
- * Dual licensed under the MIT or GPL Version 2 licenses.
+ * Released under the MIT license.
  * http://jquery.org/license
  *
  * http://docs.jquery.com/UI/Theming/API