Merge 1.5.4 changes back to master.

apache · Oct 6, 2023 · 3514a21 · 3514a21
2 parents e75c79f + 557a62a
commit 3514a21
Show file tree

Hide file tree

Showing 53 changed files with 175 additions and 105 deletions.
diff --git a/doc/licenses/apache-mina-2.2.1/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.1/dep-coordinates.txt
diff --git a/doc/licenses/apache-mina-2.2.1/NOTICE → doc/licenses/apache-mina-2.2.2/NOTICE b/doc/licenses/apache-mina-2.2.1/NOTICE → doc/licenses/apache-mina-2.2.2/NOTICE
@@ -1,5 +1,5 @@
 Apache MINA
-Copyright 2007-2016 The Apache Software Foundation.
+Copyright 2007-2023 The Apache Software Foundation.
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
diff --git a/doc/licenses/apache-mina-2.2.1/README → doc/licenses/apache-mina-2.2.2/README b/doc/licenses/apache-mina-2.2.1/README → doc/licenses/apache-mina-2.2.2/README
@@ -1,7 +1,7 @@
 Apache Mina (https://mina.apache.org/)
 --------------------------------------
 
-    Version: 2.2.1
+    Version: 2.2.2
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt b/doc/licenses/apache-mina-2.2.2/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.mina:mina-core:jar:2.2.2
diff --git a/doc/licenses/bouncycastle-fips-1.0.2.3/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-1.0.2.3/dep-coordinates.txt
diff --git a/...icenses/bouncycastle-fips-1.0.2.3/LICENSE → ...icenses/bouncycastle-fips-1.0.2.4/LICENSE b/...icenses/bouncycastle-fips-1.0.2.3/LICENSE → ...icenses/bouncycastle-fips-1.0.2.4/LICENSE
@@ -1,12 +1,12 @@
-Copyright (c) 2000 - 2021 The Legion of the Bouncy Castle Inc.
+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:
+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.
@@ -17,4 +17,4 @@ 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.
+SOFTWARE. 
diff --git a/...licenses/bouncycastle-fips-1.0.2.3/README → ...licenses/bouncycastle-fips-1.0.2.4/README b/...licenses/bouncycastle-fips-1.0.2.3/README → ...licenses/bouncycastle-fips-1.0.2.4/README
@@ -1,8 +1,8 @@
 BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java)
 -----------------------------------------------------------------------
 
-    Version: 1.0.2.3
+    Version: 1.0.2.4
     From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
     License(s):
-        MIT (bundled/bouncycastle-fips-1.0.2.3/LICENSE)
+        MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE)
 
