Merge branch 'jquery:main' into master

CONTRIBUTING.md

@@ -12,10 +12,6 @@ There are a number of ways to get involved with the development of jQuery UI. Ev
 
 This is the best way to contribute to jQuery UI. Please read through the full guide detailing [How to Report Bugs](http://contribute.jquery.org/bug-reports/).
 
-### Weekly Meetings
-
-Every week (unless otherwise noted) the jQuery UI team has a meeting to discuss the progress of current work and to bring forward possible new blockers for discussion. The meeting is held on [IRC](http://irc.jquery.org) in the #jquery-meeting channel at [Noon EST](http://www.timeanddate.com/worldclock/fixedtime.html?month=1&day=17&year=2011&hour=12&min=0&sec=0&p1=43) on Wednesdays. Meeting notes are posted on http://meetings.jquery.org/category/ui/ after each meeting.
-
 ## Tips for Getting Started
 
 ### Environment: Minimum Required

Gruntfile.js

@@ -286,8 +286,8 @@ grunt.initConfig( {
 				"jquery-simulate/jquery.simulate.js": "jquery-simulate/jquery.simulate.js",
 				"jquery-simulate/LICENSE.txt": "jquery-simulate/LICENSE.txt",
 
-				"jquery/jquery.js": "jquery-1.x/dist/jquery.js",
-				"jquery/LICENSE.txt": "jquery-1.x/LICENSE.txt",
+				"jquery/jquery.js": "jquery-3.x/dist/jquery.js",
+				"jquery/LICENSE.txt": "jquery-3.x/LICENSE.txt",
 
 				"jquery-1.8.0/jquery.js": "jquery-1.8.0/jquery.js",
 				"jquery-1.8.0/MIT-LICENSE.txt": "jquery-1.8.0/MIT-LICENSE.txt",

README.md

@@ -7,7 +7,7 @@ jQuery UI is a curated set of user interface interactions, effects, widgets, and
 
 If you want to use jQuery UI, go to [jqueryui.com](http://jqueryui.com) to get started, [jqueryui.com/demos/](http://jqueryui.com/demos/) for demos, [api.jqueryui.com](http://api.jqueryui.com/) for API documentation, or the [Using jQuery UI Forum](http://forum.jquery.com/using-jquery-ui) for discussions and questions.
 
-If you want to report a bug/issue, please visit [bugs.jqueryui.com](http://bugs.jqueryui.com).
+If you want to report a bug/issue, please visit [the GitHub issues page](https://github.com/jquery/jquery-ui/issues). Archive of older bug reports is kept for historical reasons in read-only mode at [bugs.jqueryui.com](http://bugs.jqueryui.com). If any of them still matters to you, please open a bug about it on GitHub, linking to the legacy [bugs.jqueryui.com](http://bugs.jqueryui.com) issue for context.
 
 If you are interested in helping develop jQuery UI, you are in the right place.
 To discuss development with team members and the community, visit the [Developing jQuery UI Forum](http://forum.jquery.com/developing-jquery-ui) or [#jqueryui-dev on irc.freenode.net](http://irc.jquery.org/).

bower.json

@@ -9,7 +9,7 @@
 	],
 	"license": "MIT",
 	"dependencies": {
-		"jquery": ">=1.6"
+		"jquery": ">=1.8.0 <4.0.0"
 	},
 	"devDependencies": {
 		"jquery-color": "2.2.0",
@@ -39,7 +39,7 @@
 		"jquery-1.12.2": "jquery#1.12.2",
 		"jquery-1.12.3": "jquery#1.12.3",
 		"jquery-1.12.4": "jquery#1.12.4",
-		"jquery-1.x": "jquery#1.12.4",
+		"jquery-3.x": "jquery#3.6.0",
 		"jquery-2.0.0": "jquery#2.0.0",
 		"jquery-2.0.1": "jquery#2.0.1",
 		"jquery-2.0.2": "jquery#2.0.2",

build/release.js

@@ -104,8 +104,7 @@ function buildCDNPackage( callback ) {
 
 Release.define( {
 	npmPublish: true,
-	issueTracker: "trac",
-	contributorReportId: 22,
+	issueTracker: "github",
 	changelogShell: function() {
 		var monthNames = [ "January", "February", "March", "April", "May", "June", "July",
 				"August", "September", "October", "November", "December" ],
@@ -140,7 +139,7 @@ Release.define( {
 };
 
 module.exports.dependencies = [
-	"download.jqueryui.com@2.2.4",
+	"download.jqueryui.com@2.2.7",
 	"node-packager@0.0.6",
 	"shelljs@0.8.4"
 ];

external/jquery/LICENSE.txt

@@ -1,13 +1,4 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery
-
-The following license applies to all parts of this software except as
-documented below:
-
-====
+Copyright OpenJS Foundation and other contributors, https://openjsf.org/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -27,10 +18,3 @@ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-====
-
-All files located in the node_modules and external directories are
-externally maintained libraries used by this software which have their
-own licenses; we recommend you read them, as their terms may differ from
-the terms above.