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

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

commit 8c68663aa80d52bb39312e4a13b6d028cfc74063
Merge: 7f7356b33 284353da4
Author: Michael Jumper <mjum...@apache.org>
AuthorDate: Tue Jun 11 11:22:02 2024 -0700

    Merge changes from main branch to next.

 doc/guacamole-example/pom.xml                      |  2 +-
 .../apache-commons-1.16.1/dep-coordinates.txt      |  1 -
 .../NOTICE                                         |  0
 .../README                                         |  2 +-
 .../apache-commons-1.17.0/dep-coordinates.txt      |  1 +
 .../bouncycastle-fips-1.0.2.4/dep-coordinates.txt  |  1 -
 .../LICENSE                                        |  0
 .../README                                         |  4 +-
 .../bouncycastle-fips-1.0.2.5/dep-coordinates.txt  |  1 +
 doc/licenses/jakarta-validation-api-2.1.3/NOTICE   | 11 +++
 doc/licenses/jakarta-validation-api-2.1.3/README   |  8 +++
 .../dep-coordinates.txt                            |  1 +
 .../dep-coordinates.txt                            |  2 -
 .../NOTICE.txt                                     |  0
 .../README                                         |  2 +-
 .../dep-coordinates.txt                            |  2 +
 doc/licenses/ksm-sdk-16.6.3/dep-coordinates.txt    |  1 -
 .../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/LICENSE     |  0
 .../{ksm-sdk-16.6.3 => ksm-sdk-16.6.4}/README      |  4 +-
 doc/licenses/ksm-sdk-16.6.4/dep-coordinates.txt    |  1 +
 doc/licenses/mybatis-3.5.15/dep-coordinates.txt    |  1 -
 .../{mybatis-3.5.15 => mybatis-3.5.16}/NOTICE      |  0
 .../{mybatis-3.5.15 => mybatis-3.5.16}/README      |  2 +-
 doc/licenses/mybatis-3.5.16/dep-coordinates.txt    |  1 +
 .../modules/guacamole-auth-jdbc-base/pom.xml       |  2 +-
 .../modules/guacamole-auth-sso-cas/pom.xml         |  2 +-
 .../modules/guacamole-auth-sso-saml/pom.xml        |  4 +-
 extensions/guacamole-auth-totp/pom.xml             |  2 +-
 .../modules/guacamole-vault-ksm/pom.xml            |  4 +-
 guacamole/src/main/frontend/package-lock.json      | 78 +++++++++++-----------
 guacamole/src/main/frontend/package.json           |  2 +-
 31 files changed, 81 insertions(+), 61 deletions(-)

Reply via email to