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 993cde254564def8a50e62a957a39c0771de9e38 Merge: 940c7ad37 7e236daf2 Author: Mike Jumper <[email protected]> AuthorDate: Tue Jul 4 09:11:34 2023 -0700 Merge 1.5.3 changes back to master. doc/guacamole-example/pom.xml | 6 +++--- doc/guacamole-playback-example/pom.xml | 4 ++-- extensions/guacamole-auth-duo/pom.xml | 6 +++--- .../guacamole-auth-duo/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 6 +++--- .../guacamole-auth-header/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml | 8 ++++---- .../guacamole-auth-jdbc/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 | 6 +++--- .../guacamole-auth-json/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-ldap/pom.xml | 6 +++--- .../guacamole-auth-ldap/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 +++--- .../guacamole-auth-radius/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml | 2 +- .../guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml | 4 ++-- .../guacamole-auth-sso-cas/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml | 8 ++++---- .../guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml | 4 ++-- .../guacamole-auth-sso-saml/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-sso/pom.xml | 8 ++++---- extensions/guacamole-auth-totp/pom.xml | 6 +++--- .../guacamole-auth-totp/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-history-recording-storage/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-vault/modules/guacamole-vault-base/pom.xml | 2 +- extensions/guacamole-vault/modules/guacamole-vault-dist/pom.xml | 4 ++-- extensions/guacamole-vault/modules/guacamole-vault-ksm/pom.xml | 6 +++--- .../guacamole-vault-ksm/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-vault/pom.xml | 6 +++--- extensions/pom.xml | 4 ++-- guacamole-common-js/pom.xml | 4 ++-- guacamole-common-js/src/main/webapp/modules/Version.js | 2 +- guacamole-common/pom.xml | 4 ++-- guacamole-ext/pom.xml | 6 +++--- guacamole/pom.xml | 8 ++++---- .../main/java/org/apache/guacamole/extension/ExtensionModule.java | 3 ++- pom.xml | 2 +- 49 files changed, 99 insertions(+), 98 deletions(-) diff --cc extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml index be3b4af6e,001462f6c..70c2f13ed --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml @@@ -56,16 -56,9 +56,16 @@@ <dependency> <groupId>org.apache.guacamole</groupId> <artifactId>guacamole-auth-sso-saml</artifactId> - <version>1.5.2</version> + <version>1.5.3</version> </dependency> + <!-- SSL Authentication Extension --> + <dependency> + <groupId>org.apache.guacamole</groupId> + <artifactId>guacamole-auth-sso-ssl</artifactId> + <version>1.5.2</version> + </dependency> + </dependencies> <build>
