Skip to content
Snippets Groups Projects
Commit f3ec06b4 authored by Hallvard Trætteberg's avatar Hallvard Trætteberg
Browse files

Flere oppgraderinger inkl. til jakarta

parent bd39dd62
Branches
Tags
No related merge requests found
...@@ -3,5 +3,6 @@ ...@@ -3,5 +3,6 @@
"java.format.settings.url": "todolist/config/checkstyle/eclipse-java-google-style.xml", "java.format.settings.url": "todolist/config/checkstyle/eclipse-java-google-style.xml",
"[java]": { "[java]": {
"editor.tabSize": 2 "editor.tabSize": 2
} },
"java.dependency.packagePresentation": "hierarchical"
} }
...@@ -28,13 +28,11 @@ ...@@ -28,13 +28,11 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>2.12.2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind --> <!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId> <artifactId>jackson-databind</artifactId>
<version>2.12.2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml --> <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
...@@ -95,7 +93,7 @@ ...@@ -95,7 +93,7 @@
<plugin> <plugin>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId> <artifactId>javafx-maven-plugin</artifactId>
<version>0.0.4</version> <version>0.0.5</version>
<configuration> <configuration>
<mainClass>de.jensd.fx.glyphs.fontawesome.demo.FontAwesomeIconsDemoApp</mainClass> <mainClass>de.jensd.fx.glyphs.fontawesome.demo.FontAwesomeIconsDemoApp</mainClass>
</configuration> </configuration>
...@@ -179,13 +177,8 @@ ...@@ -179,13 +177,8 @@
<plugin> <plugin>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId> <artifactId>javafx-maven-plugin</artifactId>
<version>0.0.4</version> <version>0.0.5</version>
<configuration> <configuration>
<options>
<!--
<option>dash dash enable-preview</option>
-->
</options>
<mainClass>todolist.ui.TodoApp</mainClass> <mainClass>todolist.ui.TodoApp</mainClass>
</configuration> </configuration>
</plugin> </plugin>
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<dependency> <dependency>
<groupId>org.openjfx</groupId> <groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId> <artifactId>javafx-fxml</artifactId>
<version>14.0.2</version> <version>16</version>
</dependency> </dependency>
<!-- <!--
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<properties> <properties>
<slf4jVersion>1.7.25</slf4jVersion> <slf4jVersion>1.7.25</slf4jVersion>
<jerseyVersion>2.28</jerseyVersion> <jerseyVersion>3.0.1</jerseyVersion>
</properties> </properties>
<dependencies> <dependencies>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<dependency> <dependency>
<groupId>jakarta.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<version>2.1.5</version> <version>3.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
......
package todolist.restapi; package todolist.restapi;
import java.io.IOException; import java.io.IOException;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.DELETE; import jakarta.ws.rs.DELETE;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.POST; import jakarta.ws.rs.POST;
import javax.ws.rs.PUT; import jakarta.ws.rs.PUT;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.QueryParam; import jakarta.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import todolist.core.AbstractTodoList; import todolist.core.AbstractTodoList;
......
package todolist.restapi; package todolist.restapi;
import javax.inject.Inject; import javax.inject.Inject;
import javax.ws.rs.GET; import jakarta.ws.rs.GET;
import javax.ws.rs.Path; import jakarta.ws.rs.Path;
import javax.ws.rs.PathParam; import jakarta.ws.rs.PathParam;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import todolist.core.AbstractTodoList; import todolist.core.AbstractTodoList;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<properties> <properties>
<slf4jVersion>1.7.25</slf4jVersion> <slf4jVersion>1.7.25</slf4jVersion>
<jerseyVersion>2.28</jerseyVersion> <jerseyVersion>3.0.1</jerseyVersion>
</properties> </properties>
<dependencies> <dependencies>
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
</dependency> </dependency>
<!-- Kompileringsavhengigheter for Jersey --> <!-- Kompileringsavhengigheter for Jersey -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<version>${jerseyVersion}</version>
</dependency>
<dependency> <dependency>
<groupId>org.glassfish.jersey.core</groupId> <groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-server</artifactId> <artifactId>jersey-server</artifactId>
......
package todolist.restserver; package todolist.restserver;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import javax.ws.rs.Consumes; import jakarta.ws.rs.Consumes;
import javax.ws.rs.Produces; import jakarta.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.ext.ContextResolver; import jakarta.ws.rs.ext.ContextResolver;
import javax.ws.rs.ext.Provider; import jakarta.ws.rs.ext.Provider;
import todolist.json.TodoModule; import todolist.json.TodoModule;
@Provider @Provider
......
...@@ -5,8 +5,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; ...@@ -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.assertTrue;
import static org.junit.jupiter.api.Assertions.fail; import static org.junit.jupiter.api.Assertions.fail;
import java.util.Iterator; import java.util.Iterator;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import org.glassfish.jersey.logging.LoggingFeature; import org.glassfish.jersey.logging.LoggingFeature;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment