safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-11-03 18:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.9.14 changes back to master.

Browse Source
This commit is contained in:
Nick Couchman
2018-01-01 16:29:38 -05:00
parent 0757d7ecbc 8c2a76b911
commit d73a0ece29
31 changed files with 54 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
guacamole/pom.xml
View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId>
<packaging>war</packaging>
<version>0.9.13-incubating</version>
<version>0.9.14</version>
<name>guacamole</name>
<url>http://guacamole.apache.org/</url>
@@ -264,21 +264,21 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.13-incubating</version>
<version>0.9.14</version>
</dependency>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.13-incubating</version>
<version>0.9.14</version>
</dependency>
<!-- Guacamole JavaScript API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>0.9.13-incubating</version>
<version>0.9.14</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

2
guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
View File

@@ -60,7 +60,7 @@ public class ExtensionModule extends ServletModule {
private static final List<String> ALLOWED_GUACAMOLE_VERSIONS =
Collections.unmodifiableList(Arrays.asList(
"*",
"0.9.13-incubating"
"0.9.14"
));
/**