Merge changes from patch branch back to main.

apache · Aug 28, 2024 · 468c050 · 468c050
2 parents d3b784d + 2a0e06f
commit 468c050
Show file tree

Hide file tree

Showing 57 changed files with 1,362 additions and 12,689 deletions.
diff --git a/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt b/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt
diff --git a/doc/licenses/apache-commons-1.17.0/NOTICE → doc/licenses/apache-commons-1.17.1/NOTICE b/doc/licenses/apache-commons-1.17.0/NOTICE → doc/licenses/apache-commons-1.17.1/NOTICE
diff --git a/doc/licenses/apache-commons-1.17.0/README → doc/licenses/apache-commons-1.17.1/README b/doc/licenses/apache-commons-1.17.0/README → doc/licenses/apache-commons-1.17.1/README
@@ -1,8 +1,7 @@
 Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
 -----------------------------------------------------------------------
 
-    Version: 1.17.0
+    Version: 1.17.1
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
-
diff --git a/doc/licenses/apache-commons-1.17.1/dep-coordinates.txt b/doc/licenses/apache-commons-1.17.1/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-codec:commons-codec:jar:1.17.1
diff --git a/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt b/doc/licenses/apache-commons-lang-3.14.0/dep-coordinates.txt
diff --git a/...icenses/apache-commons-lang-3.14.0/NOTICE → ...icenses/apache-commons-lang-3.16.0/NOTICE b/...icenses/apache-commons-lang-3.14.0/NOTICE → ...icenses/apache-commons-lang-3.16.0/NOTICE
diff --git a/...icenses/apache-commons-lang-3.14.0/README → ...icenses/apache-commons-lang-3.16.0/README b/...icenses/apache-commons-lang-3.14.0/README → ...icenses/apache-commons-lang-3.16.0/README
@@ -1,8 +1,7 @@
 Apache Commons Lang (http://commons.apache.org/proper/commons-lang/)
 --------------------------------------------------------------------
 
-    Version: 3.14.0
+    Version: 3.16.0
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
-
diff --git a/doc/licenses/apache-commons-lang-3.16.0/dep-coordinates.txt b/doc/licenses/apache-commons-lang-3.16.0/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.commons:commons-lang3:jar:3.16.0
diff --git a/doc/licenses/apache-commons-text-1.11.0/dep-coordinates.txt b/doc/licenses/apache-commons-text-1.11.0/dep-coordinates.txt
diff --git a/...ses/apache-commons-text-1.11.0/NOTICE.txt → ...ses/apache-commons-text-1.12.0/NOTICE.txt b/...ses/apache-commons-text-1.11.0/NOTICE.txt → ...ses/apache-commons-text-1.12.0/NOTICE.txt
diff --git a/...icenses/apache-commons-text-1.11.0/README → ...icenses/apache-commons-text-1.12.0/README b/...icenses/apache-commons-text-1.11.0/README → ...icenses/apache-commons-text-1.12.0/README
@@ -1,8 +1,7 @@
 Apache Commons Text (https://commons.apache.org/proper/commons-text/)
 ---------------------------------------------------------------------
 
-    Version: 1.11.0
+    Version: 1.12.0
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
-
diff --git a/doc/licenses/apache-commons-text-1.12.0/dep-coordinates.txt b/doc/licenses/apache-commons-text-1.12.0/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.commons:commons-text:jar:1.12.0
diff --git a/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt b/doc/licenses/apache-santuario-2.2.6/dep-coordinates.txt
diff --git a/doc/licenses/apache-santuario-2.2.6/NOTICE → doc/licenses/apache-santuario-4.0.2/NOTICE b/doc/licenses/apache-santuario-2.2.6/NOTICE → doc/licenses/apache-santuario-4.0.2/NOTICE
diff --git a/doc/licenses/apache-santuario-2.2.6/README → doc/licenses/apache-santuario-4.0.2/README b/doc/licenses/apache-santuario-2.2.6/README → doc/licenses/apache-santuario-4.0.2/README
@@ -1,8 +1,7 @@
 Apache Santuario (https://santuario.apache.org/)
 -------------------------------------------------
 
-    Version: 2.2.6
+    Version: 4.0.2
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
-
diff --git a/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt b/doc/licenses/apache-santuario-4.0.2/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.santuario:xmlsec:jar:4.0.2
diff --git a/doc/licenses/blob-polyfill-7.0.20220408/dep-coordinates.txt b/doc/licenses/blob-polyfill-7.0.20220408/dep-coordinates.txt
diff --git a/...ses/blob-polyfill-7.0.20220408/LICENSE.md → ...ses/blob-polyfill-9.0.20240710/LICENSE.md b/...ses/blob-polyfill-7.0.20220408/LICENSE.md → ...ses/blob-polyfill-9.0.20240710/LICENSE.md
diff --git a/...icenses/blob-polyfill-7.0.20220408/README → ...icenses/blob-polyfill-9.0.20240710/README b/...icenses/blob-polyfill-7.0.20220408/README → ...icenses/blob-polyfill-9.0.20240710/README
@@ -1,8 +1,7 @@
 Blob.js (https://github.com/eligrey/Blob.js/)
 ---------------------------------------------
 
-    Version: 7.0.20220408
+    Version: 9.0.20240710
     From: 'Eli Grey' (https://github.com/eligrey)
     License(s):
-        MIT (bundled/blob-polyfill-7.0.20220408/LICENSE.md)
-
+        MIT (bundled/blob-polyfill-9.0.20240710/LICENSE.md)
diff --git a/doc/licenses/blob-polyfill-9.0.20240710/dep-coordinates.txt b/doc/licenses/blob-polyfill-9.0.20240710/dep-coordinates.txt
@@ -0,0 +1 @@
+blob-polyfill:9.0.20240710
diff --git a/doc/licenses/bouncycastle-1.70/README b/doc/licenses/bouncycastle-1.70/README
@@ -5,4 +5,3 @@ BouncyCastle Crypto (https://www.bouncycastle.org/java.html)
     From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
     License(s):
         MIT (bundled/bouncycastle-1.70/LICENSE)
-
diff --git a/...icenses/bouncycastle-fips-1.0.2.5/LICENSE → doc/licenses/bouncycastle-2.0.0/LICENSE b/...icenses/bouncycastle-fips-1.0.2.5/LICENSE → doc/licenses/bouncycastle-2.0.0/LICENSE
diff --git a/...licenses/bouncycastle-fips-1.0.2.5/README → doc/licenses/bouncycastle-2.0.0/README b/...licenses/bouncycastle-fips-1.0.2.5/README → doc/licenses/bouncycastle-2.0.0/README
@@ -1,8 +1,7 @@
 BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java)
 -----------------------------------------------------------------------
 
-    Version: 1.0.2.5
+    Version: 2.0.0
     From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
     License(s):
-        MIT (bundled/bouncycastle-fips-1.0.2.5/LICENSE)
-
+        MIT (bundled/bouncycastle-fips-2.0.0/LICENSE)
diff --git a/doc/licenses/bouncycastle-2.0.0/dep-coordinates.txt b/doc/licenses/bouncycastle-2.0.0/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bc-fips:jar:2.0.0
diff --git a/doc/licenses/bouncycastle-2.0.3/LICENSE b/doc/licenses/bouncycastle-2.0.3/LICENSE
@@ -0,0 +1,20 @@
+Copyright (c) 2000 - 2023 The Legion of the Bouncy Castle Inc.
+(https://www.bouncycastle.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. 
diff --git a/doc/licenses/bouncycastle-2.0.3/README b/doc/licenses/bouncycastle-2.0.3/README
@@ -0,0 +1,7 @@
+Bouncy Castle ASN.1 Extension and Utility APIs (https://www.bouncycastle.org/fips-java)
+-----------------------------------------------------------------------
+
+    Version: 2.0.3
+    From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
+    License(s):
+        MIT (bundled/bouncycastle-fips-2.0.3/LICENSE)
diff --git a/doc/licenses/bouncycastle-2.0.3/dep-coordinates.txt b/doc/licenses/bouncycastle-2.0.3/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bcutil-fips:jar:2.0.3
diff --git a/doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt
diff --git a/doc/licenses/bouncycastle-pkix-fips-1.0.7/dep-coordinates.txt b/doc/licenses/bouncycastle-pkix-fips-1.0.7/dep-coordinates.txt
diff --git a/...nses/bouncycastle-pkix-fips-1.0.7/LICENSE → ...nses/bouncycastle-pkix-fips-2.0.7/LICENSE b/...nses/bouncycastle-pkix-fips-1.0.7/LICENSE → ...nses/bouncycastle-pkix-fips-2.0.7/LICENSE
diff --git a/...enses/bouncycastle-pkix-fips-1.0.7/README → ...enses/bouncycastle-pkix-fips-2.0.7/README b/...enses/bouncycastle-pkix-fips-1.0.7/README → ...enses/bouncycastle-pkix-fips-2.0.7/README
@@ -1,8 +1,7 @@
 BouncyCastle PKIX APIs, FIPS Distribution (https://www.bouncycastle.org/fips-java)
 -----------------------------------------------------------------------
 
-    Version: 1.0.7
+    Version: 2.0.7
     From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
     License(s):
-        MIT (bundled/bouncycastle-pkix-fips-1.0.7/LICENSE)
-
+        MIT (bundled/bouncycastle-pkix-fips-2.0.7/LICENSE)
diff --git a/doc/licenses/bouncycastle-pkix-fips-2.0.7/dep-coordinates.txt b/doc/licenses/bouncycastle-pkix-fips-2.0.7/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bcpkix-fips:jar:2.0.7
diff --git a/doc/licenses/caffeine-2.9.3/README b/doc/licenses/caffeine-2.9.3/README
@@ -5,4 +5,3 @@ Caffeine (https://github.com/ben-manes/caffeine)
     From: 'Ben Manes' (https://github.com/ben-manes)
     License(s):
         Apache v2.0
-
diff --git a/doc/licenses/directory-api-2.1.6/dep-coordinates.txt b/doc/licenses/directory-api-2.1.6/dep-coordinates.txt
diff --git a/doc/licenses/directory-api-2.1.6/NOTICE → doc/licenses/directory-api-2.1.7/NOTICE b/doc/licenses/directory-api-2.1.6/NOTICE → doc/licenses/directory-api-2.1.7/NOTICE
diff --git a/doc/licenses/directory-api-2.1.6/README → doc/licenses/directory-api-2.1.7/README b/doc/licenses/directory-api-2.1.6/README → doc/licenses/directory-api-2.1.7/README
@@ -5,4 +5,3 @@ Apache Directory LDAP API (http://directory.apache.org)
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0
-
diff --git a/doc/licenses/directory-api-2.1.7/dep-coordinates.txt b/doc/licenses/directory-api-2.1.7/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.directory.api:api-all:jar:2.1.7
diff --git a/doc/licenses/fuzzysort-2.0.4/dep-coordinates.txt b/doc/licenses/fuzzysort-2.0.4/dep-coordinates.txt
diff --git a/doc/licenses/fuzzysort-2.0.4/LICENSE → doc/licenses/fuzzysort-3.0.2/LICENSE b/doc/licenses/fuzzysort-2.0.4/LICENSE → doc/licenses/fuzzysort-3.0.2/LICENSE
diff --git a/doc/licenses/fuzzysort-2.0.4/README → doc/licenses/fuzzysort-3.0.2/README b/doc/licenses/fuzzysort-2.0.4/README → doc/licenses/fuzzysort-3.0.2/README
@@ -1,8 +1,7 @@
 fuzzysort (https://github.com/farzher/fuzzysort/tree/master)
 ---------------------------------------------
 
-    Version: 2.0.4
+    Version: 3.0.2
     From: 'Stephen Kamenar' (https://github.com/farzher)
     License(s):
-        MIT (bundled/fuzzysort-2.0.4/LICENSE)
-
+        MIT (bundled/fuzzysort-3.0.2/LICENSE)
diff --git a/doc/licenses/fuzzysort-3.0.2/dep-coordinates.txt b/doc/licenses/fuzzysort-3.0.2/dep-coordinates.txt
@@ -0,0 +1 @@
+fuzzysort:3.0.2
diff --git a/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt b/doc/licenses/woodstox-core-5.4.0/dep-coordinates.txt
diff --git a/doc/licenses/woodstox-core-5.4.0/README → doc/licenses/woodstox-core-6.6.0/README b/doc/licenses/woodstox-core-5.4.0/README → doc/licenses/woodstox-core-6.6.0/README
@@ -1,8 +1,7 @@
 Woodstox Core (https://github.com/FasterXML/woodstox)
 ------------------------------------------------------
 
-    Version: 5.4.0
+    Version: 6.6.0
     From: 'FasterXML, LLC' (http://fasterxml.com/)
     License(s):
         Apache v2.0
-
diff --git a/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt b/doc/licenses/woodstox-core-6.6.0/dep-coordinates.txt
@@ -0,0 +1 @@
+com.fasterxml.woodstox:woodstox-core:jar:6.6.0
diff --git a/doc/licenses/woodstox-stax2-api-4.2/LICENSE → ...licenses/woodstox-stax2-api-4.2.2/LICENSE b/doc/licenses/woodstox-stax2-api-4.2/LICENSE → ...licenses/woodstox-stax2-api-4.2.2/LICENSE
diff --git a/doc/licenses/woodstox-stax2-api-4.2/README → doc/licenses/woodstox-stax2-api-4.2.2/README b/doc/licenses/woodstox-stax2-api-4.2/README → doc/licenses/woodstox-stax2-api-4.2.2/README
@@ -4,5 +4,4 @@ Woodstox Stax2-API (https://github.com/FasterXML/stax2-api)
     Version: 4.2
     From: 'FasterXML, LLC' (http://fasterxml.com/)
     License(s):
-        BSD Simplified (bundled/woodstox-stax2-api-4.2/LICENSE)
-
+        BSD Simplified (bundled/woodstox-stax2-api-4.2.2/LICENSE)
diff --git a/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2.2/dep-coordinates.txt
@@ -0,0 +1 @@
+org.codehaus.woodstox:stax2-api:jar:4.2.2
diff --git a/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt b/doc/licenses/woodstox-stax2-api-4.2/dep-coordinates.txt
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
@@ -51,12 +51,12 @@
         <dependency>
             <groupId>org.apache.directory.api</groupId>
             <artifactId>api-all</artifactId>
-            <version>2.1.6</version>
+            <version>2.1.7</version>
             <exclusions>
 
                 <!--
-                    Replace slightly older commons-lang3 (3.13.0) with latest
-                    compatible version (3.14.0) so that we don't need two copies
+                    Replace slightly older commons-lang3 (3.15.0) with latest
+                    compatible version (3.16.0) so that we don't need two copies
                     of the same license information.
                 -->
                 <exclusion>
@@ -87,7 +87,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.14.0</version>
+            <version>3.16.0</version>
         </dependency>
 
     </dependencies>

diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
@@ -133,7 +133,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.17.0</version>
+            <version>1.17.1</version>
         </dependency>
 
     </dependencies>

diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
@@ -96,7 +96,7 @@
 
                 <!--
                     Replace slightly older commons-lang3 (3.12.0) with latest
-                    compatible version (3.14.0) so that we don't need two copies
+                    compatible version (3.16.0) so that we don't need two copies
                     of the same license information.
                 -->
                 <exclusion>
@@ -122,20 +122,20 @@
         <dependency>
             <groupId>com.fasterxml.woodstox</groupId>
             <artifactId>woodstox-core</artifactId>
-            <version>5.4.0</version>
+            <version>6.6.0</version>
         </dependency>
 
         <!-- Apache XML Security for Java (see exclusions for java-saml) -->
         <dependency>
             <groupId>org.apache.santuario</groupId>
             <artifactId>xmlsec</artifactId>
-            <version>2.2.6</version>
+            <version>4.0.2</version>
             <exclusions>
 
                 <!--
                     Replace slightly older commons-codec (1.15) with newer
                     and identical version to that used by Apache Directory API
-                    for LDAP (1.17.0) so that we don't need two copies of the
+                    for LDAP (1.17.1) so that we don't need two copies of the
                     same license information.
                 -->
                 <exclusion>
@@ -150,14 +150,14 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.14.0</version>
+            <version>3.16.0</version>
         </dependency>
 
         <!-- Apache Commons Codec (see exclusions for java-saml and xmlsec) -->
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.17.0</version>
+            <version>1.17.1</version>
         </dependency>
 
     </dependencies>

diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml
@@ -123,7 +123,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bcpkix-fips</artifactId>
-            <version>1.0.7</version>
+            <version>2.0.7</version>
 
             <!-- Force usage of known version of bc-fips, rather than a future
             unknown version (bcpkix-fips references bc-fips using a version
@@ -142,7 +142,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bc-fips</artifactId>
-            <version>1.0.2.5</version>
+            <version>2.0.0</version>
         </dependency>
 
     </dependencies>

diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bc-fips</artifactId>
-            <version>1.0.2.5</version>
+            <version>2.0.0</version>
         </dependency>
 
     </dependencies>