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

Merge 1.5.4 changes back to master.

Browse Source
This commit is contained in:
James Muehlner
2023-12-04 17:23:53 +00:00
parent b02f30935a 2a7605055a
commit 212955c16c
66 changed files with 176 additions and 83 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.13</version>
<version>3.5.14</version>
</dependency>
<!-- MyBatis Guice -->

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

@@ -51,8 +51,19 @@
<dependency>
<groupId>org.apache.directory.api</groupId>
<artifactId>api-all</artifactId>
<version>2.1.4</version>
<version>2.1.5</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
of the same license information.
-->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -72,6 +83,13 @@
<artifactId>jackson-dataformat-yaml</artifactId>
</dependency>
<!-- Apache Commons Lang (see exclusions for api-all) -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>
</dependencies>
</project>

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

@@ -65,6 +65,17 @@
<groupId>org.glassfish.jaxb</groupId>
<artifactId>jaxb-core</artifactId>
</exclusion>
<!--
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
same license information.
-->
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -118,6 +129,13 @@
<version>2.3.1</version>
</dependency>
<!-- Apache Commons Codec (see exclusions for cas-client-core) -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.0</version>
</dependency>
</dependencies>
</project>

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

@@ -74,25 +74,92 @@
<groupId>com.onelogin</groupId>
<artifactId>java-saml</artifactId>
<version>2.9.0</version>
<!--
Replace vulnerable version of Woodstox until upstream
releases a version with fixed dependencies
-->
<exclusions>
<!--
Replace vulnerable version of Woodstox until upstream
releases a version with fixed dependencies
-->
<exclusion>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
</exclusion>
<!--
Replace vulnerable version of xmlsec until upstream
releases a version with fixed dependencies
-->
<exclusion>
<groupId>org.apache.santuario</groupId>
<artifactId>xmlsec</artifactId>
</exclusion>
<!--
Replace slightly older commons-lang3 (3.12.0) with latest
compatible version (3.14.0) so that we don't need two copies
of the same license information.
-->
<exclusion>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</exclusion>
<!--
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
same license information.
-->
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Woodstox -->
<!-- Woodstox (see exclusions for java-saml) -->
<dependency>
<groupId>com.fasterxml.woodstox</groupId>
<artifactId>woodstox-core</artifactId>
<version>5.4.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>
<exclusions>
<!--
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
same license information.
-->
<exclusion>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Apache Commons Lang (see exclusions for java-saml) -->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.14.0</version>
</dependency>
<!-- Apache Commons Codec (see exclusions for java-saml and xmlsec) -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>1.16.0</version>
</dependency>
</dependencies>
</project>

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

@@ -38,7 +38,7 @@
</parent>
<properties>
<kotlin.version>1.9.10</kotlin.version>
<kotlin.version>1.9.21</kotlin.version>
</properties>
<dependencies>