This is an automated email from the ASF dual-hosted git repository.

vnick pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git

commit 20eec4bbb0df884cc89b06e12093a0eae5c441ed
Merge: 881d203 52d10b2
Author: Virtually Nick <[email protected]>
AuthorDate: Mon Dec 27 09:32:39 2021 -0500

    Merge 1.4.0 changes back to master.

 doc/guacamole-example/pom.xml                      |    2 +-
 .../angular-translate-2.18.4/dep-coordinates.txt   |    3 -
 .../LICENSE                                        |    0
 .../README                                         |    4 +-
 .../angular-translate-2.19.0/dep-coordinates.txt   |    3 +
 .../apache-commons-lang-3.11/dep-coordinates.txt   |    1 -
 .../NOTICE                                         |    4 +-
 .../README                                         |    2 +-
 .../apache-commons-lang-3.12.0/dep-coordinates.txt |    1 +
 .../dep-coordinates.txt                            |    1 -
 .../NOTICE                                         |    2 +-
 .../README                                         |    2 +-
 .../apache-commons-logging-1.2/dep-coordinates.txt |    1 +
 .../apache-commons-pool-2.8.0/dep-coordinates.txt  |    1 -
 .../NOTICE                                         |    2 +-
 .../README                                         |    2 +-
 .../apache-commons-pool-2.9.0/dep-coordinates.txt  |    1 +
 doc/licenses/apache-mina-2.1.3/dep-coordinates.txt |    1 -
 .../NOTICE                                         |    0
 .../README                                         |    2 +-
 doc/licenses/apache-mina-2.1.5/dep-coordinates.txt |    1 +
 .../apache-santuario-2.2.0/dep-coordinates.txt     |    1 -
 .../NOTICE                                         |    2 +-
 .../README                                         |    2 +-
 .../apache-santuario-2.2.3/dep-coordinates.txt     |    1 +
 .../blob-polyfill-5.0.20210201/dep-coordinates.txt |    1 -
 .../LICENSE.md                                     |    0
 .../README                                         |    4 +-
 .../blob-polyfill-6.0.20211015/dep-coordinates.txt |    1 +
 doc/licenses/bouncycastle-1.66/dep-coordinates.txt |    2 -
 .../LICENSE                                        |    2 +-
 .../README                                         |    4 +-
 doc/licenses/bouncycastle-1.70/dep-coordinates.txt |    3 +
 doc/licenses/cas-client-3.6.2/dep-coordinates.txt  |    1 -
 .../{cas-client-3.6.2 => cas-client-3.6.4}/NOTICE  |    0
 .../{cas-client-3.6.2 => cas-client-3.6.4}/README  |    2 +-
 doc/licenses/cas-client-3.6.4/dep-coordinates.txt  |    1 +
 .../LICENSE.txt                                    |    0
 .../README                                         |    4 +-
 .../checker-qual-3.12.0/dep-coordinates.txt        |    1 +
 .../checker-qual-3.8.0/dep-coordinates.txt         |    1 -
 .../directory-api-2.0.1/dep-coordinates.txt        |    1 -
 .../NOTICE                                         |    2 +-
 .../README                                         |    2 +-
 .../directory-api-2.1.0/dep-coordinates.txt        |    1 +
 doc/licenses/{dom4j-2.1.1 => dom4j-2.1.3}/LICENSE  |    0
 doc/licenses/{dom4j-2.1.1 => dom4j-2.1.3}/README   |    4 +-
 .../dep-coordinates.txt                            |    2 +-
 doc/licenses/error-prone-2.5.1/dep-coordinates.txt |    1 -
 .../README                                         |    2 +-
 doc/licenses/error-prone-2.7.1/dep-coordinates.txt |    1 +
 .../{guava-30.1.1-jre => guava-31.0.1-jre}/README  |    2 +-
 .../dep-coordinates.txt                            |    2 +-
 doc/licenses/jackson-2.12.2/dep-coordinates.txt    |    5 -
 .../{jackson-2.12.2 => jackson-2.13.1}/NOTICE      |    0
 .../{jackson-2.12.2 => jackson-2.13.1}/README      |    2 +-
 doc/licenses/jackson-2.13.1/dep-coordinates.txt    |    4 +
 doc/licenses/jakarta-activation-1.2.2/LICENSE.md   |   29 +
 doc/licenses/jakarta-activation-1.2.2/README       |    8 +
 .../jakarta-activation-1.2.2/dep-coordinates.txt   |    1 +
 doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md         |   28 +
 doc/licenses/jakarta-jaxb-2.3.3/README             |    8 +
 .../jakarta-jaxb-2.3.3/dep-coordinates.txt         |    3 +
 doc/licenses/java-saml-2.6.0/dep-coordinates.txt   |    2 -
 .../{java-saml-2.6.0 => java-saml-2.8.0}/LICENSE   |    0
 .../{java-saml-2.6.0 => java-saml-2.8.0}/README    |    4 +-
 doc/licenses/java-saml-2.8.0/dep-coordinates.txt   |    2 +
 doc/licenses/javaee-activation-1.2.0/LICENSE.txt   |  759 +++++++++++++
 doc/licenses/javaee-activation-1.2.0/README        |    8 +
 .../javaee-activation-1.2.0/dep-coordinates.txt    |    1 +
 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/jaxb-api-2.3.1/LICENSE.txt            |  274 +++++
 doc/licenses/jaxb-api-2.3.1/README                 |    8 +
 doc/licenses/jaxb-api-2.3.1/dep-coordinates.txt    |    1 +
 doc/licenses/jaxb-istack-commons-3.0.5/Licence.txt |  274 +++++
 doc/licenses/jaxb-istack-commons-3.0.5/README      |    8 +
 .../jaxb-istack-commons-3.0.5/dep-coordinates.txt  |    1 +
 doc/licenses/jersey-2.34/dep-coordinates.txt       |    7 -
 .../{jersey-2.34 => jersey-2.35}/LICENSE.md        |    0
 doc/licenses/{jersey-2.34 => jersey-2.35}/README   |    4 +-
 doc/licenses/jersey-2.35/dep-coordinates.txt       |    7 +
 doc/licenses/jose4j-0.7.6/dep-coordinates.txt      |    1 -
 doc/licenses/{jose4j-0.7.6 => jose4j-0.7.9}/NOTICE |    0
 doc/licenses/{jose4j-0.7.6 => jose4j-0.7.9}/README |    2 +-
 doc/licenses/jose4j-0.7.9/dep-coordinates.txt      |    1 +
 .../{logback-1.2.3 => logback-1.2.10}/LICENSE.txt  |    0
 .../{logback-1.2.3 => logback-1.2.10}/README       |    4 +-
 doc/licenses/logback-1.2.10/dep-coordinates.txt    |    2 +
 doc/licenses/logback-1.2.3/dep-coordinates.txt     |    2 -
 doc/licenses/mybatis-3.5.6/dep-coordinates.txt     |    1 -
 .../{mybatis-3.5.6 => mybatis-3.5.9}/NOTICE        |    0
 .../{mybatis-3.5.6 => mybatis-3.5.9}/README        |    2 +-
 doc/licenses/mybatis-3.5.9/dep-coordinates.txt     |    1 +
 doc/licenses/pickr-1.8.1/dep-coordinates.txt       |    1 -
 doc/licenses/{pickr-1.8.1 => pickr-1.8.2}/LICENSE  |    2 +-
 doc/licenses/{pickr-1.8.1 => pickr-1.8.2}/README   |    4 +-
 doc/licenses/pickr-1.8.2/dep-coordinates.txt       |    1 +
 doc/licenses/slf4j-api-1.7.30/dep-coordinates.txt  |    2 -
 .../LICENSE.txt                                    |    0
 .../{slf4j-api-1.7.30 => slf4j-api-1.7.32}/README  |    4 +-
 doc/licenses/slf4j-api-1.7.32/dep-coordinates.txt  |    2 +
 .../spring-framework-5.2.13/dep-coordinates.txt    |    7 -
 .../README                                         |    2 +-
 .../spring-framework-5.3.14/dep-coordinates.txt    |    7 +
 .../spring-security-5.4.5/dep-coordinates.txt      |    2 -
 .../NOTICE                                         |    0
 .../README                                         |    2 +-
 .../spring-security-5.6.1/dep-coordinates.txt      |    3 +
 .../modules/guacamole-auth-jdbc-base/pom.xml       |    2 +-
 extensions/guacamole-auth-json/pom.xml             |    2 +-
 extensions/guacamole-auth-ldap/pom.xml             |   16 +-
 extensions/guacamole-auth-radius/pom.xml           |    2 +-
 .../modules/guacamole-auth-sso-cas/pom.xml         |   20 +-
 .../modules/guacamole-auth-sso-openid/pom.xml      |    2 +-
 .../modules/guacamole-auth-sso-saml/pom.xml        |    2 +-
 guacamole/pom.xml                                  |   32 +-
 guacamole/src/main/frontend/package-lock.json      | 1113 +++++++++-----------
 pom.xml                                            |   12 +-
 120 files changed, 2851 insertions(+), 713 deletions(-)

Reply via email to