You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by vn...@apache.org on 2023/04/10 14:23:33 UTC

[guacamole-client] branch master updated (8e9731741 -> 56c6e5022)

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

vnick pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git


    from 8e9731741 GUACAMOLE-1253: Merge batching of large SQL queries.
     add 0b4468ba2 GUACAMOLE-1752: Bump version numbers to 1.5.1.
     add 9ae0c9885 GUACAMOLE-1752: Merge bump version numbers to 1.5.1.
     new 56c6e5022 Merge 1.5.1 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.1 changes back to master.

Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 56c6e5022d3d0b6310bcc0f8d59d1a47d1f9ad57
Merge: 8e9731741 9ae0c9885
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Mon Apr 10 10:22:47 2023 -0400

    Merge 1.5.1 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 7bbbd1f70,cf9118b66..1a0020f64
--- 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.0</version>
+             <version>1.5.1</version>
          </dependency>
  
 +        <!-- SSL Authentication Extension -->
 +        <dependency>
 +            <groupId>org.apache.guacamole</groupId>
 +            <artifactId>guacamole-auth-sso-ssl</artifactId>
 +            <version>1.5.0</version>
 +        </dependency>
 +
      </dependencies>
  
      <build>