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

Merge patch branch changes to main.

Browse Source
This commit is contained in:
Virtually Nick
2025-03-04 14:55:00 -05:00
parent fd138fba16 fdf555f143
commit 61d0cf00b3
49 changed files with 90 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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.17</version>
<version>3.5.19</version>
</dependency>
<!-- MyBatis Guice -->

16
extensions/guacamole-auth-ldap/pom.xml
View File

@@ -54,6 +54,15 @@
<version>2.1.7</version>
<exclusions>
<!--
Replace vulnerable version of Apache MINA until upstream
releases a version with fixed dependencies.
-->
<exclusion>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
</exclusion>
<!--
Replace slightly older commons-lang3 (3.15.0) with latest
compatible version (3.16.0) so that we don't need two copies
@@ -90,6 +99,13 @@
<version>3.17.0</version>
</dependency>
<!-- Apache MINA (see exclusions for api-all) -->
<dependency>
<groupId>org.apache.mina</groupId>
<artifactId>mina-core</artifactId>
<version>2.2.4</version>
</dependency>
</dependencies>
</project>

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

@@ -79,7 +79,7 @@
<!--
Replace older BouncyCastle (1.70) with newer, compatible
version (1.79), which has since been renamed from
version (1.80), which has since been renamed from
"bcpkix-jdk15on" to "bcpkix-jdk15to18".
-->
<exclusion>
@@ -96,7 +96,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk15to18</artifactId>
<version>1.79</version>
<version>1.80</version>
</dependency>
<!-- Guava - Utility Library -->

34
extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/pom.xml
View File

@@ -123,17 +123,32 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-fips</artifactId>
<version>2.0.7</version>
<version>2.1.9</version>
<!-- Force usage of known version of bc-fips, rather than a future
unknown version (bcpkix-fips references bc-fips using a version
range, resulting in newer versions getting pulled in automatically,
breaking the automated license check) -->
<exclusions>
<!--
Force usage of known version of bc-fips, rather than a
future unknown version (bcpkix-fips references bc-fips using
a version range, resulting in newer versions getting pulled
in automatically, breaking the automated license check).
-->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
</exclusion>
<!--
Force usage of known version of bcutil-fips, rather than a
future unknown version (bcpkix-fips references bctuil-fips
using a version range, resulting in newer versions getting
pulled in automatically, breaking the automated license
check).
-->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-fips</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -142,7 +157,14 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
</dependency>
<!-- Force usage of known version of bcutil-fips (see bcpkix-fips above) -->
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcutil-fips</artifactId>
<version>2.1.4</version>
</dependency>
</dependencies>

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.6</version>
<version>17.0.0</version>
<!-- Correct version conflict (different versions across transitive
dependencies) -->
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bc-fips</artifactId>
<version>2.0.0</version>
<version>2.1.0</version>
</dependency>
</dependencies>