You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2020/02/27 19:13:53 UTC
[guacamole-client] branch master updated (15182b8 -> 521990d)
This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/guacamole-client.git.
from 15182b8 Merge staging/1.2.0 changes back to master.
add 211f8e2 GUACAMOLE-966: Bump client version numbers to 1.2.0
add 1cf6ff0 GUACAMOLE-966: Merge changes bumping applicable version numbers to 1.2.0.
new 521990d Merge 1.2.0 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 | 4 ++--
doc/guacamole-playback-example/pom.xml | 4 ++--
extensions/guacamole-auth-cas/pom.xml | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-duo/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-header/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
.../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 | 4 ++--
extensions/guacamole-auth-ldap/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-openid/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-quickconnect/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-radius/pom.xml | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-totp/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
guacamole-common-js/pom.xml | 2 +-
guacamole-common-js/src/main/webapp/modules/Version.js | 2 +-
guacamole-ext/pom.xml | 2 +-
guacamole/pom.xml | 13 +++----------
.../org/apache/guacamole/extension/ExtensionModule.java | 3 ++-
pom.xml | 2 +-
33 files changed, 53 insertions(+), 75 deletions(-)
[guacamole-client] 01/01: Merge 1.2.0 changes back to master.
Posted by mj...@apache.org.
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 521990d5c9cb41dc7f10c0e7afc785fb20f50a71
Merge: 15182b8 1cf6ff0
Author: Michael Jumper <mj...@apache.org>
AuthorDate: Thu Feb 27 11:13:27 2020 -0800
Merge 1.2.0 changes back to master.
doc/guacamole-example/pom.xml | 4 ++--
doc/guacamole-playback-example/pom.xml | 4 ++--
extensions/guacamole-auth-cas/pom.xml | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-duo/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-header/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
.../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 | 4 ++--
extensions/guacamole-auth-ldap/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-openid/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-quickconnect/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-radius/pom.xml | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-totp/pom.xml | 4 ++--
.../src/main/resources/guac-manifest.json | 2 +-
guacamole-common-js/pom.xml | 2 +-
guacamole-common-js/src/main/webapp/modules/Version.js | 2 +-
guacamole-ext/pom.xml | 2 +-
guacamole/pom.xml | 13 +++----------
.../org/apache/guacamole/extension/ExtensionModule.java | 3 ++-
pom.xml | 2 +-
33 files changed, 53 insertions(+), 75 deletions(-)