diff --git a/doc/guacamole-example/pom.xml b/doc/guacamole-example/pom.xml index 7474c9c9d..b41d7cf3d 100644 --- a/doc/guacamole-example/pom.xml +++ b/doc/guacamole-example/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole-example war - 1.3.0 + 1.4.0 guacamole-example http://guacamole.apache.org/ @@ -106,7 +106,7 @@ org.apache.guacamole guacamole-common - 1.3.0 + 1.4.0 compile @@ -114,7 +114,7 @@ org.apache.guacamole guacamole-common-js - 1.3.0 + 1.4.0 zip runtime diff --git a/doc/guacamole-playback-example/pom.xml b/doc/guacamole-playback-example/pom.xml index 2e4031f50..af07ff609 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.3.0 + 1.4.0 guacamole-playback-example http://guacamole.apache.org/ @@ -88,7 +88,7 @@ org.apache.guacamole guacamole-common-js - 1.3.0 + 1.4.0 zip runtime diff --git a/extensions/guacamole-auth-duo/pom.xml b/extensions/guacamole-auth-duo/pom.xml index ccdc0f63d..212bc989e 100644 --- a/extensions/guacamole-auth-duo/pom.xml +++ b/extensions/guacamole-auth-duo/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-duo jar - 1.3.0 + 1.4.0 guacamole-auth-duo http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -132,7 +132,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.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 d1b914f3d..fe1043a63 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.3.0", + "guacamoleVersion" : "1.4.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 4c2bbcabd..9521001f5 100644 --- a/extensions/guacamole-auth-header/pom.xml +++ b/extensions/guacamole-auth-header/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-header jar - 1.3.0 + 1.4.0 guacamole-auth-header http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -43,7 +43,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.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 e443828af..96348cccd 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.2.0", + "guacamoleVersion" : "1.4.0", "name" : "HTTP Header Authentication Extension", "namespace" : "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 12f5f2636..87cbcfe27 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 @@ -32,7 +32,7 @@ org.apache.guacamole guacamole-auth-jdbc - 1.3.0 + 1.4.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 0b2fb6973..3aa310773 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 @@ -32,7 +32,7 @@ org.apache.guacamole guacamole-auth-jdbc - 1.3.0 + 1.4.0 ../../ @@ -42,21 +42,21 @@ org.apache.guacamole guacamole-auth-jdbc-mysql - 1.3.0 + 1.4.0 org.apache.guacamole guacamole-auth-jdbc-postgresql - 1.3.0 + 1.4.0 org.apache.guacamole guacamole-auth-jdbc-sqlserver - 1.3.0 + 1.4.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 1b0c014a7..579c50d57 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 @@ -32,7 +32,7 @@ org.apache.guacamole guacamole-auth-jdbc - 1.3.0 + 1.4.0 ../../ @@ -49,7 +49,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 1.3.0 + 1.4.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 58bab7e87..28f35a96b 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.3.0", + "guacamoleVersion" : "1.4.0", "name" : "MySQL Authentication", "namespace" : "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 4aa65e50f..f8225084e 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 @@ -32,7 +32,7 @@ org.apache.guacamole guacamole-auth-jdbc - 1.3.0 + 1.4.0 ../../ @@ -49,7 +49,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 1.3.0 + 1.4.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 e882f7670..00e052a8e 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.3.0", + "guacamoleVersion" : "1.4.0", "name" : "PostgreSQL Authentication", "namespace" : "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 27029f53e..3bc49617f 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 @@ -32,7 +32,7 @@ org.apache.guacamole guacamole-auth-jdbc - 1.3.0 + 1.4.0 ../../ @@ -49,7 +49,7 @@ org.apache.guacamole guacamole-auth-jdbc-base - 1.3.0 + 1.4.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 1bcb08374..860b66837 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.3.0", + "guacamoleVersion" : "1.4.0", "name" : "SQLServer Authentication", "namespace" : "sqlserver", diff --git a/extensions/guacamole-auth-jdbc/pom.xml b/extensions/guacamole-auth-jdbc/pom.xml index 786c490b3..1999cd8c7 100644 --- a/extensions/guacamole-auth-jdbc/pom.xml +++ b/extensions/guacamole-auth-jdbc/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-jdbc pom - 1.3.0 + 1.4.0 guacamole-auth-jdbc http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -59,7 +59,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.0 provided diff --git a/extensions/guacamole-auth-json/pom.xml b/extensions/guacamole-auth-json/pom.xml index 0cbe414a2..baeaed620 100644 --- a/extensions/guacamole-auth-json/pom.xml +++ b/extensions/guacamole-auth-json/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-json jar - 1.3.0 + 1.4.0 guacamole-auth-json http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -43,7 +43,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.0 provided diff --git a/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json index 295c3941e..cbfec1e9c 100644 --- a/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-json/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "1.3.0", + "guacamoleVersion" : "1.4.0", "name" : "Encrypted JSON Authentication", "namespace" : "json", diff --git a/extensions/guacamole-auth-ldap/pom.xml b/extensions/guacamole-auth-ldap/pom.xml index 5aa8f967d..74e6620b4 100644 --- a/extensions/guacamole-auth-ldap/pom.xml +++ b/extensions/guacamole-auth-ldap/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-ldap jar - 1.3.0 + 1.4.0 guacamole-auth-ldap http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -43,7 +43,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.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 82a9dca92..c21cfa4c0 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.3.0", + "guacamoleVersion" : "1.4.0", "name" : "LDAP Authentication", "namespace" : "ldap", diff --git a/extensions/guacamole-auth-quickconnect/pom.xml b/extensions/guacamole-auth-quickconnect/pom.xml index 213122f8b..adf47cc86 100644 --- a/extensions/guacamole-auth-quickconnect/pom.xml +++ b/extensions/guacamole-auth-quickconnect/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-quickconnect jar - 1.3.0 + 1.4.0 guacamole-auth-quickconnect http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -98,7 +98,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.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 f16c8783e..b61baae1c 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.3.0", + "guacamoleVersion" : "1.4.0", "name" : "Adhoc Guacamole Connections", "namespace" : "quickconnect", diff --git a/extensions/guacamole-auth-radius/pom.xml b/extensions/guacamole-auth-radius/pom.xml index 0db2672cc..2e2cc588e 100644 --- a/extensions/guacamole-auth-radius/pom.xml +++ b/extensions/guacamole-auth-radius/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-radius jar - 1.3.0 + 1.4.0 guacamole-auth-radius http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -115,7 +115,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.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 0ea85385b..916c3df13 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.3.0", + "guacamoleVersion" : "1.4.0", "name" : "RADIUS Authentication Backend", "namespace" : "radius", diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml index 11724ecf4..2c3661e30 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-base/pom.xml @@ -32,7 +32,7 @@ org.apache.guacamole guacamole-auth-sso - 1.3.0 + 1.4.0 ../../ diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml index a876dca94..3a1caafe3 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-sso-cas jar - 1.3.0 + 1.4.0 guacamole-auth-sso-cas http://guacamole.apache.org/ org.apache.guacamole guacamole-auth-sso - 1.3.0 + 1.4.0 ../../ diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json index 25584cf89..aec7870a9 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-cas/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "1.3.0", + "guacamoleVersion" : "1.4.0", "name" : "CAS Authentication Extension", "namespace" : "cas", diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml index b1f2a352e..7d6cbef4e 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-dist/pom.xml @@ -32,7 +32,7 @@ org.apache.guacamole guacamole-auth-sso - 1.3.0 + 1.4.0 ../../ @@ -42,21 +42,21 @@ org.apache.guacamole guacamole-auth-sso-cas - 1.3.0 + 1.4.0 org.apache.guacamole guacamole-auth-sso-openid - 1.3.0 + 1.4.0 org.apache.guacamole guacamole-auth-sso-saml - 1.3.0 + 1.4.0 diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml index 25550ef45..fde17c641 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-sso-openid jar - 1.3.0 + 1.4.0 guacamole-auth-sso-openid http://guacamole.apache.org/ org.apache.guacamole guacamole-auth-sso - 1.3.0 + 1.4.0 ../../ diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json index 3d96ab9de..1b7a2a162 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-openid/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "1.3.0", + "guacamoleVersion" : "1.4.0", "name" : "OpenID Authentication Extension", "namespace" : "openid", diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml index 50f1363ba..e555fbf0a 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-sso-saml jar - 1.3.0 + 1.4.0 guacamole-auth-sso-saml http://guacamole.apache.org/ org.apache.guacamole guacamole-auth-sso - 1.3.0 + 1.4.0 ../../ diff --git a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json index 4dafda62a..10e1c74aa 100644 --- a/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json +++ b/extensions/guacamole-auth-sso/modules/guacamole-auth-sso-saml/src/main/resources/guac-manifest.json @@ -1,6 +1,6 @@ { - "guacamoleVersion" : "1.3.0", + "guacamoleVersion" : "1.4.0", "name" : "SAML Authentication Extension", "namespace" : "saml", diff --git a/extensions/guacamole-auth-sso/pom.xml b/extensions/guacamole-auth-sso/pom.xml index c7dde0652..10dd809fc 100644 --- a/extensions/guacamole-auth-sso/pom.xml +++ b/extensions/guacamole-auth-sso/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-sso pom - 1.3.0 + 1.4.0 guacamole-auth-sso http://guacamole.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -59,7 +59,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.0 provided @@ -67,7 +67,7 @@ org.apache.guacamole guacamole-auth-sso-base - 1.3.0 + 1.4.0 diff --git a/extensions/guacamole-auth-totp/pom.xml b/extensions/guacamole-auth-totp/pom.xml index a0304886e..80601d957 100644 --- a/extensions/guacamole-auth-totp/pom.xml +++ b/extensions/guacamole-auth-totp/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-auth-totp jar - 1.3.0 + 1.4.0 guacamole-auth-totp http://guacamole.incubator.apache.org/ org.apache.guacamole extensions - 1.3.0 + 1.4.0 ../ @@ -127,7 +127,7 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.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 e4ed2e78b..6bb04ff2b 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.3.0", + "guacamoleVersion" : "1.4.0", "name" : "TOTP TFA Authentication Backend", "namespace" : "totp", diff --git a/extensions/pom.xml b/extensions/pom.xml index 6ce255266..938e7cc62 100644 --- a/extensions/pom.xml +++ b/extensions/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole extensions pom - 1.3.0 + 1.4.0 extensions http://guacamole.apache.org/ org.apache.guacamole guacamole-client - 1.3.0 + 1.4.0 ../ diff --git a/guacamole-common-js/pom.xml b/guacamole-common-js/pom.xml index 2dac06a82..5d7585b18 100644 --- a/guacamole-common-js/pom.xml +++ b/guacamole-common-js/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-common-js pom - 1.3.0 + 1.4.0 guacamole-common-js http://guacamole.apache.org/ org.apache.guacamole guacamole-client - 1.3.0 + 1.4.0 ../ diff --git a/guacamole-common-js/src/main/webapp/modules/Version.js b/guacamole-common-js/src/main/webapp/modules/Version.js index 4bad5a2dd..98d41e6a1 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.3.0"; +Guacamole.API_VERSION = "1.4.0"; diff --git a/guacamole-common/pom.xml b/guacamole-common/pom.xml index ca08ebcdc..afde56854 100644 --- a/guacamole-common/pom.xml +++ b/guacamole-common/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-common jar - 1.3.0 + 1.4.0 guacamole-common http://guacamole.apache.org/ org.apache.guacamole guacamole-client - 1.3.0 + 1.4.0 ../ diff --git a/guacamole-ext/pom.xml b/guacamole-ext/pom.xml index 5258f71c2..83f1b4114 100644 --- a/guacamole-ext/pom.xml +++ b/guacamole-ext/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole-ext jar - 1.3.0 + 1.4.0 guacamole-ext http://guacamole.apache.org/ org.apache.guacamole guacamole-client - 1.3.0 + 1.4.0 ../ @@ -87,7 +87,7 @@ org.apache.guacamole guacamole-common - 1.3.0 + 1.4.0 compile diff --git a/guacamole/pom.xml b/guacamole/pom.xml index 32f434520..22f15102f 100644 --- a/guacamole/pom.xml +++ b/guacamole/pom.xml @@ -26,14 +26,14 @@ org.apache.guacamole guacamole war - 1.3.0 + 1.4.0 guacamole http://guacamole.apache.org/ org.apache.guacamole guacamole-client - 1.3.0 + 1.4.0 ../ @@ -237,14 +237,14 @@ org.apache.guacamole guacamole-ext - 1.3.0 + 1.4.0 org.apache.guacamole guacamole-common-js - 1.3.0 + 1.4.0 zip runtime diff --git a/guacamole/src/main/frontend/src/app/index/controllers/indexController.js b/guacamole/src/main/frontend/src/app/index/controllers/indexController.js index 4d3bf9b73..77f67db2f 100644 --- a/guacamole/src/main/frontend/src/app/index/controllers/indexController.js +++ b/guacamole/src/main/frontend/src/app/index/controllers/indexController.js @@ -25,6 +25,7 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Required services const $document = $injector.get('$document'); + const $location = $injector.get('$location'); const $route = $injector.get('$route'); const $window = $injector.get('$window'); const clipboardService = $injector.get('clipboardService'); @@ -220,13 +221,22 @@ angular.module('index').controller('indexController', ['$scope', '$injector', }, true); /** - * Reloads the current route and controller, effectively forcing - * reauthentication. If the user is not logged in, this will result in - * the login screen appearing. + * Navigates the user back to the root of the application (or reloads the + * current route and controller if the user is already there), effectively + * forcing reauthentication. If the user is not logged in, this will result + * in the login screen appearing. */ $scope.reAuthenticate = function reAuthenticate() { + $scope.reAuthenticating = true; - $route.reload(); + + // Clear out URL state to conveniently bring user back to home screen + // upon relogin + if ($location.path() !== '/') + $location.url('/'); + else + $route.reload(); + }; // Display login screen if a whole new set of credentials is needed 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 fbb75a564..d82552dad 100644 --- a/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java +++ b/guacamole/src/main/java/org/apache/guacamole/extension/ExtensionModule.java @@ -66,7 +66,8 @@ public class ExtensionModule extends ServletModule { "1.0.0", "1.1.0", "1.2.0", - "1.3.0" + "1.3.0", + "1.4.0" )); /** diff --git a/pom.xml b/pom.xml index f133e2c18..8f7d9185a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ org.apache.guacamole guacamole-client pom - 1.3.0 + 1.4.0 guacamole-client http://guacamole.apache.org/