From 5da40bd6334a1f39a986b43200d6cd5c3fdf7b84 Mon Sep 17 00:00:00 2001 From: Virtually Nick Date: Mon, 2 Nov 2020 10:52:47 -0500 Subject: [PATCH] GUACAMOLE-1205: Bump Guacamole Client components to version 1.3.0 --- doc/guacamole-example/pom.xml | 6 +++--- doc/guacamole-playback-example/pom.xml | 4 ++-- extensions/guacamole-auth-cas/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-duo/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- .../modules/guacamole-auth-jdbc-base/pom.xml | 2 +- .../modules/guacamole-auth-jdbc-dist/pom.xml | 8 ++++---- .../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 +- .../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-jdbc/pom.xml | 4 ++-- extensions/guacamole-auth-ldap/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-openid/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-quickconnect/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-radius/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-saml/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- extensions/guacamole-auth-totp/pom.xml | 4 ++-- .../src/main/resources/guac-manifest.json | 2 +- guacamole-common-js/pom.xml | 2 +- guacamole-common-js/src/main/webapp/modules/Version.js | 2 +- guacamole-common/pom.xml | 2 +- guacamole-ext/pom.xml | 4 ++-- guacamole/pom.xml | 6 +++--- .../org/apache/guacamole/extension/ExtensionModule.java | 3 ++- pom.xml | 2 +- 34 files changed, 56 insertions(+), 55 deletions(-) diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index cf34bdec2..6db3c0f6b 100644 --- a/doc/guacamole-example/pom.xml +++ b/doc/guacamole-example/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole-example war - 1.2.0 + 1.3.0 guacamole-example http://guacamole.apache.org/ @@ -106,7 +106,7 @@ org.apache.guacamole guacamole-common - 1.1.0 + 1.3.0 compile @@ -114,7 +114,7 @@ org.apache.guacamole guacamole-common-js - 1.2.0 + 1.3.0 zip runtime diff --git a/doc/guacamole-playback-example/pom.xml b/doc/guacamole-playback-example/pom.xml index e96f4f7b8..4c7739f0d 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.2.0 + 1.3.0 guacamole-playback-example http://guacamole.apache.org/ @@ -88,7 +88,7 @@ org.apache.guacamole guacamole-common-js - 1.2.0 + 1.3.0 zip runtime diff --git a/extensions/guacamole-auth-cas/pom.xml b/extensions/guacamole-auth-cas/pom.xml index 851001c8e..f4b30e4b4 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.2.0 + 1.3.0 guacamole-auth-cas http://guacamole.apache.org/ @@ -131,7 +131,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.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 dfee2f8c1..c1614cfb4 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.2.0", + "guacamoleVersion" : "1.3.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 6154be73c..240fcabd6 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.2.0 + 1.3.0 guacamole-auth-duo http://guacamole.apache.org/ @@ -213,7 +213,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.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 bb0f2dede..f161ec28b 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.2.0", + "guacamoleVersion" : "1.3.0", "name" : "Duo TFA Authentication Backend", "namespace" : "duo", 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 e6df64c6b..b052ee7c6 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.2.0 + 1.3.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 1cecf80b7..46a3f3600 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.2.0 + 1.3.0 ../../ @@ -99,21 +99,21 @@ org.apache.guacamole guacamole-auth-jdbc-mysql - 1.2.0 + 1.3.0 org.apache.guacamole guacamole-auth-jdbc-postgresql - 1.2.0 + 1.3.0 org.apache.guacamole guacamole-auth-jdbc-sqlserver - 1.2.0 + 1.3.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 94fb32f6f..1943d337e 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.2.0 + 1.3.0 ../../ @@ -120,7 +120,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 1.2.0 + 1.3.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 d9bc40460..a9f227fd3 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.2.0", + "guacamoleVersion" : "1.3.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 2aaab9249..7717404d4 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.2.0 + 1.3.0 ../../ @@ -120,7 +120,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 1.2.0 + 1.3.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 a6c8311cf..2698393cd 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.2.0", + "guacamoleVersion" : "1.3.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 f75046609..54b6463c2 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.2.0 + 1.3.0 ../../ @@ -120,7 +120,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 1.2.0 + 1.3.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 b9ec039f1..f9fa89c52 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.2.0", + "guacamoleVersion" : "1.3.0", "name" : "SQLServer Authentication", "namespace" : "guac-sqlserver", diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml index 2b6d536a4..5ac6b388e 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.2.0 + 1.3.0 guacamole-auth-jdbc http://guacamole.apache.org/ @@ -81,7 +81,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.0 provided diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index bf30ba873..e14e27184 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.2.0 + 1.3.0 guacamole-auth-ldap http://guacamole.apache.org/ @@ -137,7 +137,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.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 e79e208f9..58abcdf62 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.2.0", + "guacamoleVersion" : "1.3.0", "name" : "LDAP Authentication", "namespace" : "guac-ldap", diff --git a/extensions/guacamole-auth-openid/pom.xml b/extensions/guacamole-auth-openid/pom.xml index 8cc5ab9b4..691443a0b 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.2.0 + 1.3.0 guacamole-auth-openid http://guacamole.apache.org/ @@ -177,7 +177,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.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 fbf5d665a..a458bfcf8 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.2.0", + "guacamoleVersion" : "1.3.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 e989430aa..166f98fec 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.2.0 + 1.3.0 guacamole-auth-quickconnect http://guacamole.apache.org/ @@ -188,7 +188,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.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 d2f4597fe..39f0de7e4 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.2.0", + "guacamoleVersion" : "1.3.0", "name" : "Adhoc Guacamole Connections", "namespace" : "quickconnect", diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml index 296ab47ba..675ed081c 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.2.0 + 1.3.0 guacamole-auth-radius http://guacamole.apache.org/ @@ -178,7 +178,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.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 8eb6e00d0..7d04e1dbc 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.2.0", + "guacamoleVersion" : "1.3.0", "name" : "RADIUS Authentication Backend", "namespace" : "radius", diff --git a/extensions/guacamole-auth-saml/pom.xml b/extensions/guacamole-auth-saml/pom.xml index 135ffacd5..77671c778 100644 --- a/extensions/guacamole-auth-saml/pom.xml +++ b/extensions/guacamole-auth-saml/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole-auth-saml jar - 1.2.0 + 1.3.0 guacamole-auth-saml http://guacamole.apache.org/ @@ -132,7 +132,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.0 provided diff --git a/extensions/guacamole-auth-saml/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-saml/src/main/resources/guac-manifest.json index bdb6d94c9..4a2bb68c9 100644 --- a/extensions/guacamole-auth-saml/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-saml/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "1.2.0", + "guacamoleVersion" : "1.3.0", "name" : "SAML Authentication Extension", "namespace" : "saml", diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml index d83e2caf8..261ded2a7 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.2.0 + 1.3.0 guacamole-auth-totp http://guacamole.incubator.apache.org/ @@ -217,7 +217,7 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.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 166e9710e..4e05ea412 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.2.0", + "guacamoleVersion" : "1.3.0", "name" : "TOTP TFA Authentication Backend", "namespace" : "totp", diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml index 619868ddf..e38ea1c39 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.2.0 + 1.3.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 f8a5b3bc0..4bad5a2dd 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.2.0"; +Guacamole.API_VERSION = "1.3.0"; diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index 2b4f3530e..b8e09d474 100644 --- a/guacamole-common/pom.xml +++ b/guacamole-common/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole-common jar - 1.1.0 + 1.3.0 guacamole-common http://guacamole.apache.org/ diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index adb12e92c..d5717f581 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole-ext jar - 1.2.0 + 1.3.0 guacamole-ext http://guacamole.apache.org/ @@ -155,7 +155,7 @@ org.apache.guacamole guacamole-common - 1.1.0 + 1.3.0 compile diff --git a/guacamole/pom.xml b/guacamole/pom.xml index 588b4fc56..0693e6aae 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole war - 1.2.0 + 1.3.0 guacamole http://guacamole.apache.org/ @@ -264,14 +264,14 @@ org.apache.guacamole guacamole-ext - 1.2.0 + 1.3.0 org.apache.guacamole guacamole-common-js - 1.2.0 + 1.3.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 829e3342d..58f124e6a 100644 --- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java @@ -64,7 +64,8 @@ public class ExtensionModule extends ServletModule { "*", "1.0.0", "1.1.0", - "1.2.0" + "1.2.0", + "1.3.0" )); /** diff --git a/pom.xml b/pom.xml index 84dbac6cd..f0c24deed 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole-client pom - 1.2.0 + 1.3.0 guacamole-client http://guacamole.apache.org/