You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2022/11/09 23:56:09 UTC
[guacamole-client] 01/01: Merge changes from 1.5.0 back to master.
This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 2f6687cd780bc22212e5256a1d28046b757b6ad1
Merge: 88d9f40a3 1fc475ad3
Author: James Muehlner <ja...@guac-dev.org>
AuthorDate: Wed Nov 9 23:55:35 2022 +0000
Merge changes from 1.5.0 back to master.
.../NOTICE.txt | 2 +-
.../README | 2 +-
.../apache-commons-text-1.10.0/dep-coordinates.txt | 1 +
doc/licenses/apache-commons-text-1.9/dep-coordinates.txt | 1 -
doc/licenses/{jackson-2.13.4 => jackson-2.14.0}/NOTICE | 0
doc/licenses/{jackson-2.13.4 => jackson-2.14.0}/README | 2 +-
.../{jackson-2.13.4 => jackson-2.14.0}/dep-coordinates.txt | 8 ++++----
doc/licenses/jackson-databind-2.13.4.2/dep-coordinates.txt | 1 -
.../NOTICE | 0
.../README | 2 +-
doc/licenses/jackson-databind-2.14.0/dep-coordinates.txt | 1 +
doc/licenses/snakeyaml-1.31/dep-coordinates.txt | 1 -
doc/licenses/{snakeyaml-1.31 => snakeyaml-1.33}/README | 2 +-
doc/licenses/snakeyaml-1.33/dep-coordinates.txt | 1 +
doc/licenses/spring-security-5.7.4/dep-coordinates.txt | 3 ---
.../NOTICE | 0
.../README | 2 +-
doc/licenses/spring-security-5.7.5/dep-coordinates.txt | 3 +++
extensions/guacamole-auth-json/pom.xml | 2 +-
extensions/guacamole-auth-ldap/pom.xml | 14 ++++++++++++++
pom.xml | 4 ++--
21 files changed, 33 insertions(+), 19 deletions(-)