diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml
index bb2ea686d..cf34bdec2 100644
--- a/doc/guacamole-example/pom.xml
+++ b/doc/guacamole-example/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-example
war
- 1.1.0
+ 1.2.0
guacamole-example
http://guacamole.apache.org/
@@ -114,7 +114,7 @@
org.apache.guacamole
guacamole-common-js
- 1.1.0
+ 1.2.0
zip
runtime
diff --git a/doc/guacamole-playback-example/pom.xml b/doc/guacamole-playback-example/pom.xml
index f7055d399..e96f4f7b8 100644
--- a/doc/guacamole-playback-example/pom.xml
+++ b/doc/guacamole-playback-example/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-playback-example
war
- 1.1.0
+ 1.2.0
guacamole-playback-example
http://guacamole.apache.org/
@@ -88,7 +88,7 @@
org.apache.guacamole
guacamole-common-js
- 1.1.0
+ 1.2.0
zip
runtime
diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml
index 3afabda3f..33cf45159 100644
--- a/extensions/guacamole-auth-cas/pom.xml
+++ b/extensions/guacamole-auth-cas/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-cas
jar
- 1.1.0
+ 1.2.0
guacamole-auth-cas
http://guacamole.apache.org/
@@ -206,19 +206,11 @@
-
-
- org.apache.guacamole
- guacamole-common
- 1.1.0
- provided
-
-
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
index 7af80591b..e121192c7 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "CAS Authentication Extension",
"namespace" : "guac-cas",
diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml
index 8de36e06b..6154be73c 100644
--- a/extensions/guacamole-auth-duo/pom.xml
+++ b/extensions/guacamole-auth-duo/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-duo
jar
- 1.1.0
+ 1.2.0
guacamole-auth-duo
http://guacamole.apache.org/
@@ -213,7 +213,7 @@
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
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 8f49e4bc0..0fcc78611 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" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "Duo TFA Authentication Backend",
"namespace" : "duo",
diff --git a/extensions/guacamole-auth-header/pom.xml b/extensions/guacamole-auth-header/pom.xml
index cf6565821..59afa382e 100644
--- a/extensions/guacamole-auth-header/pom.xml
+++ b/extensions/guacamole-auth-header/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-header
jar
- 1.1.0
+ 1.2.0
guacamole-auth-header
http://guacamole.apache.org/
@@ -130,7 +130,7 @@
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
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 3c7102881..21d43dcf2 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" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "HTTP Header Authentication Extension",
"namespace" : "guac-header",
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 23c374bdf..e6df64c6b 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 @@
org.apache.guacamole
guacamole-auth-jdbc
- 1.1.0
+ 1.2.0
../../
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 ddb57a9c2..1cecf80b7 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 @@
org.apache.guacamole
guacamole-auth-jdbc
- 1.1.0
+ 1.2.0
../../
@@ -99,21 +99,21 @@
org.apache.guacamole
guacamole-auth-jdbc-mysql
- 1.1.0
+ 1.2.0
org.apache.guacamole
guacamole-auth-jdbc-postgresql
- 1.1.0
+ 1.2.0
org.apache.guacamole
guacamole-auth-jdbc-sqlserver
- 1.1.0
+ 1.2.0
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 8a7d68a7e..94fb32f6f 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 @@
org.apache.guacamole
guacamole-auth-jdbc
- 1.1.0
+ 1.2.0
../../
@@ -120,7 +120,7 @@
org.apache.guacamole
guacamole-auth-jdbc-base
- 1.1.0
+ 1.2.0
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 470501ea7..d9bc40460 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" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"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 340eba7cd..2aaab9249 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 @@
org.apache.guacamole
guacamole-auth-jdbc
- 1.1.0
+ 1.2.0
../../
@@ -120,7 +120,7 @@
org.apache.guacamole
guacamole-auth-jdbc-base
- 1.1.0
+ 1.2.0
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 f598034fc..a6c8311cf 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" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "PostgreSQL Authentication",
"namespace" : "guac-postgresql",
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
index 55455dbf4..f75046609 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/pom.xml
@@ -36,7 +36,7 @@
org.apache.guacamole
guacamole-auth-jdbc
- 1.1.0
+ 1.2.0
../../
@@ -120,7 +120,7 @@
org.apache.guacamole
guacamole-auth-jdbc-base
- 1.1.0
+ 1.2.0
diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
index 22a856dce..b9ec039f1 100644
--- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-sqlserver/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "SQLServer Authentication",
"namespace" : "guac-sqlserver",
diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml
index 1325949bd..2b6d536a4 100644
--- a/extensions/guacamole-auth-jdbc/pom.xml
+++ b/extensions/guacamole-auth-jdbc/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-jdbc
pom
- 1.1.0
+ 1.2.0
guacamole-auth-jdbc
http://guacamole.apache.org/
@@ -81,7 +81,7 @@
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml
index 17c8ed638..bf30ba873 100644
--- a/extensions/guacamole-auth-ldap/pom.xml
+++ b/extensions/guacamole-auth-ldap/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-ldap
jar
- 1.1.0
+ 1.2.0
guacamole-auth-ldap
http://guacamole.apache.org/
@@ -137,7 +137,7 @@
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
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 d6192959d..e79e208f9 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" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "LDAP Authentication",
"namespace" : "guac-ldap",
diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml
index 25158c88e..762adf106 100644
--- a/extensions/guacamole-auth-openid/pom.xml
+++ b/extensions/guacamole-auth-openid/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-openid
jar
- 1.1.0
+ 1.2.0
guacamole-auth-openid
http://guacamole.apache.org/
@@ -210,7 +210,7 @@
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
diff --git a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
index 2da0c1802..1bb63dea7 100644
--- a/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-openid/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "OpenID Authentication Extension",
"namespace" : "guac-openid",
diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml
index df290b8c7..e989430aa 100644
--- a/extensions/guacamole-auth-quickconnect/pom.xml
+++ b/extensions/guacamole-auth-quickconnect/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-quickconnect
jar
- 1.1.0
+ 1.2.0
guacamole-auth-quickconnect
http://guacamole.apache.org/
@@ -188,7 +188,7 @@
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
diff --git a/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
index 1dbb2bf9d..caf4cf9c0 100644
--- a/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-quickconnect/src/main/resources/guac-manifest.json
@@ -1,5 +1,5 @@
{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "Adhoc Guacamole Connections",
"namespace" : "quickconnect",
diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml
index abdb2d350..296ab47ba 100644
--- a/extensions/guacamole-auth-radius/pom.xml
+++ b/extensions/guacamole-auth-radius/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-radius
jar
- 1.1.0
+ 1.2.0
guacamole-auth-radius
http://guacamole.apache.org/
@@ -174,19 +174,11 @@
-
-
- org.apache.guacamole
- guacamole-common
- 1.1.0
- provided
-
-
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
diff --git a/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
index 117c8fb58..2efaaf8c7 100644
--- a/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-radius/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "RADIUS Authentication Backend",
"namespace" : "radius",
diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml
index 180cbde8e..d83e2caf8 100644
--- a/extensions/guacamole-auth-totp/pom.xml
+++ b/extensions/guacamole-auth-totp/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-auth-totp
jar
- 1.1.0
+ 1.2.0
guacamole-auth-totp
http://guacamole.incubator.apache.org/
@@ -217,7 +217,7 @@
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
provided
diff --git a/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
index 7067d5924..6d28731b4 100644
--- a/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-totp/src/main/resources/guac-manifest.json
@@ -1,6 +1,6 @@
{
- "guacamoleVersion" : "1.1.0",
+ "guacamoleVersion" : "1.2.0",
"name" : "TOTP TFA Authentication Backend",
"namespace" : "totp",
diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml
index e94271b99..619868ddf 100644
--- a/guacamole-common-js/pom.xml
+++ b/guacamole-common-js/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-common-js
pom
- 1.1.0
+ 1.2.0
guacamole-common-js
http://guacamole.apache.org/
diff --git a/guacamole-common-js/src/main/webapp/modules/Version.js b/guacamole-common-js/src/main/webapp/modules/Version.js
index 91311651b..f8a5b3bc0 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 = "1.1.0";
+Guacamole.API_VERSION = "1.2.0";
diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml
index a4e7b070a..adb12e92c 100644
--- a/guacamole-ext/pom.xml
+++ b/guacamole-ext/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-ext
jar
- 1.1.0
+ 1.2.0
guacamole-ext
http://guacamole.apache.org/
diff --git a/guacamole/pom.xml b/guacamole/pom.xml
index d7cf465f2..588b4fc56 100644
--- a/guacamole/pom.xml
+++ b/guacamole/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole
war
- 1.1.0
+ 1.2.0
guacamole
http://guacamole.apache.org/
@@ -259,26 +259,19 @@
logback-classic
1.2.3
-
-
-
- org.apache.guacamole
- guacamole-common
- 1.1.0
-
org.apache.guacamole
guacamole-ext
- 1.1.0
+ 1.2.0
org.apache.guacamole
guacamole-common-js
- 1.1.0
+ 1.2.0
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 0a424ab74..829e3342d 100644
--- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
+++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java
@@ -63,7 +63,8 @@ public class ExtensionModule extends ServletModule {
Collections.unmodifiableList(Arrays.asList(
"*",
"1.0.0",
- "1.1.0"
+ "1.1.0",
+ "1.2.0"
));
/**
diff --git a/pom.xml b/pom.xml
index 83cfa8ecb..b90ef3a1e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,7 @@
org.apache.guacamole
guacamole-client
pom
- 1.1.0
+ 1.2.0
guacamole-client
http://guacamole.apache.org/