Compatibility with guacamole 1.4.0

6 files changed, 11 insertions, 22 deletions

diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java
index 55dbde4..e77c584 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpAuthenticationProvider.java
@@ -8,8 +8,8 @@ import java.util.*;
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.net.auth.*;
 import org.apache.guacamole.language.TranslatableGuacamoleCredentialsException;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import javax.servlet.http.HttpServletRequest;
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java
index 4830d02..5b9b54c 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/BwlpREST.java
@@ -1,9 +1,9 @@
 package de.bwlehrpool.bwlp_guac;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 
 public class BwlpREST {
 
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/ConnectionManager.java b/src/main/java/de/bwlehrpool/bwlp_guac/ConnectionManager.java
index 1f7d928..10c9eb2 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/ConnectionManager.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/ConnectionManager.java
@@ -32,7 +32,7 @@ import org.apache.guacamole.net.auth.credentials.CredentialsInfo;
 import org.apache.guacamole.net.auth.credentials.GuacamoleCredentialsException;
 import org.apache.guacamole.language.TranslatableGuacamoleCredentialsException;
 import org.apache.guacamole.language.TranslatableGuacamoleInsufficientCredentialsException;
-import org.codehaus.jackson.map.ObjectMapper;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/GroupField.java b/src/main/java/de/bwlehrpool/bwlp_guac/GroupField.java
index ddc57e8..a15f36f 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/GroupField.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/GroupField.java
@@ -2,7 +2,7 @@ package de.bwlehrpool.bwlp_guac;
 
 import org.apache.guacamole.GuacamoleException;
 import org.apache.guacamole.form.Field;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.Collection;
 
 /**
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/JsonGroup.java b/src/main/java/de/bwlehrpool/bwlp_guac/JsonGroup.java
index e1aef81..e5d9a0e 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/JsonGroup.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/JsonGroup.java
@@ -2,8 +2,8 @@ package de.bwlehrpool.bwlp_guac;
 
 import java.util.concurrent.ConcurrentLinkedQueue;
 
-import org.codehaus.jackson.annotate.JsonIgnore;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class JsonGroup {
 
diff --git a/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java b/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java
index 1fadac0..191bcd9 100644
--- a/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java
+++ b/src/main/java/de/bwlehrpool/bwlp_guac/SlxConfig.java
@@ -11,7 +11,7 @@ public class SlxConfig {
 
 	private static final Logger LOGGER = LoggerFactory.getLogger(SlxConfig.class);
 
-	private static final Environment ENVIRONMENT;
+	private static final Environment ENVIRONMENT = LocalEnvironment.getInstance();
 
 	private static final StringGuacamoleProperty CLIENTS_URL = new StringGuacamoleProperty() {
 		@Override
@@ -34,17 +34,6 @@ public class SlxConfig {
 		}
 	};
 
-	static {
-		Environment e;
-		try {
-			e = new LocalEnvironment();
-		} catch (GuacamoleException ex) {
-			LOGGER.warn("Cannot create LocalEnvironment", ex);
-			e = null;
-		}
-		ENVIRONMENT = e;
-	}
-
 	public static String clientListUrl() {
 		try {
 			return ENVIRONMENT.getProperty(CLIENTS_URL);