safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge 0.9.12-incubating changes back to master.

Browse Source
This commit is contained in:
James Muehlner
2017-03-01 08:27:22 -08:00
parent f8877304e0 6bcb983838
commit 3ec99cbcdd
22 changed files with 36 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
guacamole/pom.xml
View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId>
<packaging>war</packaging>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
<name>guacamole</name>
<url>http://guacamole.incubator.apache.org/</url>
@@ -285,14 +285,14 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
</dependency>
<!-- Guacamole JavaScript API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>0.9.10-incubating</version>
<version>0.9.12-incubating</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

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

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