This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 9f176ed489898e0a8ece10ac1d4e1702679bbc7b Merge: 6721f20b9 5966dcae6 Author: Mike Jumper <[email protected]> AuthorDate: Tue Jan 10 21:52:26 2023 -0800 Merge 1.5.0 changes back to master. doc/guacamole-example/pom.xml | 8 +- doc/guacamole-playback-example/pom.xml | 4 +- .../{jackson-2.14.0 => jackson-2.14.1}/NOTICE | 0 .../{jackson-2.14.0 => jackson-2.14.1}/README | 2 +- .../dep-coordinates.txt | 8 +- .../jackson-databind-2.14.0/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../jackson-databind-2.14.1/dep-coordinates.txt | 1 + .../javassist-3.25.0-ga/dep-coordinates.txt | 1 - .../README | 2 +- .../javassist-3.29.0-ga/dep-coordinates.txt | 1 + doc/licenses/jersey-2.37/dep-coordinates.txt | 7 - .../{jersey-2.37 => jersey-2.38}/LICENSE.md | 0 doc/licenses/{jersey-2.37 => jersey-2.38}/README | 4 +- doc/licenses/jersey-2.38/dep-coordinates.txt | 7 + doc/licenses/jquery-3.6.1/README | 4 +- doc/licenses/jquery-3.6.1/dep-coordinates.txt | 2 +- doc/licenses/kotlin-1.7.20/dep-coordinates.txt | 5 - .../{kotlin-1.7.20 => kotlin-1.8.0}/NOTICE.txt | 0 .../{kotlin-1.7.20 => kotlin-1.8.0}/README | 2 +- doc/licenses/kotlin-1.8.0/dep-coordinates.txt | 5 + doc/licenses/logback-1.3.4/dep-coordinates.txt | 2 - .../{logback-1.3.4 => logback-1.3.5}/LICENSE.txt | 0 .../{logback-1.3.4 => logback-1.3.5}/README | 4 +- doc/licenses/logback-1.3.5/dep-coordinates.txt | 2 + .../mybatis-guice-3.17/dep-coordinates.txt | 1 - .../NOTICE | 0 .../README | 2 +- .../mybatis-guice-3.18/dep-coordinates.txt | 1 + doc/licenses/slf4j-api-2.0.3/dep-coordinates.txt | 2 - .../LICENSE.txt | 0 .../{slf4j-api-2.0.3 => slf4j-api-2.0.6}/README | 4 +- doc/licenses/slf4j-api-2.0.6/dep-coordinates.txt | 2 + .../spring-framework-5.3.23/dep-coordinates.txt | 7 - .../README | 2 +- .../spring-framework-5.3.24/dep-coordinates.txt | 7 + .../spring-security-5.7.5/dep-coordinates.txt | 3 - .../NOTICE | 0 .../README | 2 +- .../spring-security-5.8.1/dep-coordinates.txt | 3 + extensions/guacamole-auth-duo/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-base/pom.xml | 4 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 8 +- .../modules/guacamole-auth-jdbc-mysql/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-postgresql/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 6 +- extensions/guacamole-auth-json/pom.xml | 8 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-ldap/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-quickconnect/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-radius/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-base/pom.xml | 2 +- .../modules/guacamole-auth-sso-cas/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-dist/pom.xml | 8 +- .../modules/guacamole-auth-sso-openid/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-sso-saml/pom.xml | 4 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-sso/pom.xml | 8 +- extensions/guacamole-auth-totp/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- .../guacamole-history-recording-storage/pom.xml | 6 +- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-vault-base/pom.xml | 2 +- .../modules/guacamole-vault-dist/pom.xml | 4 +- .../modules/guacamole-vault-ksm/pom.xml | 8 +- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-vault/pom.xml | 6 +- extensions/pom.xml | 4 +- guacamole-common-js/pom.xml | 4 +- .../src/main/webapp/modules/Version.js | 2 +- guacamole-common/pom.xml | 4 +- guacamole-ext/pom.xml | 6 +- guacamole/pom.xml | 8 +- guacamole/src/main/frontend/package-lock.json | 678 +++++++++++++++------ guacamole/src/main/frontend/package.json | 6 +- .../guacamole/extension/ExtensionModule.java | 3 +- pom.xml | 12 +- 90 files changed, 638 insertions(+), 359 deletions(-)
