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 dbbc7553f76b9787b22c09e2d8efd9d3d6a39ab1 Merge: e46d06e6b e7e78f05b Author: James Muehlner <[email protected]> AuthorDate: Tue Jul 11 18:29:50 2023 +0000 Merge 1.5.3 changes back to master. Dockerfile | 5 + doc/guacamole-example/pom.xml | 2 +- .../checker-qual-3.12.0/dep-coordinates.txt | 1 - .../LICENSE.txt | 0 .../README | 4 +- .../checker-qual-3.33.0/dep-coordinates.txt | 1 + .../directory-api-2.1.2/dep-coordinates.txt | 1 - .../NOTICE | 2 +- .../README | 2 +- .../directory-api-2.1.3/dep-coordinates.txt | 1 + doc/licenses/{dom4j-2.1.3 => dom4j-2.1.4}/LICENSE | 12 +-- doc/licenses/{dom4j-2.1.3 => dom4j-2.1.4}/README | 4 +- .../dep-coordinates.txt | 2 +- .../error-prone-2.11.0/dep-coordinates.txt | 1 - .../README | 2 +- .../error-prone-2.18.0/dep-coordinates.txt | 1 + .../{guava-31.1-jre => guava-32.1.1-jre}/README | 2 +- .../dep-coordinates.txt | 2 +- .../j2objc-annotations-1.3/dep-coordinates.txt | 1 - .../README | 2 +- .../j2objc-annotations-2.8/dep-coordinates.txt | 1 + .../{jackson-2.15.0 => jackson-2.15.2}/NOTICE | 0 .../{jackson-2.15.0 => jackson-2.15.2}/README | 2 +- .../dep-coordinates.txt | 8 +- .../jackson-databind-2.15.0/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../jackson-databind-2.15.2/dep-coordinates.txt | 1 + .../javassist-3.29.0-ga/dep-coordinates.txt | 1 - .../README | 2 +- .../javassist-3.29.2-ga/dep-coordinates.txt | 1 + doc/licenses/jersey-2.39.1/dep-coordinates.txt | 7 -- .../{jersey-2.39.1 => jersey-2.40}/LICENSE.md | 0 doc/licenses/{jersey-2.39.1 => jersey-2.40}/README | 4 +- doc/licenses/jersey-2.40/dep-coordinates.txt | 7 ++ doc/licenses/kotlin-1.8.20/dep-coordinates.txt | 5 - .../{kotlin-1.8.20 => kotlin-1.9.0}/NOTICE.txt | 0 .../{kotlin-1.8.20 => kotlin-1.9.0}/README | 2 +- doc/licenses/kotlin-1.9.0/dep-coordinates.txt | 5 + doc/licenses/ksm-sdk-16.5.3/dep-coordinates.txt | 1 - .../{ksm-sdk-16.5.3 => ksm-sdk-16.5.4}/LICENSE | 0 .../{ksm-sdk-16.5.3 => ksm-sdk-16.5.4}/README | 4 +- doc/licenses/ksm-sdk-16.5.4/dep-coordinates.txt | 1 + doc/licenses/logback-1.3.7/dep-coordinates.txt | 2 - .../{logback-1.3.7 => logback-1.3.8}/LICENSE.txt | 0 .../{logback-1.3.7 => logback-1.3.8}/README | 4 +- doc/licenses/logback-1.3.8/dep-coordinates.txt | 2 + extensions/guacamole-auth-ldap/pom.xml | 32 +------ .../modules/guacamole-vault-ksm/pom.xml | 4 +- guacamole-docker/bin/build-guacamole.sh | 15 +-- pom.xml | 104 +++++++++++++++++++-- 51 files changed, 164 insertions(+), 102 deletions(-)
