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

GUACAMOLE-1859: Update to Apache Directory API v2.1.5.

Browse Source
This commit is contained in:
Mike Jumper
2023-12-02 22:31:46 -08:00
parent d154b406b1
commit dbbe238cb4
27 changed files with 107 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/licenses/apache-commons-1.16.0/NOTICE Normal file
View File

@@ -0,0 +1,5 @@
Apache Commons Codec
Copyright 2002-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

2
doc/licenses/apache-commons-codec-1.15/README → doc/licenses/apache-commons-1.16.0/README
View File

@@ -1,7 +1,7 @@
Apache Commons Codec (http://commons.apache.org/proper/commons-codec/)
-----------------------------------------------------------------------
Version: 1.15
Version: 1.16.0
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

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

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

17
doc/licenses/apache-commons-codec-1.15/NOTICE
View File

@@ -1,17 +0,0 @@
Apache Commons Codec
Copyright 2002-2020 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java
contains test data from http://aspell.net/test/orig/batch0.tab.
Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
===============================================================================
The content of package org.apache.commons.codec.language.bm has been translated
from the original php source code available at http://stevemorse.org/phoneticinfo.htm
with permission from the original authors.
Original source copyright:
Copyright (c) 2008 Alexander Beider & Stephen P. Morse.

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

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

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

@@ -1 +0,0 @@
org.apache.commons:commons-lang3:jar:3.12.0

2
doc/licenses/apache-commons-lang-3.12.0/NOTICE → doc/licenses/apache-commons-lang-3.14.0/NOTICE
View File

@@ -1,5 +1,5 @@
Apache Commons Lang
Copyright 2001-2021 The Apache Software Foundation
Copyright 2001-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

2
doc/licenses/apache-commons-lang-3.12.0/README → doc/licenses/apache-commons-lang-3.14.0/README
View File

@@ -1,7 +1,7 @@
Apache Commons Lang (http://commons.apache.org/proper/commons-lang/)
--------------------------------------------------------------------
Version: 3.12.0
Version: 3.14.0
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

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

@@ -0,0 +1 @@
org.apache.commons:commons-lang3:jar:3.14.0

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

@@ -1 +0,0 @@
org.apache.commons:commons-pool2:jar:2.11.1

2
doc/licenses/apache-commons-pool-2.11.1/NOTICE → doc/licenses/apache-commons-pool-2.12.0/NOTICE
View File

@@ -1,5 +1,5 @@
Apache Commons Pool
Copyright 2001-2021 The Apache Software Foundation
Copyright 2001-2023 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (https://www.apache.org/).

2
doc/licenses/apache-commons-pool-2.11.1/README → doc/licenses/apache-commons-pool-2.12.0/README
View File

@@ -1,7 +1,7 @@
Apache Commons Pool (http://commons.apache.org/proper/commons-pool/)
--------------------------------------------------------------------
Version: 2.11.1
Version: 2.12.0
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

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

@@ -0,0 +1 @@
org.apache.commons:commons-pool2:jar:2.12.0

1
doc/licenses/apache-mina-2.2.2/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.apache.mina:mina-core:jar:2.2.2

0
doc/licenses/apache-mina-2.2.2/NOTICE → doc/licenses/apache-mina-2.2.3/NOTICE
View File

2
doc/licenses/apache-mina-2.2.2/README → doc/licenses/apache-mina-2.2.3/README
View File

@@ -1,7 +1,7 @@
Apache Mina (https://mina.apache.org/)
--------------------------------------
Version: 2.2.2
Version: 2.2.3
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

1
doc/licenses/apache-mina-2.2.3/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.apache.mina:mina-core:jar:2.2.3

1
doc/licenses/directory-api-2.1.4/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.apache.directory.api:api-all:jar:2.1.4

0
doc/licenses/directory-api-2.1.4/NOTICE → doc/licenses/directory-api-2.1.5/NOTICE
View File

2
doc/licenses/directory-api-2.1.4/README → doc/licenses/directory-api-2.1.5/README
View File

@@ -1,7 +1,7 @@
Apache Directory LDAP API (http://directory.apache.org)
-------------------------------------------------------
Version: 2.1.4
Version: 2.1.5
From: 'Apache Software Foundation' (https://www.apache.org/)
License(s):
Apache v2.0

1
doc/licenses/directory-api-2.1.5/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.apache.directory.api:api-all:jar:2.1.5

1
doc/licenses/snakeyaml-2.0/dep-coordinates.txt
View File

@@ -1 +0,0 @@
org.yaml:snakeyaml:jar:2.0

2
doc/licenses/snakeyaml-2.0/README → doc/licenses/snakeyaml-2.2/README
View File

@@ -1,7 +1,7 @@
SnakeYAML (https://bitbucket.org/snakeyaml/snakeyaml/
-----------------------------------------------------
Version: 2.0
Version: 2.2
From: 'Andrey Somov' (https://bitbucket.org/asomov/)
License(s):
Apache v2.0

1
doc/licenses/snakeyaml-2.2/dep-coordinates.txt Normal file
View File

@@ -0,0 +1 @@
org.yaml:snakeyaml:jar:2.2

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>

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

@@ -94,21 +94,70 @@
<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 -->
<!-- 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>