You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2023/05/17 23:57:53 UTC
[guacamole-client] branch master updated (ff033426a -> f355c5cfe)
This is an automated email from the ASF dual-hosted git repository.
jmuehlner pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from ff033426a GUACAMOLE-1789: Merge remove duplicate definition of SQLSERVER_BATCH_SIZE.
add 0631ff968 GUACAMOLE-1785: Bump version numbers to 1.5.2.
add 15d41cd8e GUACAMOLE-1785: Merge version number bump to 1.5.2.
new f355c5cfe Merge 1.5.2 changes back to master.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
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(-)
[guacamole-client] 01/01: Merge 1.5.2 changes back to master.
Posted by jm...@apache.org.
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 f355c5cfeeda75fc986fa78e734b22eff97adfcf
Merge: ff033426a 15d41cd8e
Author: James Muehlner <ja...@guac-dev.org>
AuthorDate: Wed May 17 23:57:32 2023 +0000
Merge 1.5.2 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 2ee745cb5,1e10fb5a8..e042bb296
--- 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.1</version>
+ <version>1.5.2</version>
</dependency>
+ <!-- SSL Authentication Extension -->
+ <dependency>
+ <groupId>org.apache.guacamole</groupId>
+ <artifactId>guacamole-auth-sso-ssl</artifactId>
+ <version>1.5.1</version>
+ </dependency>
+
</dependencies>
<build>