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 changes from patch branch back to main.

Browse Source
This commit is contained in:
Michael Jumper
2024-08-28 14:38:26 -07:00
parent d3b784dfa0 2a0e06fa05
commit 468c05070f
57 changed files with 1362 additions and 12689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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.17.0</version>
<version>1.17.1</version>
</dependency>
</dependencies>

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

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

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

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

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

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