diff options
7 files changed, 23 insertions, 33 deletions
@@ -5,7 +5,7 @@ <groupId>de.bwlehrpool</groupId> <artifactId>bwlp-guac</artifactId> - <version>1.2.1-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <packaging>jar</packaging> <name>bwlp-guac</name> @@ -25,7 +25,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> - <version>1.4</version> + <version>3.0.0</version> <executions> <execution> <phase>validate</phase> @@ -45,17 +45,18 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <version>3.6.1</version> + <version>3.10.1</version> <configuration> <source>1.8</source> <target>1.8</target> + <release>8</release> </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.0.0</version> + <version>3.3.0</version> <configuration> <archive> <manifestEntries> @@ -71,7 +72,7 @@ <plugin> <groupId>com.keithbranton.mojo</groupId> <artifactId>angular-maven-plugin</artifactId> - <version>0.3.2</version> + <version>0.3.4</version> <executions> <execution> <phase>generate-resources</phase> @@ -92,7 +93,7 @@ <plugin> <groupId>com.samaxes.maven</groupId> <artifactId>minify-maven-plugin</artifactId> - <version>1.7.5</version> + <version>1.7.6</version> <executions> <execution> <id>default-cli</id> @@ -144,13 +145,13 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> + <version>4.13.2</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.guacamole</groupId> <artifactId>guacamole-ext</artifactId> - <version>1.2.0</version> + <version>1.4.0</version> </dependency> <dependency> <groupId>javax.servlet</groupId> @@ -159,9 +160,9 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>jsr311-api</artifactId> - <version>1.1.1</version> + <groupId>jakarta.ws.rs</groupId> + <artifactId>jakarta.ws.rs-api</artifactId> + <version>3.1.0</version> <scope>provided</scope> </dependency> </dependencies> 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); |