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 b9806488087f2afe1789d6a2640123b9c893eb1b
Merge: 7e8989581 8a319eb90
Author: James Muehlner <[email protected]>
AuthorDate: Mon Apr 3 21:40:44 2023 +0000

    Merge 1.5.1 changes back to master.

 .../datalist-polyfill-1.25.0/dep-coordinates.txt   |   1 -
 .../LICENSE                                        |   0
 .../README                                         |   4 +-
 .../datalist-polyfill-1.25.1/dep-coordinates.txt   |   1 +
 .../{jackson-2.14.1 => jackson-2.14.2}/NOTICE      |   0
 .../{jackson-2.14.1 => jackson-2.14.2}/README      |   2 +-
 .../dep-coordinates.txt                            |   8 +-
 .../jackson-databind-2.14.1/dep-coordinates.txt    |   1 -
 .../NOTICE                                         |   0
 .../README                                         |   2 +-
 .../jackson-databind-2.14.2/dep-coordinates.txt    |   1 +
 doc/licenses/jersey-2.38/dep-coordinates.txt       |   7 -
 .../{jersey-2.38 => jersey-2.39}/LICENSE.md        |   0
 doc/licenses/{jersey-2.38 => jersey-2.39}/README   |   2 +-
 doc/licenses/jersey-2.39/dep-coordinates.txt       |   7 +
 doc/licenses/jose4j-0.9.1/README                   |   2 +-
 doc/licenses/jose4j-0.9.1/dep-coordinates.txt      |   2 +-
 doc/licenses/jquery-3.6.1/dep-coordinates.txt      |   1 -
 .../{jquery-3.6.1 => jquery-3.6.4}/LICENSE.txt     |   0
 doc/licenses/{jquery-3.6.1 => jquery-3.6.4}/README |   4 +-
 doc/licenses/jquery-3.6.4/dep-coordinates.txt      |   1 +
 doc/licenses/kotlin-1.8.0/NOTICE.txt               |   2 -
 doc/licenses/kotlin-1.8.0/dep-coordinates.txt      |   5 -
 doc/licenses/kotlin-1.8.20/NOTICE.txt              |   2 +
 .../{kotlin-1.8.0 => kotlin-1.8.20}/README         |   2 +-
 doc/licenses/kotlin-1.8.20/dep-coordinates.txt     |   5 +
 doc/licenses/ksm-sdk-16.4.0/dep-coordinates.txt    |   1 -
 .../{ksm-sdk-16.4.0 => ksm-sdk-16.5.2}/LICENSE     |   0
 .../{ksm-sdk-16.4.0 => ksm-sdk-16.5.2}/README      |   4 +-
 doc/licenses/ksm-sdk-16.5.2/dep-coordinates.txt    |   1 +
 doc/licenses/logback-1.3.5/dep-coordinates.txt     |   2 -
 .../{logback-1.3.5 => logback-1.3.6}/LICENSE.txt   |   0
 .../{logback-1.3.5 => logback-1.3.6}/README        |   4 +-
 doc/licenses/logback-1.3.6/dep-coordinates.txt     |   2 +
 doc/licenses/mybatis-3.5.11/dep-coordinates.txt    |   1 -
 .../{mybatis-3.5.11 => mybatis-3.5.13}/NOTICE      |   0
 .../{mybatis-3.5.11 => mybatis-3.5.13}/README      |   2 +-
 doc/licenses/mybatis-3.5.13/dep-coordinates.txt    |   1 +
 doc/licenses/slf4j-api-2.0.6/dep-coordinates.txt   |   2 -
 .../LICENSE.txt                                    |   0
 .../{slf4j-api-2.0.6 => slf4j-api-2.0.7}/README    |   4 +-
 doc/licenses/slf4j-api-2.0.7/dep-coordinates.txt   |   2 +
 .../spring-framework-5.3.24/dep-coordinates.txt    |   7 -
 .../README                                         |   2 +-
 .../spring-framework-5.3.25/dep-coordinates.txt    |   7 +
 .../spring-security-5.8.1/dep-coordinates.txt      |   3 -
 .../NOTICE                                         |   0
 .../README                                         |   2 +-
 .../spring-security-5.8.2/dep-coordinates.txt      |   3 +
 doc/licenses/zxing-3.5.0/dep-coordinates.txt       |   2 -
 doc/licenses/{zxing-3.5.0 => zxing-3.5.1}/AUTHORS  |   0
 doc/licenses/{zxing-3.5.0 => zxing-3.5.1}/NOTICE   |   0
 doc/licenses/{zxing-3.5.0 => zxing-3.5.1}/README   |   4 +-
 doc/licenses/zxing-3.5.1/dep-coordinates.txt       |   2 +
 .../modules/guacamole-auth-jdbc-base/pom.xml       |   2 +-
 extensions/guacamole-auth-json/pom.xml             |   2 +-
 .../modules/guacamole-auth-sso-openid/pom.xml      |   2 +-
 extensions/guacamole-auth-totp/pom.xml             |   4 +-
 .../modules/guacamole-vault-ksm/pom.xml            |   4 +-
 guacamole/src/main/frontend/package-lock.json      | 433 ++++++++++++---------
 guacamole/src/main/frontend/package.json           |   4 +-
 pom.xml                                            |  12 +-
 62 files changed, 324 insertions(+), 259 deletions(-)

Reply via email to