GUACAMOLE-220: Upgrade to latest versions of jQuery and Lodash.

The version of Lodash previously included with Guacamole lacks the sortedIndexOf() function, which is needed by the identity set editor directive for manipulating sorted arrays of identifiers. If upgrading Lodash, may as well upgrade jQuery while we're at it. The version previously included within Guacamole is no longer maintained.
2025-09-06 05:07:41 +00:00 · 2018-07-21 19:41:47 -07:00
parent 615f5c6bab
commit 1cf16d1dc6
5 changed files with 99 additions and 19 deletions
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -308,7 +308,7 @@
        <dependency>
            <groupId>org.webjars.bower</groupId>
            <artifactId>lodash</artifactId>
-            <version>2.4.1</version>
+            <version>4.17.10</version>
            <scope>runtime</scope>
        </dependency>

@@ -316,7 +316,7 @@
        <dependency>
            <groupId>org.webjars.bower</groupId>
            <artifactId>jquery</artifactId>
-            <version>2.1.3</version>
+            <version>3.3.1</version>
            <scope>runtime</scope>
        </dependency>

--- a/guacamole/src/licenses/LICENSE
+++ b/guacamole/src/licenses/LICENSE
@@ -486,13 +486,21 @@ Jettison (https://github.com/jettison-json/jettison)
 jQuery (http://jquery.com/)
 ---------------------------

-    Version: 2.1.3
-    From: 'jQuery Foundation' (http://jquery.com/)
+    Version: 3.3.1
+    From: 'JS Foundation' (https://js.foundation/)
    License(s):
-        MIT (bundled/jquery-2.1.3/MIT-LICENSE.txt)
+        MIT (bundled/jquery-3.3.1/LICENSE.txt)

-Copyright 2014 jQuery Foundation and other contributors
-http://jquery.com/
+Copyright JS Foundation and other contributors, https://js.foundation/
+
+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:
+
+====

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -513,6 +521,13 @@ 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.
+

 JSR-250 Reference Implementation
 (https://jcp.org/aboutJava/communityprocess/final/jsr250/index.html)
@@ -536,15 +551,25 @@ JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/)
 Lodash (https://lodash.com/)
 ----------------------------

-    Version: 2.4.1
-    From: 'The Dojo Foundation' (http://dojofoundation.org/)
+    Version: 4.17.10
+    From: 'JS Foundation' (https://js.foundation/)
    License(s):
-        MIT (bundled/lodash-2.4.1/LICENSE.txt)
+        MIT (bundled/lodash-4.17.10/LICENSE)

-Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js 1.5.2, copyright 2009-2013 Jeremy Ashkenas,
+Copyright JS Foundation and other contributors <https://js.foundation/>
+
+Based on Underscore.js, copyright Jeremy Ashkenas,
 DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>

+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/lodash/lodash
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
@@ -564,6 +589,21 @@ 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.

+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+Files located in the node_modules and vendor 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.
+

 Logback (http://logback.qos.ch/)
 --------------------------------
--- a/guacamole/src/licenses/bundled/jquery-2.1.3/MIT-LICENSE.txt
+++ b/guacamole/src/licenses/bundled/jquery-2.1.3/MIT-LICENSE.txt
@@ -1,5 +1,13 @@
-Copyright 2014 jQuery Foundation and other contributors
-http://jquery.com/
+Copyright JS Foundation and other contributors, https://js.foundation/
+
+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:
+
+====

 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
@@ -19,3 +27,10 @@ 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.
--- a/guacamole/src/licenses/bundled/lodash-2.4.1/LICENSE.txt
+++ b/guacamole/src/licenses/bundled/lodash-2.4.1/LICENSE.txt
@@ -1,7 +1,17 @@
-Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js 1.5.2, copyright 2009-2013 Jeremy Ashkenas,
+Copyright JS Foundation and other contributors <https://js.foundation/>
+
+Based on Underscore.js, copyright Jeremy Ashkenas,
 DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>

+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/lodash/lodash
+
+The following license applies to all parts of this software except as
+documented below:
+
+====
+
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including
@@ -20,3 +30,18 @@ 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.
+
+====
+
+Copyright and related rights for sample code are waived via CC0. Sample
+code is defined as all source code displayed within the prose of the
+documentation.
+
+CC0: http://creativecommons.org/publicdomain/zero/1.0/
+
+====
+
+Files located in the node_modules and vendor 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.
--- a/guacamole/src/main/webapp/index.html
+++ b/guacamole/src/main/webapp/index.html
@@ -57,8 +57,8 @@
        <script type="text/javascript" src="relocateParameters.js"></script>

        <!-- Utility libraries -->
-        <script type="text/javascript" src="webjars/jquery/2.1.3/dist/jquery.min.js"></script>
-        <script type="text/javascript" src="webjars/lodash/2.4.1/dist/lodash.min.js"></script>
+        <script type="text/javascript" src="webjars/jquery/3.3.1/dist/jquery.min.js"></script>
+        <script type="text/javascript" src="webjars/lodash/4.17.10/dist/lodash.min.js"></script>

        <!-- AngularJS -->
        <script type="text/javascript" src="webjars/angular/1.6.9/angular.min.js"></script>