You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@livy.apache.org by aj...@apache.org on 2019/10/14 17:28:43 UTC
[incubator-livy] branch master updated: [LIVY-695] Upgrade JQuery
to 3.4.1 and Bootstrap to 3.4.1
This is an automated email from the ASF dual-hosted git repository.
ajbozarth pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-livy.git
The following commit(s) were added to refs/heads/master by this push:
new 85837e3 [LIVY-695] Upgrade JQuery to 3.4.1 and Bootstrap to 3.4.1
85837e3 is described below
commit 85837e381bd9899a2680cfbb30c4f76f3a113c69
Author: Peter Toth <pe...@gmail.com>
AuthorDate: Mon Oct 14 10:28:32 2019 -0700
[LIVY-695] Upgrade JQuery to 3.4.1 and Bootstrap to 3.4.1
## What changes were proposed in this pull request?
This PR:
- updates JQuery to 3.4.1
- updates Bootstrap to 3.4.1
- switches to minified version of Bootstrap
- removes unused old bootstrap files
The changes are needed to fix CVEs.
## How was this patch tested?
Manual tests:
- Livy Server UI looks ok
- Documentation had a minor issue of logo position after plain upgrade, but fix is included in this commit
Author: Peter Toth <pe...@gmail.com>
Author: Peter Toth <pt...@cloudera.com>
Closes #245 from peter-toth/LIVY-695-upgrade-bootstrap-to-3.4.1.
---
.rat-excludes | 2 +-
.../org/apache/livy/server/ui/static/css/bootstrap.min.css | 7 +++----
.../resources/org/apache/livy/server/ui/static/js/bootstrap.min.js | 7 +++----
.../org/apache/livy/server/ui/static/js/jquery-3.2.1.min.js | 4 ----
.../org/apache/livy/server/ui/static/js/jquery-3.4.1.min.js | 2 ++
server/src/main/scala/org/apache/livy/server/ui/UIServlet.scala | 2 +-
6 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/.rat-excludes b/.rat-excludes
index d0b3a9b..ac29fe6 100644
--- a/.rat-excludes
+++ b/.rat-excludes
@@ -14,7 +14,7 @@ logs/*
**/dataTables.bootstrap.min.css
**/dataTables.bootstrap.min.js
**/jquery.dataTables.min.js
-**/jquery-3.2.1.min.js
+**/jquery-3.4.1.min.js
**/fonts/**
**/livy_python_api.egg-info/*
**/*.txt
diff --git a/server/src/main/resources/org/apache/livy/server/ui/static/css/bootstrap.min.css b/server/src/main/resources/org/apache/livy/server/ui/static/css/bootstrap.min.css
index ed3905e..74d979b 100644
--- a/server/src/main/resources/org/apache/livy/server/ui/static/css/bootstrap.min.css
+++ b/server/src/main/resources/org/apache/livy/server/ui/static/css/bootstrap.min.css
@@ -1,6 +1,5 @@
/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
+ * Bootstrap v3.4.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 Twitter, Inc.
* Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
- *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr [...]
-/*# sourceMappingURL=bootstrap.min.css.map */
\ No newline at end of file
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr [...]
diff --git a/server/src/main/resources/org/apache/livy/server/ui/static/js/bootstrap.min.js b/server/src/main/resources/org/apache/livy/server/ui/static/js/bootstrap.min.js
index 9bcd2fc..eb0a8b4 100644
--- a/server/src/main/resources/org/apache/livy/server/ui/static/js/bootstrap.min.js
+++ b/server/src/main/resources/org/apache/livy/server/ui/static/js/bootstrap.min.js
@@ -1,7 +1,6 @@
/*!
- * Bootstrap v3.3.7 (http://getbootstrap.com)
- * Copyright 2011-2016 Twitter, Inc.
+ * Bootstrap v3.4.1 (https://getbootstrap.com/)
+ * Copyright 2011-2019 Twitter, Inc.
* Licensed under the MIT license
*/
-if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");+function(a){"use strict";var b=a.fn.jquery.split(" ")[0].split(".");if(b[0]<2&&b[1]<9||1==b[0]&&9==b[1]&&b[2]<1||b[0]>3)throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(jQuery),+function(a){"use strict";function b(){var a=document.createElement("bootstrap"),b={WebkitTransition:"webkitTransitionEnd",MozTransition:"transitionend",OTransition:" [...]
-this.activeTarget=b,this.clear();var c=this.selector+'[data-target="'+b+'"],'+this.selector+'[href="'+b+'"]',d=a(c).parents("li").addClass("active");d.parent(".dropdown-menu").length&&(d=d.closest("li.dropdown").addClass("active")),d.trigger("activate.bs.scrollspy")},b.prototype.clear=function(){a(this.selector).parentsUntil(this.options.target,".active").removeClass("active")};var d=a.fn.scrollspy;a.fn.scrollspy=c,a.fn.scrollspy.Constructor=b,a.fn.scrollspy.noConflict=function(){return [...]
\ No newline at end of file
+if("undefined"==typeof jQuery)throw new Error("Bootstrap's JavaScript requires jQuery");!function(t){"use strict";var e=jQuery.fn.jquery.split(" ")[0].split(".");if(e[0]<2&&e[1]<9||1==e[0]&&9==e[1]&&e[2]<1||3<e[0])throw new Error("Bootstrap's JavaScript requires jQuery version 1.9.1 or higher, but lower than version 4")}(),function(n){"use strict";n.fn.emulateTransitionEnd=function(t){var e=!1,i=this;n(this).one("bsTransitionEnd",function(){e=!0});return setTimeout(function(){e||n(i).tri [...]
\ No newline at end of file
diff --git a/server/src/main/resources/org/apache/livy/server/ui/static/js/jquery-3.2.1.min.js b/server/src/main/resources/org/apache/livy/server/ui/static/js/jquery-3.2.1.min.js
deleted file mode 100644
index 644d35e..0000000
--- a/server/src/main/resources/org/apache/livy/server/ui/static/js/jquery-3.2.1.min.js
+++ /dev/null
@@ -1,4 +0,0 @@
-/*! jQuery v3.2.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(a,b){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){"use strict";var c=[],d=a.document,e=Object.getPrototypeOf,f=c.slice,g=c.concat,h=c.push,i=c.indexOf,j={},k=j.toString,l=j.hasOwnProperty,m=l.toString,n=m.call(Object),o={};function p(a,b){b=b||d;var c=b.createElem [...]
-a.removeEventListener("load",S),r.ready()}"complete"===d.readyState||"loading"!==d.readyState&&!d.documentElement.doScroll?a.setTimeout(r.ready):(d.addEventListener("DOMContentLoaded",S),a.addEventListener("load",S));var T=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===r.type(c)){e=!0;for(h in c)T(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,r.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(r(a),c)})),b))for(;h<i;h++)b(a[h],c,g?d: [...]
-null==d?void 0:d))},attrHooks:{type:{set:function(a,b){if(!o.radioValue&&"radio"===b&&B(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}},removeAttr:function(a,b){var c,d=0,e=b&&b.match(L);if(e&&1===a.nodeType)while(c=e[d++])a.removeAttribute(c)}}),lb={set:function(a,b,c){return b===!1?r.removeAttr(a,c):a.setAttribute(c,c),c}},r.each(r.expr.match.bool.source.match(/\w+/g),function(a,b){var c=mb[b]||r.find.attr;mb[b]=function(a,b,d){var e,f,g=b.toLowerCase();r [...]
diff --git a/server/src/main/resources/org/apache/livy/server/ui/static/js/jquery-3.4.1.min.js b/server/src/main/resources/org/apache/livy/server/ui/static/js/jquery-3.4.1.min.js
new file mode 100644
index 0000000..a1c07fd
--- /dev/null
+++ b/server/src/main/resources/org/apache/livy/server/ui/static/js/jquery-3.4.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.4.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],E=C.document,r=Object.getPrototypeOf,s=t.slice,g=t.concat,u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e& [...]
diff --git a/server/src/main/scala/org/apache/livy/server/ui/UIServlet.scala b/server/src/main/scala/org/apache/livy/server/ui/UIServlet.scala
index 7cbd135..7419afc 100644
--- a/server/src/main/scala/org/apache/livy/server/ui/UIServlet.scala
+++ b/server/src/main/scala/org/apache/livy/server/ui/UIServlet.scala
@@ -66,7 +66,7 @@ class UIServlet(val basePath: String, livyConf: LivyConf) extends ScalatraServle
href={basePath + "/static/css/dataTables.bootstrap.min.css"}
type="text/css"/>
<link rel="stylesheet" href={basePath + "/static/css/livy-ui.css"} type="text/css"/>
- <script src={basePath + "/static/js/jquery-3.2.1.min.js"}></script>
+ <script src={basePath + "/static/js/jquery-3.4.1.min.js"}></script>
<script src={basePath + "/static/js/bootstrap.min.js"}></script>
<script src={basePath + "/static/js/jquery.dataTables.min.js"}></script>
<script src={basePath + "/static/js/dataTables.bootstrap.min.js"}></script>