diff --git a/.theia/settings.json b/.theia/settings.json
index 928847590044d63682c225c0453d2d5fcf3b2533..6f644350bdd7ab32d53a2e2c8d5ee89c359b3d62 100644
--- a/.theia/settings.json
+++ b/.theia/settings.json
@@ -3,5 +3,6 @@
"java.format.settings.url": "todolist/config/checkstyle/eclipse-java-google-style.xml",
"[java]": {
"editor.tabSize": 2
- }
+ },
+ "java.dependency.packagePresentation": "hierarchical"
}
diff --git a/todolist/fxui/pom.xml b/todolist/fxui/pom.xml
index cba6b64fed2e623217f1c45f9a138520b82eb877..0b7d7998c8a217e292edc33565ea6647c0e8991c 100644
--- a/todolist/fxui/pom.xml
+++ b/todolist/fxui/pom.xml
@@ -28,13 +28,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.12.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.12.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
@@ -95,7 +93,7 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.4</version>
+ <version>0.0.5</version>
<configuration>
<mainClass>de.jensd.fx.glyphs.fontawesome.demo.FontAwesomeIconsDemoApp</mainClass>
</configuration>
@@ -179,13 +177,8 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.4</version>
- <configuration>
- <options>
- <!--
- <option>dash dash enable-preview</option>
- -->
- </options>
+ <version>0.0.5</version>
+ <configuration>
<mainClass>todolist.ui.TodoApp</mainClass>
</configuration>
</plugin>
diff --git a/todolist/fxutil/pom.xml b/todolist/fxutil/pom.xml
index 366a8e865c83ff67bd3a04f35c713585228705d2..486ca15fea76daa8af1c3aab80c968ab3f1075d4 100644
--- a/todolist/fxutil/pom.xml
+++ b/todolist/fxutil/pom.xml
@@ -16,7 +16,7 @@
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
- <version>14.0.2</version>
+ <version>16</version>
</dependency>
<!--
diff --git a/todolist/integrationtests/pom.xml b/todolist/integrationtests/pom.xml
index 06bd96e00077eb3f6d67ae63d2f0a5ecc073652f..d4c151c82fa9764f6af525945c064ffdde5bc7b6 100644
--- a/todolist/integrationtests/pom.xml
+++ b/todolist/integrationtests/pom.xml
@@ -14,7 +14,7 @@
<properties>
<slf4jVersion>1.7.25</slf4jVersion>
- <jerseyVersion>2.28</jerseyVersion>
+ <jerseyVersion>3.0.1</jerseyVersion>
</properties>
<dependencies>
diff --git a/todolist/restapi/pom.xml b/todolist/restapi/pom.xml
index f738f740c01828462a46633eebd3116400bd932e..3c8ab55785e7d5e87c77070e15ff3630408f4299 100644
--- a/todolist/restapi/pom.xml
+++ b/todolist/restapi/pom.xml
@@ -25,7 +25,7 @@
<dependency>
<groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId>
- <version>2.1.5</version>
+ <version>3.0.0</version>
</dependency>
<dependency>
diff --git a/todolist/restapi/src/main/java/todolist/restapi/TodoListResource.java b/todolist/restapi/src/main/java/todolist/restapi/TodoListResource.java
index b8663e7ac84b37fd85f03835ea1f87b9636bbe64..578203aabb8c1998880a19dc49e446eb53dea806 100644
--- a/todolist/restapi/src/main/java/todolist/restapi/TodoListResource.java
+++ b/todolist/restapi/src/main/java/todolist/restapi/TodoListResource.java
@@ -1,15 +1,15 @@
package todolist.restapi;
import java.io.IOException;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.DELETE;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.PUT;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import todolist.core.AbstractTodoList;
diff --git a/todolist/restapi/src/main/java/todolist/restapi/TodoModelService.java b/todolist/restapi/src/main/java/todolist/restapi/TodoModelService.java
index b3e8336c09a0b7079bc29da6c8e2c5199b857f85..174c08853e232a7723bc904b081aaf4c98954089 100644
--- a/todolist/restapi/src/main/java/todolist/restapi/TodoModelService.java
+++ b/todolist/restapi/src/main/java/todolist/restapi/TodoModelService.java
@@ -1,11 +1,11 @@
package todolist.restapi;
import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-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.PathParam;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import todolist.core.AbstractTodoList;
diff --git a/todolist/restserver/pom.xml b/todolist/restserver/pom.xml
index cf5ded7c3bc8fd5e6594e7d017a00f13a730cdb4..5c6d1bef0d9dc52d40151e549df9e7ea8715a01d 100644
--- a/todolist/restserver/pom.xml
+++ b/todolist/restserver/pom.xml
@@ -14,7 +14,7 @@
<properties>
<slf4jVersion>1.7.25</slf4jVersion>
- <jerseyVersion>2.28</jerseyVersion>
+ <jerseyVersion>3.0.1</jerseyVersion>
</properties>
<dependencies>
@@ -70,6 +70,11 @@
</dependency>
<!-- Kompileringsavhengigheter for Jersey -->
+ <dependency>
+ <groupId>org.glassfish.jersey.core</groupId>
+ <artifactId>jersey-common</artifactId>
+ <version>${jerseyVersion}</version>
+ </dependency>
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId>
diff --git a/todolist/restserver/src/main/java/todolist/restserver/TodoModuleObjectMapperProvider.java b/todolist/restserver/src/main/java/todolist/restserver/TodoModuleObjectMapperProvider.java
index b1a6573833b8ae97a0780dab6689a01782e78ecc..0cab8a8e3ec681ec501e05b77a398fed6851de34 100644
--- a/todolist/restserver/src/main/java/todolist/restserver/TodoModuleObjectMapperProvider.java
+++ b/todolist/restserver/src/main/java/todolist/restserver/TodoModuleObjectMapperProvider.java
@@ -1,11 +1,11 @@
package todolist.restserver;
import com.fasterxml.jackson.databind.ObjectMapper;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.ext.ContextResolver;
-import javax.ws.rs.ext.Provider;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.ext.ContextResolver;
+import jakarta.ws.rs.ext.Provider;
import todolist.json.TodoModule;
@Provider
diff --git a/todolist/restserver/src/test/java/todolist/restserver/TodoServiceTest.java b/todolist/restserver/src/test/java/todolist/restserver/TodoServiceTest.java
index 4079f21daa4f1ff2611fa4e1d1620ea0f86da798..fe110324f9d8d846555749ea17da2bd7f7352e75 100644
--- a/todolist/restserver/src/test/java/todolist/restserver/TodoServiceTest.java
+++ b/todolist/restserver/src/test/java/todolist/restserver/TodoServiceTest.java
@@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.junit.jupiter.api.Assertions.fail;
import java.util.Iterator;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.glassfish.jersey.logging.LoggingFeature;