From 8e6241e293fbe91e135f71bfcd148a72cf6463a5 Mon Sep 17 00:00:00 2001 From: Steffen Ritter Date: Thu, 2 Mar 2023 11:18:40 +0100 Subject: Compatibility with guacamole 1.4.0 --- pom.xml | 23 +++++++++++----------- .../bwlp_guac/BwlpAuthenticationProvider.java | 4 ++-- .../java/de/bwlehrpool/bwlp_guac/BwlpREST.java | 8 ++++---- .../de/bwlehrpool/bwlp_guac/ConnectionManager.java | 2 +- .../java/de/bwlehrpool/bwlp_guac/GroupField.java | 2 +- .../java/de/bwlehrpool/bwlp_guac/JsonGroup.java | 4 ++-- .../java/de/bwlehrpool/bwlp_guac/SlxConfig.java | 13 +----------- 7 files changed, 23 insertions(+), 33 deletions(-) diff --git a/pom.xml b/pom.xml index cf7580b..3c8717d 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ de.bwlehrpool bwlp-guac - 1.2.1-SNAPSHOT + 1.4.0-SNAPSHOT jar bwlp-guac @@ -25,7 +25,7 @@ org.codehaus.mojo buildnumber-maven-plugin - 1.4 + 3.0.0 validate @@ -45,17 +45,18 @@ org.apache.maven.plugins maven-compiler-plugin - 3.6.1 + 3.10.1 1.8 1.8 + 8 org.apache.maven.plugins maven-jar-plugin - 3.0.0 + 3.3.0 @@ -71,7 +72,7 @@ com.keithbranton.mojo angular-maven-plugin - 0.3.2 + 0.3.4 generate-resources @@ -92,7 +93,7 @@ com.samaxes.maven minify-maven-plugin - 1.7.5 + 1.7.6 default-cli @@ -144,13 +145,13 @@ junit junit - 3.8.1 + 4.13.2 test org.apache.guacamole guacamole-ext - 1.2.0 + 1.4.0 javax.servlet @@ -159,9 +160,9 @@ provided - javax.ws.rs - jsr311-api - 1.1.1 + jakarta.ws.rs + jakarta.ws.rs-api + 3.1.0 provided 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); -- cgit v1.2.3-55-g7522