Merge 0.9.12-incubating changes back to master.

This commit is contained in:
James Muehlner
2017-03-01 08:27:22 -08:00
22 changed files with 36 additions and 67 deletions

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-noauth</artifactId>
<packaging>jar</packaging>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
<name>guacamole-auth-noauth</name>
<url>http://guacamole.incubator.apache.org/</url>
@@ -126,19 +126,11 @@
<dependencies>
<!-- Guacamole Java API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.10-incubating</version>
<scope>provided</scope>
</dependency>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.11-incubating",
"guacamoleVersion" : "0.9.12-incubating",
"name" : "Disabled Authentication",
"namespace" : "guac-noauth",