You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2018/08/14 23:39:43 UTC
[05/13] guacamole-client git commit: GUACAMOLE-220: Upgrade to latest
versions of jQuery and Lodash.
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.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/1cf16d1d
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/1cf16d1d
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/1cf16d1d
Branch: refs/heads/master
Commit: 1cf16d1dc6f02e608eb860d627c423dc6be958da
Parents: 615f5c6
Author: Michael Jumper <mj...@apache.org>
Authored: Sat Jul 21 19:41:47 2018 -0700
Committer: Michael Jumper <mj...@apache.org>
Committed: Wed Aug 8 09:00:06 2018 -0700
----------------------------------------------------------------------
guacamole/pom.xml | 4 +-
guacamole/src/licenses/LICENSE | 60 ++++++++++++++++----
.../bundled/jquery-2.1.3/MIT-LICENSE.txt | 21 -------
.../licenses/bundled/jquery-3.3.1/LICENSE.txt | 36 ++++++++++++
.../licenses/bundled/lodash-2.4.1/LICENSE.txt | 22 -------
.../src/licenses/bundled/lodash-4.17.10/LICENSE | 47 +++++++++++++++
guacamole/src/main/webapp/index.html | 4 +-
7 files changed, 137 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1cf16d1d/guacamole/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index dc4f082..0899e78 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1cf16d1d/guacamole/src/licenses/LICENSE
----------------------------------------------------------------------
diff --git a/guacamole/src/licenses/LICENSE b/guacamole/src/licenses/LICENSE
index 4474707..51f5b21 100644
--- 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 JS Foundation and other contributors <https://js.foundation/>
-Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js 1.5.2, copyright 2009-2013 Jeremy Ashkenas,
+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/)
--------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1cf16d1d/guacamole/src/licenses/bundled/jquery-2.1.3/MIT-LICENSE.txt
----------------------------------------------------------------------
diff --git a/guacamole/src/licenses/bundled/jquery-2.1.3/MIT-LICENSE.txt b/guacamole/src/licenses/bundled/jquery-2.1.3/MIT-LICENSE.txt
deleted file mode 100644
index cdd31b5..0000000
--- a/guacamole/src/licenses/bundled/jquery-2.1.3/MIT-LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright 2014 jQuery Foundation and other contributors
-http://jquery.com/
-
-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
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-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.
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1cf16d1d/guacamole/src/licenses/bundled/jquery-3.3.1/LICENSE.txt
----------------------------------------------------------------------
diff --git a/guacamole/src/licenses/bundled/jquery-3.3.1/LICENSE.txt b/guacamole/src/licenses/bundled/jquery-3.3.1/LICENSE.txt
new file mode 100644
index 0000000..e4e5e00
--- /dev/null
+++ b/guacamole/src/licenses/bundled/jquery-3.3.1/LICENSE.txt
@@ -0,0 +1,36 @@
+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
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+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.
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1cf16d1d/guacamole/src/licenses/bundled/lodash-2.4.1/LICENSE.txt
----------------------------------------------------------------------
diff --git a/guacamole/src/licenses/bundled/lodash-2.4.1/LICENSE.txt b/guacamole/src/licenses/bundled/lodash-2.4.1/LICENSE.txt
deleted file mode 100644
index 49869bb..0000000
--- a/guacamole/src/licenses/bundled/lodash-2.4.1/LICENSE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
-Based on Underscore.js 1.5.2, copyright 2009-2013 Jeremy Ashkenas,
-DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
-
-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
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-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.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1cf16d1d/guacamole/src/licenses/bundled/lodash-4.17.10/LICENSE
----------------------------------------------------------------------
diff --git a/guacamole/src/licenses/bundled/lodash-4.17.10/LICENSE b/guacamole/src/licenses/bundled/lodash-4.17.10/LICENSE
new file mode 100644
index 0000000..c6f2f61
--- /dev/null
+++ b/guacamole/src/licenses/bundled/lodash-4.17.10/LICENSE
@@ -0,0 +1,47 @@
+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
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+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.
http://git-wip-us.apache.org/repos/asf/guacamole-client/blob/1cf16d1d/guacamole/src/main/webapp/index.html
----------------------------------------------------------------------
diff --git a/guacamole/src/main/webapp/index.html b/guacamole/src/main/webapp/index.html
index 5a53d8a..a4a93da 100644
--- 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>