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 88d9f40a3d2e31a1d33705599864d174be12d1d0
Merge: 882cb5ea4 c8cb124f8
Author: James Muehlner <[email protected]>
AuthorDate: Fri Oct 28 21:30:19 2022 +0000

    Merge 1.5.0 changes back to master.

 doc/guacamole-example/pom.xml                      |     2 +-
 doc/licenses/apache-commons-codec-1.14/NOTICE      |    18 -
 doc/licenses/apache-commons-codec-1.14/README      |     8 -
 .../apache-commons-codec-1.14/dep-coordinates.txt  |     1 -
 doc/licenses/apache-commons-lang-3.9/NOTICE        |     5 -
 .../apache-commons-lang-3.9/dep-coordinates.txt    |     1 -
 .../NOTICE                                         |     2 +-
 .../README                                         |     2 +-
 .../apache-commons-pool-2.11.1/dep-coordinates.txt |     1 +
 .../apache-commons-pool-2.9.0/dep-coordinates.txt  |     1 -
 .../NOTICE => apache-commons-text-1.9/NOTICE.txt}  |     4 +-
 .../README                                         |     6 +-
 .../apache-commons-text-1.9/dep-coordinates.txt    |     1 +
 doc/licenses/apache-mina-2.1.5/dep-coordinates.txt |     1 -
 .../NOTICE                                         |     0
 .../README                                         |     2 +-
 doc/licenses/apache-mina-2.2.1/dep-coordinates.txt |     1 +
 .../LICENSE.md                                     |     0
 .../README                                         |     0
 .../dep-coordinates.txt                            |     0
 .../bouncycastle-fips-1.0.2.1/dep-coordinates.txt  |     1 -
 .../LICENSE                                        |     0
 .../README                                         |     4 +-
 .../bouncycastle-fips-1.0.2.3/dep-coordinates.txt  |     1 +
 .../datalist-polyfill-1.24.4/dep-coordinates.txt   |     1 -
 .../LICENSE                                        |     0
 .../README                                         |     4 +-
 .../datalist-polyfill-1.25.0/dep-coordinates.txt   |     1 +
 .../directory-api-2.1.0/dep-coordinates.txt        |     1 -
 .../NOTICE                                         |     0
 .../README                                         |     2 +-
 .../directory-api-2.1.2/dep-coordinates.txt        |     1 +
 .../README                                         |     2 +-
 .../error-prone-2.11.0/dep-coordinates.txt         |     1 +
 doc/licenses/error-prone-2.7.1/dep-coordinates.txt |     1 -
 .../{guava-31.0.1-jre => guava-31.1-jre}/README    |     2 +-
 .../dep-coordinates.txt                            |     2 +-
 doc/licenses/guice-5.0.1/dep-coordinates.txt       |     3 -
 doc/licenses/{guice-5.0.1 => guice-5.1.0}/README   |     2 +-
 doc/licenses/guice-5.1.0/dep-coordinates.txt       |     3 +
 .../{jackson-2.13.2 => jackson-2.13.4}/NOTICE      |     0
 .../{jackson-2.13.2 => jackson-2.13.4}/README      |     2 +-
 .../dep-coordinates.txt                            |     8 +-
 .../jackson-databind-2.13.2.1/dep-coordinates.txt  |     1 -
 .../NOTICE                                         |     0
 .../README                                         |     2 +-
 .../jackson-databind-2.13.4.2/dep-coordinates.txt  |     1 +
 doc/licenses/java-saml-2.8.0/dep-coordinates.txt   |     2 -
 .../{java-saml-2.8.0 => java-saml-2.9.0}/LICENSE   |     0
 .../{java-saml-2.8.0 => java-saml-2.9.0}/README    |     4 +-
 doc/licenses/java-saml-2.9.0/dep-coordinates.txt   |     2 +
 doc/licenses/jaxb-2.3.0.1/LICENSE                  |   759 --
 doc/licenses/jaxb-2.3.0.1/README                   |     8 -
 doc/licenses/jaxb-2.3.0.1/dep-coordinates.txt      |     2 -
 doc/licenses/jcommander-1.78/dep-coordinates.txt   |     1 -
 .../{jcommander-1.78 => jcommander-1.82}/NOTICE    |     0
 .../{jcommander-1.78 => jcommander-1.82}/README    |     2 +-
 doc/licenses/jcommander-1.82/dep-coordinates.txt   |     1 +
 doc/licenses/jersey-2.35/dep-coordinates.txt       |     7 -
 .../{jersey-2.35 => jersey-2.37}/LICENSE.md        |     0
 doc/licenses/{jersey-2.35 => jersey-2.37}/README   |     4 +-
 doc/licenses/jersey-2.37/dep-coordinates.txt       |     7 +
 doc/licenses/jose4j-0.7.9/dep-coordinates.txt      |     1 -
 doc/licenses/{jose4j-0.7.9 => jose4j-0.9.1}/NOTICE |     0
 doc/licenses/{jose4j-0.7.9 => jose4j-0.9.1}/README |     2 +-
 doc/licenses/jose4j-0.9.1/dep-coordinates.txt      |     1 +
 doc/licenses/jquery-3.6.0/dep-coordinates.txt      |     1 -
 .../{jquery-3.6.0 => jquery-3.6.1}/LICENSE.txt     |     0
 doc/licenses/{jquery-3.6.0 => jquery-3.6.1}/README |     4 +-
 doc/licenses/jquery-3.6.1/dep-coordinates.txt      |     1 +
 doc/licenses/kotlin-1.5.30/dep-coordinates.txt     |     5 -
 .../{kotlin-1.5.30 => kotlin-1.7.20}/NOTICE.txt    |     0
 .../{kotlin-1.5.30 => kotlin-1.7.20}/README        |     2 +-
 doc/licenses/kotlin-1.7.20/dep-coordinates.txt     |     5 +
 .../dep-coordinates.txt                            |     2 -
 .../NOTICE.txt                                     |     0
 .../README                                         |     2 +-
 .../dep-coordinates.txt                            |     2 +
 doc/licenses/ksm-sdk-16.2.1/dep-coordinates.txt    |     1 -
 .../{ksm-sdk-16.2.1 => ksm-sdk-16.4.0}/LICENSE     |     0
 .../{ksm-sdk-16.2.1 => ksm-sdk-16.4.0}/README      |     4 +-
 doc/licenses/ksm-sdk-16.4.0/dep-coordinates.txt    |     1 +
 doc/licenses/logback-1.2.10/dep-coordinates.txt    |     2 -
 .../{logback-1.2.10 => logback-1.4.4}/LICENSE.txt  |     0
 .../{logback-1.2.10 => logback-1.4.4}/README       |     4 +-
 doc/licenses/logback-1.4.4/dep-coordinates.txt     |     2 +
 .../{mybatis-3.5.9 => mybatis-3.5.11}/NOTICE       |     0
 .../{mybatis-3.5.9 => mybatis-3.5.11}/README       |     2 +-
 doc/licenses/mybatis-3.5.11/dep-coordinates.txt    |     1 +
 doc/licenses/mybatis-3.5.9/dep-coordinates.txt     |     1 -
 .../mybatis-guice-3.10/dep-coordinates.txt         |     1 -
 .../NOTICE                                         |     0
 .../README                                         |     2 +-
 .../mybatis-guice-3.17/dep-coordinates.txt         |     1 +
 doc/licenses/slf4j-api-1.7.32/dep-coordinates.txt  |     2 -
 .../LICENSE.txt                                    |     5 +-
 .../{slf4j-api-1.7.32 => slf4j-api-2.0.3}/README   |     4 +-
 doc/licenses/slf4j-api-2.0.3/dep-coordinates.txt   |     2 +
 doc/licenses/snakeyaml-1.30/dep-coordinates.txt    |     1 -
 .../{snakeyaml-1.30 => snakeyaml-1.31}/README      |     2 +-
 doc/licenses/snakeyaml-1.31/dep-coordinates.txt    |     1 +
 .../spring-framework-5.3.14/dep-coordinates.txt    |     7 -
 .../README                                         |     2 +-
 .../spring-framework-5.3.23/dep-coordinates.txt    |     7 +
 .../spring-security-5.6.1/dep-coordinates.txt      |     3 -
 .../NOTICE                                         |     0
 .../README                                         |     2 +-
 .../spring-security-5.7.4/dep-coordinates.txt      |     3 +
 doc/licenses/zxing-3.4.1/dep-coordinates.txt       |     2 -
 doc/licenses/zxing-3.5.0/AUTHORS                   |   135 +
 doc/licenses/{zxing-3.4.1 => zxing-3.5.0}/NOTICE   |     0
 doc/licenses/{zxing-3.4.1 => zxing-3.5.0}/README   |     4 +-
 doc/licenses/zxing-3.5.0/dep-coordinates.txt       |     2 +
 .../modules/guacamole-auth-jdbc-base/pom.xml       |    25 +-
 extensions/guacamole-auth-json/pom.xml             |     2 +-
 extensions/guacamole-auth-ldap/pom.xml             |    20 +-
 .../modules/guacamole-auth-sso-cas/pom.xml         |     7 +-
 .../modules/guacamole-auth-sso-openid/pom.xml      |     2 +-
 .../modules/guacamole-auth-sso-saml/pom.xml        |    19 +-
 extensions/guacamole-auth-totp/pom.xml             |     4 +-
 .../modules/guacamole-vault-ksm/pom.xml            |    20 +-
 guacamole/src/main/frontend/package-lock.json      | 11352 ++++++++++++++++---
 guacamole/src/main/frontend/package.json           |    26 +-
 pom.xml                                            |    16 +-
 124 files changed, 10398 insertions(+), 2230 deletions(-)

Reply via email to