GUACAMOLE-225: Merge updated version numbers.

2025-09-06 05:07:41 +00:00 · 2017-02-28 11:00:45 -08:00
parent fa07460390 3de690abfe
commit 6bcb983838
22 changed files with 36 additions and 67 deletions
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-example</artifactId>
    <packaging>war</packaging>
-    <version>0.9.10-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-example</name>
    <url>http://guacamole.incubator.apache.org/</url>

@@ -114,7 +114,7 @@
        <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>
--- a/extensions/guacamole-auth-duo/pom.xml
+++ b/extensions/guacamole-auth-duo/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-auth-duo</artifactId>
    <packaging>jar</packaging>
-    <version>0.9.11-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-auth-duo</name>
    <url>http://guacamole.incubator.apache.org/</url>

@@ -209,19 +209,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 -->
+       <!-- 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>

--- a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
 {

-    "guacamoleVersion" : "0.9.11-incubating",
+    "guacamoleVersion" : "0.9.12-incubating",

    "name"      : "Duo TFA Authentication Backend",
    "namespace" : "duo",
--- a/extensions/guacamole-auth-header/pom.xml
+++ b/extensions/guacamole-auth-header/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-auth-header</artifactId>
    <packaging>jar</packaging>
-    <version>0.9.11-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-auth-header</name>
    <url>http://guacamole.incubator.apache.org/</url>

@@ -126,21 +126,14 @@

    <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>
+
        <!-- Guice -->
        <dependency>
            <groupId>com.google.inject</groupId>
--- a/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
 {

-    "guacamoleVersion" : "0.9.11-incubating",
+    "guacamoleVersion" : "0.9.12-incubating",

    "name"      : "HTTP Header Authentication Extension",
    "namespace" : "guac-header",
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
@@ -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>

--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
@@ -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>
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
@@ -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>
--- 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.11-incubating",
+    "guacamoleVersion" : "0.9.12-incubating",

    "name"      : "MySQL Authentication",
    "namespace" : "guac-mysql",
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
@@ -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>
--- 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.11-incubating",
+    "guacamoleVersion" : "0.9.12-incubating",

    "name"      : "PostgreSQL Authentication",
    "namespace" : "guac-postgresql",
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-auth-jdbc</artifactId>
    <packaging>pom</packaging>
-    <version>0.9.11-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-auth-jdbc</name>
    <url>http://guacamole.incubator.apache.org/</url>

@@ -80,7 +80,7 @@
            <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>

--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-auth-ldap</artifactId>
    <packaging>jar</packaging>
-    <version>0.9.11-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-auth-ldap</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>

--- 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.11-incubating",
+    "guacamoleVersion" : "0.9.12-incubating",

    "name"      : "LDAP Authentication",
    "namespace" : "guac-ldap",
--- a/extensions/guacamole-auth-noauth/pom.xml
+++ b/extensions/guacamole-auth-noauth/pom.xml
@@ -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>

--- 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.11-incubating",
+    "guacamoleVersion" : "0.9.12-incubating",

    "name"      : "Disabled Authentication",
    "namespace" : "guac-noauth",
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-common-js</artifactId>
    <packaging>pom</packaging>
-    <version>0.9.10-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-common-js</name>
    <url>http://guacamole.incubator.apache.org/</url>

--- a/guacamole-common-js/src/main/webapp/modules/Version.js
+++ b/guacamole-common-js/src/main/webapp/modules/Version.js
@@ -27,4 +27,4 @@ var Guacamole = Guacamole || {};
 *
 * @type {String}
 */
-Guacamole.API_VERSION = "0.9.10-incubating";
+Guacamole.API_VERSION = "0.9.12-incubating";
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-ext</artifactId>
    <packaging>jar</packaging>
-    <version>0.9.11-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-ext</name>
    <url>http://guacamole.incubator.apache.org/</url>

--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -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>
--- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
@@ -61,7 +61,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"
        ));

    /**
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
    <groupId>org.apache.guacamole</groupId>
    <artifactId>guacamole-client</artifactId>
    <packaging>pom</packaging>
-    <version>0.9.11-incubating</version>
+    <version>0.9.12-incubating</version>
    <name>guacamole-client</name>
    <url>http://guacamole.incubator.apache.org/</url>