Merge 0.9.12-incubating changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/3ec99cbc Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/3ec99cbc Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/3ec99cbc Branch: refs/heads/master Commit: 3ec99cbcdd2dd37ecf5a24b84e5e34ce2e1fb26f Parents: f887730 6bcb983 Author: James Muehlner <[email protected]> Authored: Wed Mar 1 08:27:22 2017 -0800 Committer: James Muehlner <[email protected]> Committed: Wed Mar 1 08:27:22 2017 -0800 ---------------------------------------------------------------------- doc/guacamole-example/pom.xml | 4 ++-- extensions/guacamole-auth-duo/pom.xml | 14 +++----------- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-header/pom.xml | 13 +++---------- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 6 +++--- .../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 +- extensions/guacamole-auth-jdbc/pom.xml | 4 ++-- extensions/guacamole-auth-ldap/pom.xml | 12 ++---------- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-noauth/pom.xml | 12 ++---------- .../src/main/resources/guac-manifest.json | 2 +- guacamole-common-js/pom.xml | 2 +- .../src/main/webapp/modules/Version.js | 2 +- guacamole-ext/pom.xml | 2 +- guacamole/pom.xml | 6 +++--- .../apache/guacamole/extension/ExtensionModule.java | 2 +- pom.xml | 2 +- 22 files changed, 36 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3ec99cbc/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java ----------------------------------------------------------------------
