safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-05 20:57:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge changes from patch branch back to main.

Browse Source
This commit is contained in:
Michael Jumper
2024-06-11 11:19:52 -07:00
parent 60f53e9f86 62820f12a3
commit 284353da48
31 changed files with 81 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/guacamole-example/pom.xml
View File

@@ -122,7 +122,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>2.0.7</version>
<version>2.0.13</version>
</dependency>

1
doc/licenses/apache-commons-1.16.1/dep-coordinates.txt
View File

@@ -1 +0,0 @@
commons-codec:commons-codec:jar:1.16.1

0
doc/licenses/apache-commons-1.16.1/NOTICE → doc/licenses/apache-commons-1.17.0/NOTICE
View File

2
doc/licenses/apache-commons-1.16.1/README → doc/licenses/apache-commons-1.17.0/README
View File

@@ -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

1
doc/licenses/apache-commons-1.17.0/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
commons-codec:commons-codec:jar:1.17.0

1
doc/licenses/bouncycastle-fips-1.0.2.4/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.bouncycastle:bc-fips:jar:1.0.2.4

0
doc/licenses/bouncycastle-fips-1.0.2.4/LICENSE → doc/licenses/bouncycastle-fips-1.0.2.5/LICENSE
View File

4
doc/licenses/bouncycastle-fips-1.0.2.4/README → doc/licenses/bouncycastle-fips-1.0.2.5/README
View File

@@ -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)

1
doc/licenses/bouncycastle-fips-1.0.2.5/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.bouncycastle:bc-fips:jar:1.0.2.5

11
doc/licenses/jakarta-validation-api-2.1.3/NOTICE Normal file
View File

@@ -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.

8
doc/licenses/jakarta-validation-api-2.1.3/README Normal file
View File

@@ -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

1
doc/licenses/jakarta-validation-api-2.1.3/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
jakarta.validation:jakarta.validation-api:jar:2.1.3

2
doc/licenses/kotlinx-serialization-1.6.0/dep-coordinates.txt
View File

@@ -1,2 +0,0 @@
org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:jar:1.6.0
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:jar:1.6.0

0
doc/licenses/kotlinx-serialization-1.6.0/NOTICE.txt → doc/licenses/kotlinx-serialization-1.6.3/NOTICE.txt
View File

2
doc/licenses/kotlinx-serialization-1.6.0/README → doc/licenses/kotlinx-serialization-1.6.3/README
View File

@@ -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

2
doc/licenses/kotlinx-serialization-1.6.3/dep-coordinates.txt Normal file
View File

@@ -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

1
doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt
View File

@@ -1 +0,0 @@
com.keepersecurity.secrets-manager:core:jar:16.6.3

0
doc/licenses/ksm-sdk-16.6.3/LICENSE → doc/licenses/ksm-sdk-16.6.4/LICENSE
View File

4
doc/licenses/ksm-sdk-16.6.3/README → doc/licenses/ksm-sdk-16.6.4/README
View File

@@ -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)

1
doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
com.keepersecurity.secrets-manager:core:jar:16.6.4

1
doc/licenses/mybatis-3.5.15/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.mybatis:mybatis:jar:3.5.15

0
doc/licenses/mybatis-3.5.15/NOTICE → doc/licenses/mybatis-3.5.16/NOTICE
View File

2
doc/licenses/mybatis-3.5.15/README → doc/licenses/mybatis-3.5.16/README
View File

@@ -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

1
doc/licenses/mybatis-3.5.16/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.mybatis:mybatis:jar:3.5.16

2
extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
View File

@@ -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 -->

2
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml
View File

@@ -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>

4
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml
View File

@@ -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>

2
extensions/guacamole-auth-totp/pom.xml
View File

@@ -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>

4
extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml
View File

@@ -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>

78
guacamole/src/main/frontend/package-lock.json generated
View File

