From cbe3387d9215d994c6e0db4f2e06667f5b8a3b3e Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 22 Mar 2016 14:43:50 -0700 Subject: [PATCH] GUACAMOLE-1: Replace version 0.9.9 with version 0.9.9-incubating. --- doc/guacamole-example/pom.xml | 6 +++--- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-jdbc-mysql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-postgresql/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 4 ++-- extensions/guacamole-auth-ldap/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-noauth/pom.xml | 6 +++--- .../src/main/resources/guac-manifest.json | 2 +- guacamole-common-js/pom.xml | 2 +- guacamole-common/pom.xml | 2 +- guacamole-ext/pom.xml | 4 ++-- guacamole/pom.xml | 8 ++++---- .../org/apache/guacamole/extension/ExtensionModule.java | 2 +- pom.xml | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index 9afb815dc..c908db272 100644 --- a/doc/guacamole-example/pom.xml +++ b/doc/guacamole-example/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole-example war - 0.9.9 + 0.9.9-incubating guacamole-example http://guac-dev.org/ @@ -66,7 +66,7 @@ org.apache.guacamole guacamole-common - 0.9.9 + 0.9.9-incubating compile @@ -74,7 +74,7 @@ org.apache.guacamole guacamole-common-js - 0.9.9 + 0.9.9-incubating zip runtime diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml index 3637d7ed2..3a7cb6182 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml @@ -15,7 +15,7 @@ org.apache.guacamole guacamole-auth-jdbc - 0.9.9 + 0.9.9-incubating ../../ diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml index 8774eed26..4b0992ab3 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml @@ -15,7 +15,7 @@ org.apache.guacamole guacamole-auth-jdbc - 0.9.9 + 0.9.9-incubating ../../ @@ -74,7 +74,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 0.9.9 + 0.9.9-incubating diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json index 30f968ad5..1aa0b8c57 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "0.9.9", + "guacamoleVersion" : "0.9.9-incubating", "name" : "MySQL Authentication", "namespace" : "guac-mysql", diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml index 789c9e04e..0a823def6 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml @@ -15,7 +15,7 @@ org.apache.guacamole guacamole-auth-jdbc - 0.9.9 + 0.9.9-incubating ../../ @@ -74,7 +74,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 0.9.9 + 0.9.9-incubating diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json index 54a809ca5..64d6a23e6 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "0.9.9", + "guacamoleVersion" : "0.9.9-incubating", "name" : "PostgreSQL Authentication", "namespace" : "guac-postgresql", diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml index 2098783b2..764f53a06 100644 --- a/extensions/guacamole-auth-jdbc/pom.xml +++ b/extensions/guacamole-auth-jdbc/pom.xml @@ -7,7 +7,7 @@ org.apache.guacamole guacamole-auth-jdbc pom - 0.9.9 + 0.9.9-incubating guacamole-auth-jdbc http://guac-dev.org/ @@ -62,7 +62,7 @@ org.apache.guacamole guacamole-ext - 0.9.9 + 0.9.9-incubating provided diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 40ebcee12..abbaa5d44 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole-auth-ldap jar - 0.9.9 + 0.9.9-incubating guacamole-auth-ldap http://guac-dev.org/ @@ -83,7 +83,7 @@ org.apache.guacamole guacamole-common - 0.9.9 + 0.9.9-incubating provided @@ -91,7 +91,7 @@ org.apache.guacamole guacamole-ext - 0.9.9 + 0.9.9-incubating provided diff --git a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json index ed0b1ce24..8bab228a5 100644 --- a/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "0.9.9", + "guacamoleVersion" : "0.9.9-incubating", "name" : "LDAP Authentication", "namespace" : "guac-ldap", diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml index 059d53080..f2c8c7e83 100644 --- a/extensions/guacamole-auth-noauth/pom.xml +++ b/extensions/guacamole-auth-noauth/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole-auth-noauth jar - 0.9.9 + 0.9.9-incubating guacamole-auth-noauth http://guacamole.sourceforge.net/ @@ -83,7 +83,7 @@ org.apache.guacamole guacamole-common - 0.9.9 + 0.9.9-incubating provided @@ -91,7 +91,7 @@ org.apache.guacamole guacamole-ext - 0.9.9 + 0.9.9-incubating provided diff --git a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json index 5446702aa..a5c30c998 100644 --- a/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "0.9.9", + "guacamoleVersion" : "0.9.9-incubating", "name" : "Disabled Authentication", "namespace" : "guac-noauth", diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml index 1a9b5a95e..94ee03b9d 100644 --- a/guacamole-common-js/pom.xml +++ b/guacamole-common-js/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole-common-js pom - 0.9.9 + 0.9.9-incubating guacamole-common-js http://guac-dev.org/ diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index 9d6d4f390..d4098b510 100644 --- a/guacamole-common/pom.xml +++ b/guacamole-common/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole-common jar - 0.9.9 + 0.9.9-incubating guacamole-common http://guac-dev.org/ diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index ae90328ff..62d5a03cc 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole-ext jar - 0.9.9 + 0.9.9-incubating guacamole-ext http://guac-dev.org/ @@ -116,7 +116,7 @@ org.apache.guacamole guacamole-common - 0.9.9 + 0.9.9-incubating compile diff --git a/guacamole/pom.xml b/guacamole/pom.xml index df5b0e0ee..dd9dc284a 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole war - 0.9.9 + 0.9.9-incubating guacamole http://guac-dev.org/ @@ -221,21 +221,21 @@ org.apache.guacamole guacamole-common - 0.9.9 + 0.9.9-incubating org.apache.guacamole guacamole-ext - 0.9.9 + 0.9.9-incubating org.apache.guacamole guacamole-common-js - 0.9.9 + 0.9.9-incubating zip runtime diff --git a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java index cb3c0efa8..b81593c63 100644 --- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java @@ -65,7 +65,7 @@ public class ExtensionModule extends ServletModule { private static final List ALLOWED_GUACAMOLE_VERSIONS = Collections.unmodifiableList(Arrays.asList( "*", - "0.9.9" + "0.9.9-incubating" )); /** diff --git a/pom.xml b/pom.xml index 61ce42436..58d79f647 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.apache.guacamole guacamole-client pom - 0.9.9 + 0.9.9-incubating guacamole-client http://guac-dev.org/