You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2017/03/01 16:27:49 UTC
[1/3] incubator-guacamole-client git commit: GUACAMOLE-225: Bump
version numbers to 0.9.12-incubating (guacamole-common unchanged).
Repository: incubator-guacamole-client
Updated Branches:
refs/heads/master f8877304e -> 3ec99cbcd
GUACAMOLE-225: Bump version numbers to 0.9.12-incubating (guacamole-common unchanged).
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/3de690ab
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/3de690ab
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/3de690ab
Branch: refs/heads/master
Commit: 3de690abfe54569d2e3adeea36508a51eac9eff1
Parents: fa07460
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Feb 28 09:33:53 2017 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Feb 28 09:33:53 2017 -0800
----------------------------------------------------------------------
doc/guacamole-example/pom.xml | 4 ++--
extensions/guacamole-auth-duo/pom.xml | 14 +++-----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-header/pom.xml | 13 +++----------
.../src/main/resources/guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
.../modules/guacamole-auth-jdbc-dist/pom.xml | 6 +++---
.../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 | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-noauth/pom.xml | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
guacamole-common-js/pom.xml | 2 +-
.../src/main/webapp/modules/Version.js | 2 +-
guacamole-ext/pom.xml | 2 +-
guacamole/pom.xml | 6 +++---
.../apache/guacamole/extension/ExtensionModule.java | 2 +-
pom.xml | 2 +-
22 files changed, 36 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/doc/guacamole-example/pom.xml
----------------------------------------------------------------------
diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index b18e66f..d6e553e 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-duo/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml
index a0959e1..f01d4f7 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-duo/src/main/resources/guac-manifest.json
index 0578070..e57221b 100644
--- 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",
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-header/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml
index a3f777c..03c5d1f 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-header/src/main/resources/guac-manifest.json
index d7294e7..da7b67c 100644
--- 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",
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-base/pom.xml
----------------------------------------------------------------------
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 f6b2da7..116a4ff 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
@@ -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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/pom.xml
index 4847d10..3915fb2 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/pom.xml
----------------------------------------------------------------------
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 3061fa4..c1a311c 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
@@ -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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
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 9e75dae..2db48c9 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.11-incubating",
+ "guacamoleVersion" : "0.9.12-incubating",
"name" : "MySQL Authentication",
"namespace" : "guac-mysql",
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/pom.xml
----------------------------------------------------------------------
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 d7f492d..8563b0a 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
@@ -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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
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 4a4a70a..11ac54a 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.11-incubating",
+ "guacamoleVersion" : "0.9.12-incubating",
"name" : "PostgreSQL Authentication",
"namespace" : "guac-postgresql",
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-jdbc/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index 316c107..8cf41aa 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 47137ae..1352c93 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-ldap/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
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 fb79872..be4186a 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.11-incubating",
+ "guacamoleVersion" : "0.9.12-incubating",
"name" : "LDAP Authentication",
"namespace" : "guac-ldap",
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-noauth/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-noauth/pom.xml b/extensions/guacamole-auth-noauth/pom.xml
index 71ae08b..22c6010 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/extensions/guacamole-auth-noauth/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
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 6869e3f..b57358a 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.11-incubating",
+ "guacamoleVersion" : "0.9.12-incubating",
"name" : "Disabled Authentication",
"namespace" : "guac-noauth",
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/guacamole-common-js/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index aeca967..b524ac4 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/guacamole-common-js/src/main/webapp/modules/Version.js
----------------------------------------------------------------------
diff --git a/guacamole-common-js/src/main/webapp/modules/Version.js b/guacamole-common-js/src/main/webapp/modules/Version.js
index 3b522d8..0745584 100644
--- 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";
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/guacamole-ext/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index 909f90f..847ee9e 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/guacamole/pom.xml
----------------------------------------------------------------------
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index adbebbf..881f062 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
----------------------------------------------------------------------
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 d0e6463..099b25f 100644
--- 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"
));
/**
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3de690ab/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 1f11b17..6862ca6 100644
--- 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>
[3/3] incubator-guacamole-client git commit: Merge 0.9.12-incubating
changes back to master.
Posted by jm...@apache.org.
Merge 0.9.12-incubating changes back to master.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/3ec99cbc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/3ec99cbc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/3ec99cbc
Branch: refs/heads/master
Commit: 3ec99cbcdd2dd37ecf5a24b84e5e34ce2e1fb26f
Parents: f887730 6bcb983
Author: James Muehlner <ja...@guac-dev.org>
Authored: Wed Mar 1 08:27:22 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Wed Mar 1 08:27:22 2017 -0800
----------------------------------------------------------------------
doc/guacamole-example/pom.xml | 4 ++--
extensions/guacamole-auth-duo/pom.xml | 14 +++-----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-header/pom.xml | 13 +++----------
.../src/main/resources/guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
.../modules/guacamole-auth-jdbc-dist/pom.xml | 6 +++---
.../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 | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-noauth/pom.xml | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
guacamole-common-js/pom.xml | 2 +-
.../src/main/webapp/modules/Version.js | 2 +-
guacamole-ext/pom.xml | 2 +-
guacamole/pom.xml | 6 +++---
.../apache/guacamole/extension/ExtensionModule.java | 2 +-
pom.xml | 2 +-
22 files changed, 36 insertions(+), 67 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/3ec99cbc/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
----------------------------------------------------------------------
[2/3] incubator-guacamole-client git commit: GUACAMOLE-225: Merge
updated version numbers.
Posted by jm...@apache.org.
GUACAMOLE-225: Merge updated version numbers.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/6bcb9838
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/6bcb9838
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/6bcb9838
Branch: refs/heads/master
Commit: 6bcb983838aa7648661bac1863c95b50090f647c
Parents: fa07460 3de690a
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Feb 28 11:00:45 2017 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Feb 28 11:00:45 2017 -0800
----------------------------------------------------------------------
doc/guacamole-example/pom.xml | 4 ++--
extensions/guacamole-auth-duo/pom.xml | 14 +++-----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-header/pom.xml | 13 +++----------
.../src/main/resources/guac-manifest.json | 2 +-
.../modules/guacamole-auth-jdbc-base/pom.xml | 2 +-
.../modules/guacamole-auth-jdbc-dist/pom.xml | 6 +++---
.../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 | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
extensions/guacamole-auth-noauth/pom.xml | 12 ++----------
.../src/main/resources/guac-manifest.json | 2 +-
guacamole-common-js/pom.xml | 2 +-
.../src/main/webapp/modules/Version.js | 2 +-
guacamole-ext/pom.xml | 2 +-
guacamole/pom.xml | 6 +++---
.../apache/guacamole/extension/ExtensionModule.java | 2 +-
pom.xml | 2 +-
22 files changed, 36 insertions(+), 67 deletions(-)
----------------------------------------------------------------------