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 2025/12/27 00:36:46 UTC
(guacamole-client) branch main updated (a6719b109 -> 8df2d3d8a)
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
from a6719b109 Merge patch branch changes to main.
add d5b33778b GUACAMOLE-2139: Bump version number to 1.6.1.
add 10f606c41 GUACAMOLE-2139: Automatically set expected Guacamole version of extensions in build.
add 451f5aad9 GUACAMOLE-2139: Automatically set Guacamole.API_VERSION.
add 563bd9cb1 GUACAMOLE-2139: Automatically determine extension compatibility.
add 87371e608 GUACAMOLE-2139: Inherit guacamole-client version via "revision" property (supported since Maven 3.5.0).
add 8fe49c3ab GUACAMOLE-2139: Ensure properties like "revision" remain safe for downstream use.
add cb4e254c1 GUACAMOLE-2139: Merge bump version numbers to 1.6.1.
add 2645cffe5 Merge 1.6.1 changes to patch.
new 8df2d3d8a Merge patch branch changes to main.
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:
.gitignore | 1 +
doc/guacamole-example/pom.xml | 6 +-
doc/guacamole-playback-example/pom.xml | 4 +-
extensions/guacamole-auth-ban/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-duo/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-header/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-base/pom.xml | 3 +-
.../modules/guacamole-auth-jdbc-dist/pom.xml | 8 +-
.../modules/guacamole-auth-jdbc-mysql/pom.xml | 5 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-postgresql/pom.xml | 5 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 5 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-jdbc/pom.xml | 18 +--
extensions/guacamole-auth-json/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-ldap/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-quickconnect/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-radius/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-restrict/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-base/pom.xml | 2 +-
.../modules/guacamole-auth-sso-cas/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-dist/pom.xml | 10 +-
.../modules/guacamole-auth-sso-openid/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-saml/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-ssl/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-sso/pom.xml | 14 +-
extensions/guacamole-auth-totp/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-display-statistics/pom.xml | 4 +-
.../guac-manifest.json | 2 +-
.../guacamole-history-recording-storage/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-vault-base/pom.xml | 3 +-
.../modules/guacamole-vault-dist/pom.xml | 4 +-
.../modules/guacamole-vault-ksm/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-vault/pom.xml | 18 +--
extensions/pom.xml | 18 ++-
guacamole-common-js/pom.xml | 56 +++++++-
.../modules/Version.js | 2 +-
guacamole-common-js/static.xml | 2 +-
guacamole-common/pom.xml | 4 +-
guacamole-ext/pom.xml | 7 +-
guacamole/pom.xml | 15 +-
.../guacamole/extension/GuacamoleVersion.java | 159 +++++++++++++++++++++
.../guacamole/extension/ExtensionModule.java | 42 +-----
.../guacamole/extension/GuacamoleVersionTest.java | 150 +++++++++++++++++++
pom.xml | 79 +++++++++-
61 files changed, 538 insertions(+), 222 deletions(-)
rename extensions/guacamole-auth-ban/src/main/{resources => resource-templates}/guac-manifest.json (87%)
rename extensions/guacamole-auth-duo/src/main/{resources => resource-templates}/guac-manifest.json (92%)
rename extensions/guacamole-auth-header/src/main/{resources => resource-templates}/guac-manifest.json (80%)
rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-auth-json/src/main/{resources => resource-templates}/guac-manifest.json (83%)
rename extensions/guacamole-auth-ldap/src/main/{resources => resource-templates}/guac-manifest.json (85%)
rename extensions/guacamole-auth-quickconnect/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-auth-radius/src/main/{resources => resource-templates}/guac-manifest.json (92%)
rename extensions/guacamole-auth-restrict/src/main/{resources => resource-templates}/guac-manifest.json (92%)
rename extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/{resources => resource-templates}/guac-manifest.json (93%)
rename extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-auth-sso/modules/guacamole-auth-sso-ssl/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-auth-totp/src/main/{resources => resource-templates}/guac-manifest.json (94%)
rename extensions/guacamole-display-statistics/src/main/{resources => resource-templates}/guac-manifest.json (90%)
rename extensions/guacamole-history-recording-storage/src/main/{resources => resource-templates}/guac-manifest.json (87%)
rename extensions/guacamole-vault/modules/guacamole-vault-ksm/src/main/{resources => resource-templates}/guac-manifest.json (85%)
rename guacamole-common-js/src/main/{webapp => webapp-templates}/modules/Version.js (96%)
create mode 100644 guacamole/src/main/java-templates/org/apache/guacamole/extension/GuacamoleVersion.java
create mode 100644 guacamole/src/test/java/org/apache/guacamole/extension/GuacamoleVersionTest.java
(guacamole-client) 01/01: Merge patch branch changes to main.
Posted by vn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
vnick pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 8df2d3d8a6b1d92ecb41f7431e2efc8828e433b5
Merge: a6719b109 2645cffe5
Author: Virtually Nick <vn...@apache.org>
AuthorDate: Fri Dec 26 19:36:30 2025 -0500
Merge patch branch changes to main.
.gitignore | 1 +
doc/guacamole-example/pom.xml | 6 +-
doc/guacamole-playback-example/pom.xml | 4 +-
extensions/guacamole-auth-ban/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-duo/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-header/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-base/pom.xml | 3 +-
.../modules/guacamole-auth-jdbc-dist/pom.xml | 8 +-
.../modules/guacamole-auth-jdbc-mysql/pom.xml | 5 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-postgresql/pom.xml | 5 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 5 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-jdbc/pom.xml | 18 +--
extensions/guacamole-auth-json/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-ldap/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-quickconnect/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-radius/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-restrict/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-base/pom.xml | 2 +-
.../modules/guacamole-auth-sso-cas/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-dist/pom.xml | 10 +-
.../modules/guacamole-auth-sso-openid/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-saml/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-auth-sso-ssl/pom.xml | 3 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-auth-sso/pom.xml | 14 +-
extensions/guacamole-auth-totp/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-display-statistics/pom.xml | 4 +-
.../guac-manifest.json | 2 +-
.../guacamole-history-recording-storage/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
.../modules/guacamole-vault-base/pom.xml | 3 +-
.../modules/guacamole-vault-dist/pom.xml | 4 +-
.../modules/guacamole-vault-ksm/pom.xml | 6 +-
.../guac-manifest.json | 2 +-
extensions/guacamole-vault/pom.xml | 18 +--
extensions/pom.xml | 18 ++-
guacamole-common-js/pom.xml | 56 +++++++-
.../modules/Version.js | 2 +-
guacamole-common-js/static.xml | 2 +-
guacamole-common/pom.xml | 4 +-
guacamole-ext/pom.xml | 7 +-
guacamole/pom.xml | 15 +-
.../guacamole/extension/GuacamoleVersion.java | 159 +++++++++++++++++++++
.../guacamole/extension/ExtensionModule.java | 42 +-----
.../guacamole/extension/GuacamoleVersionTest.java | 150 +++++++++++++++++++
pom.xml | 79 +++++++++-
61 files changed, 538 insertions(+), 222 deletions(-)