From bef2139822c75ebda79129813b2b852f080fdab6 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 15 Dec 2015 13:00:59 -0800 Subject: [PATCH] GUAC-1392: Update "guacamoleVersion" of all guac-manifest.json to "0.9.9". Update ExtensionModule to accept only "0.9.9" (or "*"). --- .../src/main/resources/guac-manifest.json | 2 +- .../src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-ldap/src/main/resources/guac-manifest.json | 2 +- .../guacamole-auth-noauth/src/main/resources/guac-manifest.json | 2 +- .../guacamole/net/basic/extension/ExtensionModule.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 4519da4ff..d219fb692 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.8", + "guacamoleVersion" : "0.9.9", "name" : "MySQL Authentication", "namespace" : "guac-mysql", 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 275ae227e..77f1f0b02 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.8", + "guacamoleVersion" : "0.9.9", "name" : "PostgreSQL Authentication", "namespace" : "guac-postgresql", 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 606ccd051..e9448cfb3 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.8", + "guacamoleVersion" : "0.9.9", "name" : "LDAP Authentication", "namespace" : "guac-ldap", 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 8656db97f..c7d2bfa82 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.8", + "guacamoleVersion" : "0.9.9", "name" : "Disabled Authentication", "namespace" : "guac-noauth", diff --git a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java index b9f070412..6296ea5de 100644 --- a/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java +++ b/guacamole/src/main/java/org/glyptodon/guacamole/net/basic/extension/ExtensionModule.java @@ -65,7 +65,7 @@ public class ExtensionModule extends ServletModule { private static final List ALLOWED_GUACAMOLE_VERSIONS = Collections.unmodifiableList(Arrays.asList( "*", - "0.9.8" + "0.9.9" )); /**