[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 <[email protected]> Author: Peter Toth <[email protected]> Closes apache#245 from peter-toth/LIVY-695-upgrade-bootstrap-to-3.4.1.
RogPodge · Oct 14, 2019 · 85837e3 · 85837e3
1 parent 2e7d691
commit 85837e3
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git 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
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
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
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
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
@@ -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>