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

@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
<relativePath>../../</relativePath>
</parent>

View File

@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
<relativePath>../../</relativePath>
</parent>
@@ -99,14 +99,14 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-mysql</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
</dependency>
<!-- PostgreSQL Authentication Extension -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-postgresql</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
</dependency>
</dependencies>

View File

@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
<relativePath>../../</relativePath>
</parent>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
</dependency>
</dependencies>

View File

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

View File

@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
<relativePath>../../</relativePath>
</parent>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
<version>0.9.11-incubating</version>
<version>0.9.12-incubating</version>
</dependency>
</dependencies>

View File

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