From f3ec06b47e49241e4eef732cbd3ed99373ac979f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hallvard=20Tr=C3=A6tteberg?= <hal@ntnu.no>
Date: Mon, 12 Apr 2021 08:25:31 +0000
Subject: [PATCH] Flere oppgraderinger inkl. til jakarta
---
.theia/settings.json | 3 ++-
todolist/fxui/pom.xml | 13 +++----------
todolist/fxutil/pom.xml | 2 +-
todolist/integrationtests/pom.xml | 2 +-
todolist/restapi/pom.xml | 2 +-
.../todolist/restapi/TodoListResource.java | 18 +++++++++---------
.../todolist/restapi/TodoModelService.java | 10 +++++-----
todolist/restserver/pom.xml | 7 ++++++-
.../TodoModuleObjectMapperProvider.java | 10 +++++-----
.../todolist/restserver/TodoServiceTest.java | 4 ++--
10 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/.theia/settings.json b/.theia/settings.json
index 9288475..6f64435 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 cba6b64..0b7d799 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 366a8e8..486ca15 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 06bd96e..d4c151c 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 f738f74..3c8ab55 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 b8663e7..578203a 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 b3e8336..174c088 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 cf5ded7..5c6d1be 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 b1a6573..0cab8a8 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 4079f21..fe11032 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;
--
GitLab