From c4a8a77d23b502b11885fb331d325a563b9706da Mon Sep 17 00:00:00 2001 From: Kevin Risden Date: Thu, 23 Jan 2020 15:13:29 -0500 Subject: [PATCH] SOLR-14209: Upgrade JQuery to 3.4.1 * JQuery 2.1.3 to 3.4.1 * jstree 1.0-rc1 to v3.3.8 Closes #1209 Signed-off-by: Kevin Risden --- solr/CHANGES.txt | 2 + solr/NOTICE.txt | 2 +- .../velocity/src/resources/velocity/head.vm | 2 +- .../handler/admin/ZookeeperInfoHandler.java | 13 +- solr/example/files/conf/velocity/head.vm | 2 +- .../conf/velocity/head.vm | 2 +- solr/webapp/web/css/angular/common.css | 27 +- .../web/css/angular/jstree.style.min.css | 24 + solr/webapp/web/css/angular/logging.css | 15 +- solr/webapp/web/img/jstree/32px.png | Bin 0 -> 5667 bytes solr/webapp/web/img/jstree/40px.png | Bin 0 -> 2218 bytes solr/webapp/web/img/jstree/throbber.gif | Bin 0 -> 1464 bytes solr/webapp/web/index.html | 5 +- solr/webapp/web/js/angular/app.js | 19 +- .../web/js/angular/controllers/cloud.js | 4 +- .../web/js/angular/controllers/collections.js | 2 +- .../web/js/angular/controllers/files.js | 10 +- solr/webapp/web/libs/jquery-2.1.3.min.js | 29 - solr/webapp/web/libs/jquery-3.4.1.min.js | 28 + solr/webapp/web/libs/jquery.jstree.js | 3534 ----------------- solr/webapp/web/libs/jstree.min.js | 29 + solr/webapp/web/libs/ngtimeago.js | 7 +- solr/webapp/web/partials/logging-levels.html | 59 +- 23 files changed, 151 insertions(+), 3664 deletions(-) create mode 100644 solr/webapp/web/css/angular/jstree.style.min.css create mode 100644 solr/webapp/web/img/jstree/32px.png create mode 100644 solr/webapp/web/img/jstree/40px.png create mode 100644 solr/webapp/web/img/jstree/throbber.gif delete mode 100644 solr/webapp/web/libs/jquery-2.1.3.min.js create mode 100644 solr/webapp/web/libs/jquery-3.4.1.min.js delete mode 100644 solr/webapp/web/libs/jquery.jstree.js create mode 100644 solr/webapp/web/libs/jstree.min.js diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 7719ad3f400..d0bb502284b 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -299,6 +299,8 @@ Other Changes * SOLR-14248: Improve ClusterStateMockUtil and make its methods public. (shalin) +* SOLR-14209: Upgrade JQuery to 3.4.1 (Kevin Risden) + ================== 8.4.1 ================== Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release. diff --git a/solr/NOTICE.txt b/solr/NOTICE.txt index e40d0d70f66..c3213f845b7 100644 --- a/solr/NOTICE.txt +++ b/solr/NOTICE.txt @@ -37,7 +37,7 @@ Copyright (c) 2013-2014 Klaus Hartl, https://github.com/carhartl/jquery-cookie This product includes jquery.form Javascript library created by Mike Alsup Copyright 2006-2014 (c) M. Alsup, https://github.com/malsup/form/ -This product includes the jquery.jstree.js Javascript library created by Ivan Bozhanov +This product includes the jstree Javascript library created by Ivan Bozhanov Copyright (c) 2013-2014 Ivan Bozhanov, https://github.com/vakata/jstree This product includes jquery.timeago.js Javascript library by Ryan McGeary diff --git a/solr/contrib/velocity/src/resources/velocity/head.vm b/solr/contrib/velocity/src/resources/velocity/head.vm index 5bab0377560..dbcfb31c61f 100644 --- a/solr/contrib/velocity/src/resources/velocity/head.vm +++ b/solr/contrib/velocity/src/resources/velocity/head.vm @@ -9,7 +9,7 @@ - +