Merge 1.0.0 changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/guacamole-client/commit/0e856d7a Tree: http://git-wip-us.apache.org/repos/asf/guacamole-client/tree/0e856d7a Diff: http://git-wip-us.apache.org/repos/asf/guacamole-client/diff/0e856d7a Branch: refs/heads/master Commit: 0e856d7a212135d71ecfeef19270e4ff534dbc04 Parents: 1997110 6545c55 Author: Nick Couchman <vn...@apache.org> Authored: Thu Jun 7 04:29:44 2018 -0400 Committer: Nick Couchman <vn...@apache.org> Committed: Thu Jun 7 04:29:44 2018 -0400 ---------------------------------------------------------------------- doc/guacamole-example/pom.xml | 6 +++--- doc/guacamole-playback-example/pom.xml | 4 ++-- extensions/guacamole-auth-cas/pom.xml | 6 +++--- .../guacamole-auth-cas/src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-duo/pom.xml | 4 ++-- .../guacamole-auth-duo/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 | 6 +++--- .../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-common/pom.xml | 2 +- guacamole-ext/pom.xml | 4 ++-- guacamole/pom.xml | 8 ++++---- .../java/org/apache/guacamole/extension/ExtensionModule.java | 2 +- pom.xml | 2 +- 34 files changed, 58 insertions(+), 58 deletions(-) ----------------------------------------------------------------------