diff --git a/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt b/doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt
@@ -0,0 +1 @@
+org.bouncycastle:bc-fips:jar:1.0.2.4
diff --git a/doc/licenses/directory-api-2.1.3/NOTICE b/doc/licenses/directory-api-2.1.3/NOTICE
diff --git a/doc/licenses/directory-api-2.1.3/dep-coordinates.txt b/doc/licenses/directory-api-2.1.3/dep-coordinates.txt
diff --git a/doc/licenses/directory-api-2.1.4/NOTICE b/doc/licenses/directory-api-2.1.4/NOTICE
@@ -0,0 +1,5 @@
+Apache Directory LDAP API
+Copyright 2003-2023 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (https://www.apache.org/).
diff --git a/doc/licenses/directory-api-2.1.3/README → doc/licenses/directory-api-2.1.4/README b/doc/licenses/directory-api-2.1.3/README → doc/licenses/directory-api-2.1.4/README
@@ -1,7 +1,7 @@
 Apache Directory LDAP API (http://directory.apache.org)
 -------------------------------------------------------
 
-    Version: 2.1.3
+    Version: 2.1.4
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/directory-api-2.1.4/dep-coordinates.txt b/doc/licenses/directory-api-2.1.4/dep-coordinates.txt
@@ -0,0 +1 @@
+org.apache.directory.api:api-all:jar:2.1.4
diff --git a/doc/licenses/guava-32.1.1-jre/README → doc/licenses/guava-32.1.2-jre/README b/doc/licenses/guava-32.1.1-jre/README → doc/licenses/guava-32.1.2-jre/README
@@ -1,7 +1,7 @@
 Guava: Google Core Libraries for Java (https://github.com/google/guava)
 -----------------------------------------------------------------------
 
-    Version: 32.1.1-jre
+    Version: 32.1.2-jre
     From: 'Google Inc.' (http://www.google.com/)
     License(s):
         Apache v2.0

diff --git a/...nses/guava-32.1.1-jre/dep-coordinates.txt → ...nses/guava-32.1.2-jre/dep-coordinates.txt b/...nses/guava-32.1.1-jre/dep-coordinates.txt → ...nses/guava-32.1.2-jre/dep-coordinates.txt
@@ -1,3 +1,3 @@
 com.google.guava:failureaccess:jar:1.0.1
-com.google.guava:guava:jar:32.1.1-jre
+com.google.guava:guava:jar:32.1.2-jre
 com.google.guava:listenablefuture:jar:9999.0-empty-to-avoid-conflict-with-guava
diff --git a/doc/licenses/jquery-3.6.4/dep-coordinates.txt b/doc/licenses/jquery-3.6.4/dep-coordinates.txt
diff --git a/doc/licenses/jquery-3.6.4/LICENSE.txt → doc/licenses/jquery-3.7.1/LICENSE.txt b/doc/licenses/jquery-3.6.4/LICENSE.txt → doc/licenses/jquery-3.7.1/LICENSE.txt
diff --git a/doc/licenses/jquery-3.6.4/README → doc/licenses/jquery-3.7.1/README b/doc/licenses/jquery-3.6.4/README → doc/licenses/jquery-3.7.1/README
@@ -1,8 +1,8 @@
 jQuery (http://jquery.com/)
 ---------------------------
 
-    Version: 3.6.4
+    Version: 3.7.1
     From: 'OpenJS Foundation' (https://openjsf.org/)
     License(s):
-        MIT (bundled/jquery-3.6.4/LICENSE.txt)
+        MIT (bundled/jquery-3.7.1/LICENSE.txt)
 
diff --git a/doc/licenses/jquery-3.7.1/dep-coordinates.txt b/doc/licenses/jquery-3.7.1/dep-coordinates.txt
@@ -0,0 +1 @@
+jquery:3.7.1
diff --git a/doc/licenses/kotlin-1.9.0/dep-coordinates.txt b/doc/licenses/kotlin-1.9.0/dep-coordinates.txt
diff --git a/doc/licenses/kotlin-1.9.0/NOTICE.txt → doc/licenses/kotlin-1.9.10/NOTICE.txt b/doc/licenses/kotlin-1.9.0/NOTICE.txt → doc/licenses/kotlin-1.9.10/NOTICE.txt
diff --git a/doc/licenses/kotlin-1.9.0/README → doc/licenses/kotlin-1.9.10/README b/doc/licenses/kotlin-1.9.0/README → doc/licenses/kotlin-1.9.10/README
@@ -1,7 +1,7 @@
 Kotlin (https://kotlinlang.org/)
 --------------------------------
 
-    Version: 1.9.0
+    Version: 1.9.10
     From: 'JetBrains s.r.o and respective authors and developers'
     License(s):
         Apache v2.0

diff --git a/doc/licenses/kotlin-1.9.10/dep-coordinates.txt b/doc/licenses/kotlin-1.9.10/dep-coordinates.txt
@@ -0,0 +1,5 @@
+org.jetbrains.kotlin:kotlin-reflect:jar:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib:jar:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-common:jar:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk8:jar:1.9.10
+org.jetbrains.kotlin:kotlin-stdlib-jdk7:jar:1.9.10
diff --git a/doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt
diff --git a/doc/licenses/ksm-sdk-16.5.4/LICENSE → doc/licenses/ksm-sdk-16.6.2/LICENSE b/doc/licenses/ksm-sdk-16.5.4/LICENSE → doc/licenses/ksm-sdk-16.6.2/LICENSE
diff --git a/doc/licenses/ksm-sdk-16.5.4/README → doc/licenses/ksm-sdk-16.6.2/README b/doc/licenses/ksm-sdk-16.5.4/README → doc/licenses/ksm-sdk-16.6.2/README
@@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
 (https://github.com/Keeper-Security/secrets-manager)
 ----------------------------------------------------
 
-    Version: 16.5.4
+    Version: 16.6.2
     From: 'Keeper Security' (https://www.keepersecurity.com/)
     License(s):
-        MIT (bundled/ksm-sdk-16.5.4/LICENSE)
+        MIT (bundled/ksm-sdk-16.6.2/LICENSE)
 
diff --git a/doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.6.2/dep-coordinates.txt
@@ -0,0 +1 @@
+com.keepersecurity.secrets-manager:core:jar:16.6.2
diff --git a/doc/licenses/logback-1.3.8/LICENSE.txt → doc/licenses/logback-1.3.11/LICENSE.txt b/doc/licenses/logback-1.3.8/LICENSE.txt → doc/licenses/logback-1.3.11/LICENSE.txt
diff --git a/doc/licenses/logback-1.3.8/README → doc/licenses/logback-1.3.11/README b/doc/licenses/logback-1.3.8/README → doc/licenses/logback-1.3.11/README
@@ -1,8 +1,8 @@
 Logback (http://logback.qos.ch/)
 --------------------------------
 
-    Version: 1.3.8
+    Version: 1.3.11
     From: 'QOS.ch Sàrl' (http://qos.ch/)
     License(s):
-        EPL v1.0 (bundled/logback-1.3.8/LICENSE.txt)
+        EPL v1.0 (bundled/logback-1.3.11/LICENSE.txt)
 
diff --git a/doc/licenses/logback-1.3.11/dep-coordinates.txt b/doc/licenses/logback-1.3.11/dep-coordinates.txt
@@ -0,0 +1,2 @@
+ch.qos.logback:logback-classic:jar:1.3.11
+ch.qos.logback:logback-core:jar:1.3.11
diff --git a/doc/licenses/logback-1.3.8/dep-coordinates.txt b/doc/licenses/logback-1.3.8/dep-coordinates.txt
diff --git a/doc/licenses/slf4j-api-2.0.7/dep-coordinates.txt b/doc/licenses/slf4j-api-2.0.7/dep-coordinates.txt
diff --git a/doc/licenses/slf4j-api-2.0.7/LICENSE.txt → doc/licenses/slf4j-api-2.0.9/LICENSE.txt b/doc/licenses/slf4j-api-2.0.7/LICENSE.txt → doc/licenses/slf4j-api-2.0.9/LICENSE.txt
diff --git a/doc/licenses/slf4j-api-2.0.7/README → doc/licenses/slf4j-api-2.0.9/README b/doc/licenses/slf4j-api-2.0.7/README → doc/licenses/slf4j-api-2.0.9/README
@@ -1,8 +1,8 @@
 Simple Logging Facade for Java (http://slf4j.org/)
 --------------------------------------------------
 
-    Version: 2.0.7
+    Version: 2.0.9
     From: 'QOS.ch Sàrl' (http://qos.ch/)
     License(s):
-        MIT (bundled/slf4j-api-2.0.7/LICENSE.txt)
+        MIT (bundled/slf4j-api-2.0.9/LICENSE.txt)
 
diff --git a/doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt b/doc/licenses/slf4j-api-2.0.9/dep-coordinates.txt
@@ -0,0 +1,2 @@
+org.slf4j:jul-to-slf4j:jar:2.0.9
+org.slf4j:slf4j-api:jar:2.0.9
diff --git a/doc/licenses/webpack-4.46.0/dep-coordinates.txt b/doc/licenses/webpack-4.46.0/dep-coordinates.txt
diff --git a/doc/licenses/webpack-4.46.0/LICENSE → doc/licenses/webpack-4.47.0/LICENSE b/doc/licenses/webpack-4.46.0/LICENSE → doc/licenses/webpack-4.47.0/LICENSE
diff --git a/doc/licenses/webpack-4.46.0/README → doc/licenses/webpack-4.47.0/README b/doc/licenses/webpack-4.46.0/README → doc/licenses/webpack-4.47.0/README
@@ -1,8 +1,8 @@
 Webpack (https://webpack.js.org/)
 ---------------------------------
 
-    Version: 4.46.0
+    Version: 4.47.0
     From: 'JS Foundation and other contributors'
     License(s):
-        MIT (bundled/webpack-4.46.0/LICENSE)
+        MIT (bundled/webpack-4.47.0/LICENSE)
 
diff --git a/doc/licenses/webpack-4.47.0/dep-coordinates.txt b/doc/licenses/webpack-4.47.0/dep-coordinates.txt
@@ -0,0 +1 @@
+webpack:4.47.0
diff --git a/doc/licenses/zxing-3.5.1/dep-coordinates.txt b/doc/licenses/zxing-3.5.1/dep-coordinates.txt
diff --git a/doc/licenses/zxing-3.5.1/AUTHORS → doc/licenses/zxing-3.5.2/AUTHORS b/doc/licenses/zxing-3.5.1/AUTHORS → doc/licenses/zxing-3.5.2/AUTHORS
diff --git a/doc/licenses/zxing-3.5.1/NOTICE → doc/licenses/zxing-3.5.2/NOTICE b/doc/licenses/zxing-3.5.1/NOTICE → doc/licenses/zxing-3.5.2/NOTICE
diff --git a/doc/licenses/zxing-3.5.1/README → doc/licenses/zxing-3.5.2/README b/doc/licenses/zxing-3.5.1/README → doc/licenses/zxing-3.5.2/README
@@ -1,8 +1,8 @@
 ZXing Barcode Scanning Library (https://github.com/zxing/zxing/)
 ----------------------------------------------------------------
 
-    Version: 3.5.1
-    From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.1/AUTHORS)
+    Version: 3.5.2
+    From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.5.2/AUTHORS)
     License(s):
         Apache v2.0
 
diff --git a/doc/licenses/zxing-3.5.2/dep-coordinates.txt b/doc/licenses/zxing-3.5.2/dep-coordinates.txt
@@ -0,0 +1,2 @@
+com.google.zxing:core:jar:3.5.2
+com.google.zxing:javase:jar:3.5.2
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
@@ -51,7 +51,7 @@
         <dependency>
             <groupId>org.apache.directory.api</groupId>
             <artifactId>api-all</artifactId>
-            <version>2.1.3</version>
+            <version>2.1.4</version>
             <exclusions>
             </exclusions>
         </dependency>

diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml
@@ -162,12 +162,12 @@
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>javase</artifactId>
-            <version>3.5.1</version>
+            <version>3.5.2</version>
         </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>
-            <version>3.5.1</version>
+            <version>3.5.2</version>
         </dependency>
 
         <!-- Guacamole depends on an implementation of JAX-WS -->

diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
@@ -38,7 +38,7 @@
     </parent>
 
     <properties>
-        <kotlin.version>1.9.0</kotlin.version>
+        <kotlin.version>1.9.10</kotlin.version>
     </properties>
 
     <dependencies>
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.keepersecurity.secrets-manager</groupId>
             <artifactId>core</artifactId>
-            <version>16.5.4</version>
+            <version>16.6.2</version>
 
             <!-- Correct version conflict (different versions across transitive
                 dependencies) -->
@@ -106,7 +106,7 @@
         <dependency>
             <groupId>org.bouncycastle</groupId>
             <artifactId>bc-fips</artifactId>
-            <version>1.0.2.3</version>
+            <version>1.0.2.4</version>
         </dependency>
 
     </dependencies>

diff --git a/guacamole/pom.xml b/guacamole/pom.xml
@@ -68,6 +68,13 @@
                 <configuration>
                     <workingDirectory>src/main/frontend</workingDirectory>
                     <installDirectory>${project.build.directory}</installDirectory>
+
+                    <!-- Newer Node.js requires the following to avoid an "ERR_OSSL_EVP_UNSUPPORTED"
+                    error when WebPack attempts to use its default hash (MD4) for content hashing -->
+                    <environmentVariables>
+                        <NODE_OPTIONS>--openssl-legacy-provider</NODE_OPTIONS>
+                    </environmentVariables>
+
                 </configuration>
                 <executions>
                     <execution>
@@ -76,7 +83,8 @@
                             <goal>install-node-and-npm</goal>
                         </goals>
                         <configuration>
-                            <nodeVersion>v14.16.0</nodeVersion>
+                            <nodeVersion>v18.18.0</nodeVersion>
+                            <npmVersion>9.8.1</npmVersion>
                         </configuration>
                     </execution>
                     <execution>