Merge changes from patch branch back to main.

apache · Jun 11, 2024 · 284353d · 284353d
2 parents 60f53e9 + 62820f1
commit 284353d
Show file tree

Hide file tree

Showing 31 changed files with 81 additions and 61 deletions.
diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
@@ -122,7 +122,7 @@
 	<dependency>
 		<groupId>org.slf4j</groupId>
 		<artifactId>slf4j-simple</artifactId>
-		<version>2.0.7</version>
+		<version>2.0.13</version>
 	</dependency>
 
 

diff --git a/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt b/doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
diff --git a/doc/licenses/apache-commons-1.16.1/NOTICE → doc/licenses/apache-commons-1.17.0/NOTICE b/doc/licenses/apache-commons-1.16.1/NOTICE → doc/licenses/apache-commons-1.17.0/NOTICE
diff --git a/doc/licenses/apache-commons-1.16.1/README → doc/licenses/apache-commons-1.17.0/README b/doc/licenses/apache-commons-1.16.1/README → doc/licenses/apache-commons-1.17.0/README
@@ -1,7 +1,7 @@
 Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
 -----------------------------------------------------------------------
 
-    Version: 1.16.1
+    Version: 1.17.0
     From: 'Apache Software Foundation' (https://www.apache.org/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt b/doc/licenses/apache-commons-1.17.0/dep-coordinates.txt
@@ -0,0 +1 @@
+commons-codec:commons-codec:jar:1.17.0
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
diff --git a/...icenses/bouncycastle-fips-1.0.2.4/LICENSE → ...icenses/bouncycastle-fips-1.0.2.5/LICENSE b/...icenses/bouncycastle-fips-1.0.2.4/LICENSE → ...icenses/bouncycastle-fips-1.0.2.5/LICENSE
diff --git a/...licenses/bouncycastle-fips-1.0.2.4/README → ...licenses/bouncycastle-fips-1.0.2.5/README b/...licenses/bouncycastle-fips-1.0.2.4/README → ...licenses/bouncycastle-fips-1.0.2.5/README
@@ -1,8 +1,8 @@
 BouncyCastle FIPS Distribution (https://www.bouncycastle.org/fips-java)
 -----------------------------------------------------------------------
 
-    Version: 1.0.2.4
+    Version: 1.0.2.5
     From: 'The Legion of Bouncy Castle' (https://www.bouncycastle.org)
     License(s):
-        MIT (bundled/bouncycastle-fips-1.0.2.4/LICENSE)
+        MIT (bundled/bouncycastle-fips-1.0.2.5/LICENSE)
 
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
@@ -0,0 +1 @@
+org.bouncycastle:bc-fips:jar:1.0.2.5
diff --git a/doc/licenses/jakarta-validation-api-2.1.3/NOTICE b/doc/licenses/jakarta-validation-api-2.1.3/NOTICE
@@ -0,0 +1,11 @@
+# Notices for Eclipse Jakarta Bean Validation
+
+This content is produced and maintained by the Eclipse Jakarta Bean Validation
+project.
+
+* Project home: https://projects.eclipse.org/projects/ee4j.bean-validation
+
+## Trademarks
+
+ Jakarta Bean Validation is a trademark of the Eclipse Foundation.
+
diff --git a/doc/licenses/jakarta-validation-api-2.1.3/README b/doc/licenses/jakarta-validation-api-2.1.3/README
@@ -0,0 +1,8 @@
+Jakarta Bean Validation API (https://beanvalidation.org/)
+---------------------------------------------------------
+
+    Version: 2.1.3
+    From: 'Red Hat Inc.' (https://www.redhat.com/)
+    License(s):
+        Apache v2.0
+
diff --git a/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt b/doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt
@@ -0,0 +1 @@
+jakarta.validation:jakarta.validation-api:jar:2.1.3
diff --git a/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt b/doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt
diff --git a/...es/kotlinx-serialization-1.6.0/NOTICE.txt → ...es/kotlinx-serialization-1.6.3/NOTICE.txt b/...es/kotlinx-serialization-1.6.0/NOTICE.txt → ...es/kotlinx-serialization-1.6.3/NOTICE.txt
diff --git a/...censes/kotlinx-serialization-1.6.0/README → ...censes/kotlinx-serialization-1.6.3/README b/...censes/kotlinx-serialization-1.6.0/README → ...censes/kotlinx-serialization-1.6.3/README
@@ -1,7 +1,7 @@
 Kotlin Serialization (https://github.com/Kotlin/kotlinx.serialization)
 ----------------------------------------------------------------------
 
-    Version: 1.6.0
+    Version: 1.6.3
     From: 'JetBrains s.r.o and respective authors and developers'
     License(s):
         Apache v2.0

diff --git a/doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt b/doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt
@@ -0,0 +1,2 @@
+org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.3
+org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.3
diff --git a/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
diff --git a/doc/licenses/ksm-sdk-16.6.3/LICENSE → doc/licenses/ksm-sdk-16.6.4/LICENSE b/doc/licenses/ksm-sdk-16.6.3/LICENSE → doc/licenses/ksm-sdk-16.6.4/LICENSE
diff --git a/doc/licenses/ksm-sdk-16.6.3/README → doc/licenses/ksm-sdk-16.6.4/README b/doc/licenses/ksm-sdk-16.6.3/README → doc/licenses/ksm-sdk-16.6.4/README
@@ -2,8 +2,8 @@ Keeper Secrets Manager Java SDK
 (https://github.com/Keeper-Security/secrets-manager)
 ----------------------------------------------------
 
-    Version: 16.6.3
+    Version: 16.6.4
     From: 'Keeper Security' (https://www.keepersecurity.com/)
     License(s):
-        MIT (bundled/ksm-sdk-16.6.3/LICENSE)
+        MIT (bundled/ksm-sdk-16.6.4/LICENSE)
 
diff --git a/doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt b/doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt
@@ -0,0 +1 @@
+com.keepersecurity.secrets-manager:core:jar:16.6.4
diff --git a/doc/licenses/mybatis-3.5.15/dep-coordinates.txt b/doc/licenses/mybatis-3.5.15/dep-coordinates.txt
diff --git a/doc/licenses/mybatis-3.5.15/NOTICE → doc/licenses/mybatis-3.5.16/NOTICE b/doc/licenses/mybatis-3.5.15/NOTICE → doc/licenses/mybatis-3.5.16/NOTICE
diff --git a/doc/licenses/mybatis-3.5.15/README → doc/licenses/mybatis-3.5.16/README b/doc/licenses/mybatis-3.5.15/README → doc/licenses/mybatis-3.5.16/README
@@ -1,7 +1,7 @@
 MyBatis (http://www.mybatis.org/mybatis-3/)
 -------------------------------------------
 
-    Version: 3.5.15
+    Version: 3.5.16
     From: 'MyBatis' (http://www.mybatis.org/)
     License(s):
         Apache v2.0

diff --git a/doc/licenses/mybatis-3.5.16/dep-coordinates.txt b/doc/licenses/mybatis-3.5.16/dep-coordinates.txt
@@ -0,0 +1 @@
+org.mybatis:mybatis:jar:3.5.16
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
@@ -57,7 +57,7 @@
         <dependency>
             <groupId>org.mybatis</groupId>
             <artifactId>mybatis</artifactId>
-            <version>3.5.15</version>
+            <version>3.5.16</version>
         </dependency>
 
         <!-- MyBatis Guice -->

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.16.1</version>
+            <version>1.17.0</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
@@ -135,7 +135,7 @@
                 <!--
                     Replace slightly older commons-codec (1.15) with newer
                     and identical version to that used by Apache Directory API
-                    for LDAP (1.16.0) so that we don't need two copies of the
+                    for LDAP (1.17.0) so that we don't need two copies of the
                     same license information.
                 -->
                 <exclusion>
@@ -157,7 +157,7 @@
         <dependency>
             <groupId>commons-codec</groupId>
             <artifactId>commons-codec</artifactId>
-            <version>1.16.1</version>
+            <version>1.17.0</version>
         </dependency>
 
     </dependencies>

diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml
@@ -174,7 +174,7 @@
         <dependency>
             <groupId>javax.ws.rs</groupId>
             <artifactId>javax.ws.rs-api</artifactId>
-            <version>2.0</version>
+            <version>2.1.1</version>
             <scope>provided</scope>
         </dependency>
 

diff --git a/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml b/extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
             <groupId>com.keepersecurity.secrets-manager</groupId>
             <artifactId>core</artifactId>
-            <version>16.6.3</version>
+            <version>16.6.4</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.4</version>
+            <version>1.0.2.5</version>
         </dependency>
 
     </dependencies>

diff --git a/guacamole/src/main/frontend/package-lock.json b/guacamole/src/main/frontend/package-lock.json
diff --git a/guacamole/src/main/frontend/package.json b/guacamole/src/main/frontend/package.json
@@ -34,7 +34,7 @@
         "css-minimizer-webpack-plugin": "^1.3.0",
         "exports-loader": "^1.1.1",
         "find-package-json": "^1.2.0",
-        "google-closure-compiler": "20221004.0.0",
+        "google-closure-compiler": "20240317.0.0",
         "html-webpack-plugin": "^4.5.2",
         "mini-css-extract-plugin": "^1.6.2",
         "webpack": "^4.47.0",