Merge 1.0.0 changes back to master.

This commit is contained in:
Nick Couchman
2018-06-07 04:29:44 -04:00
34 changed files with 58 additions and 58 deletions

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-example</artifactId>
<packaging>war</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-example</name>
<url>http://guacamole.apache.org/</url>
@@ -106,7 +106,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>
@@ -114,7 +114,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-playback-example</artifactId>
<packaging>war</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-playback-example</name>
<url>http://guacamole.apache.org/</url>
@@ -88,7 +88,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-cas</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-cas</name>
<url>http://guacamole.apache.org/</url>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
@@ -218,7 +218,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "CAS Authentication Extension",
"namespace" : "guac-cas",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-duo</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-duo</name>
<url>http://guacamole.apache.org/</url>
@@ -213,7 +213,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "Duo TFA Authentication Backend",
"namespace" : "duo",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-header</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-header</name>
<url>http://guacamole.apache.org/</url>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "HTTP Header Authentication Extension",
"namespace" : "guac-header",

View File

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

View File

@@ -36,7 +36,7 @@
<parent>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<relativePath>../../</relativePath>
</parent>
@@ -99,21 +99,21 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-mysql</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
</dependency>
<!-- PostgreSQL Authentication Extension -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-postgresql</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
</dependency>
<!-- SQL Server Authentication Extension -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-sqlserver</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
</dependency>
</dependencies>

View File

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

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"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.14</version>
<version>1.0.0</version>
<relativePath>../../</relativePath>
</parent>
@@ -120,7 +120,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc-base</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
</dependency>
</dependencies>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "PostgreSQL Authentication",
"namespace" : "guac-postgresql",

View File

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

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "SQLServer Authentication",
"namespace" : "guac-sqlserver",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-jdbc</artifactId>
<packaging>pom</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-jdbc</name>
<url>http://guacamole.apache.org/</url>
@@ -81,7 +81,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-ldap</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-ldap</name>
<url>http://guacamole.apache.org/</url>
@@ -130,7 +130,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "LDAP Authentication",
"namespace" : "guac-ldap",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-openid</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-openid</name>
<url>http://guacamole.apache.org/</url>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "OpenID Authentication Extension",
"namespace" : "guac-openid",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-quickconnect</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-quickconnect</name>
<url>http://guacamole.apache.org/</url>
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,5 +1,5 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "Adhoc Guacamole Connections",
"namespace" : "quickconnect",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-radius</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-radius</name>
<url>http://guacamole.apache.org/</url>
@@ -178,7 +178,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>
@@ -186,7 +186,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "RADIUS Authentication Backend",
"namespace" : "radius",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-auth-totp</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-auth-totp</name>
<url>http://guacamole.incubator.apache.org/</url>
@@ -210,7 +210,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>provided</scope>
</dependency>

View File

@@ -1,6 +1,6 @@
{
"guacamoleVersion" : "0.9.14",
"guacamoleVersion" : "1.0.0",
"name" : "TOTP TFA Authentication Backend",
"namespace" : "totp",

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<packaging>pom</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-common-js</name>
<url>http://guacamole.apache.org/</url>

View File

@@ -27,4 +27,4 @@ var Guacamole = Guacamole || {};
*
* @type {String}
*/
Guacamole.API_VERSION = "0.9.14";
Guacamole.API_VERSION = "1.0.0";

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-common</name>
<url>http://guacamole.apache.org/</url>

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<packaging>jar</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-ext</name>
<url>http://guacamole.apache.org/</url>
@@ -148,7 +148,7 @@
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<scope>compile</scope>
</dependency>

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole</artifactId>
<packaging>war</packaging>
<version>0.9.14</version>
<version>1.0.0</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.14</version>
<version>1.0.0</version>
</dependency>
<!-- Guacamole Extension API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-ext</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
</dependency>
<!-- Guacamole JavaScript API -->
<dependency>
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-common-js</artifactId>
<version>0.9.14</version>
<version>1.0.0</version>
<type>zip</type>
<scope>runtime</scope>
</dependency>

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.14"
"1.0.0"
));
/**

View File

@@ -26,7 +26,7 @@
<groupId>org.apache.guacamole</groupId>
<artifactId>guacamole-client</artifactId>
<packaging>pom</packaging>
<version>0.9.14</version>
<version>1.0.0</version>
<name>guacamole-client</name>
<url>http://guacamole.apache.org/</url>