guacamole 0.9.13-incubating support

aiden0z · Aug 16, 2017 · 45b3065 · 45b3065
1 parent 4bdca31
commit 45b3065
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 19 deletions.
diff --git a/build.gradle b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'idea'
 
 group = 'com.aiden0z.guacamole-auth-jwt'
-version = '1.0.0'
+version = '1.0.1'
 
 description = """ guacamole custome authentication based on JSON WEB TOKEN """
 
@@ -14,7 +14,7 @@ repositories {
      maven { url "http://repo.maven.apache.org/maven2" }
 }
 dependencies {
-    compile group: 'org.glyptodon.guacamole', name: 'guacamole-ext', version:'0.9.9'
+    compile group: 'org.apache.guacamole', name: 'guacamole-ext', version: '0.9.13-incubating'
     compile group: 'javax.servlet', name: 'servlet-api', version:'2.5'
     compile group: 'com.sun.xml.security', name: 'xml-security-impl', version:'1.0'
     compile group: 'com.google.inject', name: 'guice', version: '4.1.0'
@@ -25,4 +25,3 @@ dependencies {
     testCompile 'org.mockito:mockito-core:2.+'
 
 }
-
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1 @@
 rootProject.name = 'guacamole-auth-jwt'
-
diff --git a/src/main/java/com/aiden0z/guacamole/net/jwt/AuthenticationProviderService.java b/src/main/java/com/aiden0z/guacamole/net/jwt/AuthenticationProviderService.java
@@ -5,10 +5,10 @@
 import io.jsonwebtoken.Claims;
 import io.jsonwebtoken.JwtException;
 import io.jsonwebtoken.Jwts;
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.properties.StringGuacamoleProperty;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.properties.StringGuacamoleProperty;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/src/main/java/com/aiden0z/guacamole/net/jwt/JwtAuthenticationProvider.java b/src/main/java/com/aiden0z/guacamole/net/jwt/JwtAuthenticationProvider.java
@@ -5,12 +5,12 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-import org.glyptodon.guacamole.GuacamoleException;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.environment.LocalEnvironment;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.net.auth.simple.SimpleAuthenticationProvider;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.GuacamoleException;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.environment.LocalEnvironment;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.net.auth.simple.SimpleAuthenticationProvider;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 import java.util.Map;
 

diff --git a/src/main/resources/guac-manifest.json b/src/main/resources/guac-manifest.json
@@ -1,8 +1,8 @@
 {
 
-  "guacamoleVersion" : "0.9.9",
+  "guacamoleVersion" : "0.9.13-incubating",
   "name"      : "Jwt Authentication",
   "namespace" : "guac-jwt",
   "authProviders" : ["com.aiden0z.guacamole.net.jwt.JwtAuthenticationProvider"]
 
-}
+}
diff --git a/src/test/java/com/aiden0z/guacamole/net/jwt/JwtAuthenticationProviderTest.java b/src/test/java/com/aiden0z/guacamole/net/jwt/JwtAuthenticationProviderTest.java
@@ -8,9 +8,9 @@
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.SignatureAlgorithm;
 import io.jsonwebtoken.impl.DefaultClaims;
-import org.glyptodon.guacamole.environment.Environment;
-import org.glyptodon.guacamole.net.auth.Credentials;
-import org.glyptodon.guacamole.protocol.GuacamoleConfiguration;
+import org.apache.guacamole.environment.Environment;
+import org.apache.guacamole.net.auth.Credentials;
+import org.apache.guacamole.protocol.GuacamoleConfiguration;
 
 
 import javax.servlet.http.HttpServletRequest;