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 4df22ce67bdafc028ed0042cd277b3de6264f7aa Merge: a78186e f2ae848 Author: Michael Jumper <[email protected]> AuthorDate: Fri Jun 7 09:01:40 2019 -0700 Merge 1.1.0 changes back to master. .../protocol/ConfiguredGuacamoleSocket.java | 30 ++- .../protocol/GuacamoleClientInformation.java | 31 +++ .../protocol/GuacamoleProtocolCapability.java | 77 +++++++ .../protocol/GuacamoleProtocolVersion.java | 250 +++++++++++++++++++++ .../org/apache/guacamole/protocols/rdp.json | 4 + .../org/apache/guacamole/protocols/ssh.json | 6 +- guacamole/pom.xml | 7 + guacamole/src/licenses/LICENSE | 30 +++ guacamole/src/licenses/bundled/jstz-1.0.10/LICENSE | 22 ++ .../org/apache/guacamole/tunnel/TunnelRequest.java | 18 +- .../guacamole/tunnel/TunnelRequestService.java | 5 + .../main/webapp/app/client/types/ManagedClient.js | 2 + .../app/settings/services/preferenceService.js | 22 +- .../webapp/app/settings/styles/preferences.css | 2 +- .../settings/templates/settingsPreferences.html | 15 +- guacamole/src/main/webapp/index.html | 3 + guacamole/src/main/webapp/translations/en.json | 4 +- 17 files changed, 519 insertions(+), 9 deletions(-) diff --cc guacamole/pom.xml index 3834b63,7a68606..5552e4b --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@@ -494,13 -494,13 +494,20 @@@ </dependency> + <!-- Guava Base Libraries --> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>27.0.1-jre</version> + </dependency> + + <!-- JSTZ for TimeZone Detection --> + <dependency> + <groupId>org.webjars.npm</groupId> + <artifactId>jstz</artifactId> + <version>1.0.10</version> + </dependency> + </dependencies> </project>