@@ -35,7 +35,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",
@@ -5790,13 +5790,13 @@
}
},
"node_modules/google-closure-compiler": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20221004.0.0.tgz",
"integrity": "sha512-OKENLrZFF2o3FZ/E4zdTc9NeuAUh1fdwbQxT0sibI19aR62sgNUBo2mLU6sc4Gcm0cQ2gwfB7qX1xnapOIkbaA==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20240317.0.0.tgz",
"integrity": "sha512-PlC5aU2vwsypKbxyFNXOW4psDZfhDoOr2dCwuo8VcgQji+HVIgRi2lviO66x2SfTi0ilm3kI6rq/RSdOMFczcQ==",
"dev": true,
"dependencies": {
"chalk": "4.x",
"google-closure-compiler-java": "^20221004.0.0",
"google-closure-compiler-java": "^20240317.0.0",
"minimist": "1.x",
"vinyl": "2.x",
"vinyl-sourcemaps-apply": "^0.2.0"
@@ -5808,21 +5808,21 @@
"node": ">=10"
},
"optionalDependencies": {
"google-closure-compiler-linux": "^20221004.0.0",
"google-closure-compiler-osx": "^20221004.0.0",
"google-closure-compiler-windows": "^20221004.0.0"
"google-closure-compiler-linux": "^20240317.0.0",
"google-closure-compiler-osx": "^20240317.0.0",
"google-closure-compiler-windows": "^20240317.0.0"
}
},
"node_modules/google-closure-compiler-java": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20221004.0.0.tgz",
"integrity": "sha512-CygLEB40HxtK0VtP6klv2Xm08w4HQNYX/DTgLV7CP74r8LiQMUByRFleaG/Hv5xQG1JzPNiW0GOAiAubDSdr5A==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20240317.0.0.tgz",
"integrity": "sha512-oWURPChjcCrVfiQOuVtpSoUJVvtOYo41JGEQ2qtArsTGmk/DpWh40vS6hitwKRM/0YzJX/jYUuyt9ibuXXJKmg==",
"dev": true
},
"node_modules/google-closure-compiler-linux": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20221004.0.0.tgz",
"integrity": "sha512-B6sca3Lmw3cYXdFzdU0iQpk8L9VEo1ecC1aM7Gl9lgWhIicqqEZebsgnUe5TQ3uHBfQoKjV9fdFG8mt8X/oqSQ==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20240317.0.0.tgz",
"integrity": "sha512-dYLtcbbJdbbBS0lTy9SzySdVv/aGkpyTekQiW4ADhT/i1p1b4r0wQTKj6kpVVmFvbZ6t9tW/jbXc9EXXNUahZw==",
"cpu": [
"x32",
"x64"
@@ -5834,9 +5834,9 @@
]
},
"node_modules/google-closure-compiler-osx": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20221004.0.0.tgz",
"integrity": "sha512-z5V7BvaMauPga8DMTt9u6RGcjBdLAuv4gL2Ebw5NIQRTAHVkEVzCd3kiMX7CVCGhmWdS/1r3jZcCg4BswGia6w==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20240317.0.0.tgz",
"integrity": "sha512-0mABwjD4HP11rikFd8JRIb9OgPqn9h3o3wS0otufMfmbwS7zRpnnoJkunifhORl3VoR1gFm6vcTC9YziTEFdOw==",
"cpu": [
"x32",
"x64",
@@ -5849,9 +5849,9 @@
]
},
"node_modules/google-closure-compiler-windows": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20221004.0.0.tgz",
"integrity": "sha512-JSAWilVa7d65QJYKUr+DmklwKmjkAce6BMD6smqJfdL2dv5OSJ2ydGy73euoBJ4Tka8iQPoaOP+BjLrhIuvqKg==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20240317.0.0.tgz",
"integrity": "sha512-fTueVFzNOWURFlXZmrFkAB7yA+jzpA2TeDOYeBEFwVlVGHwi8PV3Q9vCIWlbkE8wLpukKEg5wfRHYrLwVPINCA==",
"cpu": [
"x32",
"x64"
@@ -15846,45 +15846,45 @@
}
},
"google-closure-compiler": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20221004.0.0.tgz",
"integrity": "sha512-OKENLrZFF2o3FZ/E4zdTc9NeuAUh1fdwbQxT0sibI19aR62sgNUBo2mLU6sc4Gcm0cQ2gwfB7qX1xnapOIkbaA==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler/-/google-closure-compiler-20240317.0.0.tgz",
"integrity": "sha512-PlC5aU2vwsypKbxyFNXOW4psDZfhDoOr2dCwuo8VcgQji+HVIgRi2lviO66x2SfTi0ilm3kI6rq/RSdOMFczcQ==",
"dev": true,
"requires": {
"chalk": "4.x",
"google-closure-compiler-java": "^20221004.0.0",
"google-closure-compiler-linux": "^20221004.0.0",
"google-closure-compiler-osx": "^20221004.0.0",
"google-closure-compiler-windows": "^20221004.0.0",
"google-closure-compiler-java": "^20240317.0.0",
"google-closure-compiler-linux": "^20240317.0.0",
"google-closure-compiler-osx": "^20240317.0.0",
"google-closure-compiler-windows": "^20240317.0.0",
"minimist": "1.x",
"vinyl": "2.x",
"vinyl-sourcemaps-apply": "^0.2.0"
}
},
"google-closure-compiler-java": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20221004.0.0.tgz",
"integrity": "sha512-CygLEB40HxtK0VtP6klv2Xm08w4HQNYX/DTgLV7CP74r8LiQMUByRFleaG/Hv5xQG1JzPNiW0GOAiAubDSdr5A==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-java/-/google-closure-compiler-java-20240317.0.0.tgz",
"integrity": "sha512-oWURPChjcCrVfiQOuVtpSoUJVvtOYo41JGEQ2qtArsTGmk/DpWh40vS6hitwKRM/0YzJX/jYUuyt9ibuXXJKmg==",
"dev": true
},
"google-closure-compiler-linux": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20221004.0.0.tgz",
"integrity": "sha512-B6sca3Lmw3cYXdFzdU0iQpk8L9VEo1ecC1aM7Gl9lgWhIicqqEZebsgnUe5TQ3uHBfQoKjV9fdFG8mt8X/oqSQ==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-linux/-/google-closure-compiler-linux-20240317.0.0.tgz",
"integrity": "sha512-dYLtcbbJdbbBS0lTy9SzySdVv/aGkpyTekQiW4ADhT/i1p1b4r0wQTKj6kpVVmFvbZ6t9tW/jbXc9EXXNUahZw==",
"dev": true,
"optional": true
},
"google-closure-compiler-osx": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20221004.0.0.tgz",
"integrity": "sha512-z5V7BvaMauPga8DMTt9u6RGcjBdLAuv4gL2Ebw5NIQRTAHVkEVzCd3kiMX7CVCGhmWdS/1r3jZcCg4BswGia6w==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-osx/-/google-closure-compiler-osx-20240317.0.0.tgz",
"integrity": "sha512-0mABwjD4HP11rikFd8JRIb9OgPqn9h3o3wS0otufMfmbwS7zRpnnoJkunifhORl3VoR1gFm6vcTC9YziTEFdOw==",
"dev": true,
"optional": true
},
"google-closure-compiler-windows": {
"version": "20221004.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20221004.0.0.tgz",
"integrity": "sha512-JSAWilVa7d65QJYKUr+DmklwKmjkAce6BMD6smqJfdL2dv5OSJ2ydGy73euoBJ4Tka8iQPoaOP+BjLrhIuvqKg==",
"version": "20240317.0.0",
"resolved": "https://registry.npmjs.org/google-closure-compiler-windows/-/google-closure-compiler-windows-20240317.0.0.tgz",
"integrity": "sha512-fTueVFzNOWURFlXZmrFkAB7yA+jzpA2TeDOYeBEFwVlVGHwi8PV3Q9vCIWlbkE8wLpukKEg5wfRHYrLwVPINCA==",
"dev": true,
"optional": true
},

2
guacamole/src/main/frontend/package.json
View File

@@ -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",