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

Made it work for ui and rest, not spring boot, yet.

parent 145f89e6
No related branches found
No related tags found
No related merge requests found
...@@ -2,8 +2,6 @@ package todolist.json; ...@@ -2,8 +2,6 @@ package todolist.json;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.module.SimpleModule; import com.fasterxml.jackson.databind.module.SimpleModule;
import java.io.FileReader; import java.io.FileReader;
import java.io.FileWriter; import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
...@@ -12,8 +10,6 @@ import java.io.Writer; ...@@ -12,8 +10,6 @@ import java.io.Writer;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import todolist.core.TodoModel; import todolist.core.TodoModel;
import todolist.json.internal.TodoModule; import todolist.json.internal.TodoModule;
......
...@@ -179,6 +179,9 @@ ...@@ -179,6 +179,9 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<skipTests>${skipUiTests}</skipTests> <skipTests>${skipUiTests}</skipTests>
<argLine>
--add-opens todolist.ui/todolist.ui=ALL-UNNAMED --add-exports javafx.graphics/com.sun.javafx.application=ALL-UNNAMED
</argLine>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
......
...@@ -162,6 +162,8 @@ ...@@ -162,6 +162,8 @@
<module>fxui</module> <module>fxui</module>
<module>rest</module> <module>rest</module>
<module>integrationtests</module> <module>integrationtests</module>
<!--
<module>springboot/restserver</module> <module>springboot/restserver</module>
-->
</modules> </modules>
</project> </project>
...@@ -140,26 +140,6 @@ ...@@ -140,26 +140,6 @@
<version>1.1.1</version> <version>1.1.1</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<!--
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>2.3.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-core</artifactId>
<version>2.3.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
<version>2.3.0</version>
<scope>runtime</scope>
</dependency>
-->
</dependencies> </dependencies>
<build> <build>
......
...@@ -9,4 +9,6 @@ module todolist.rest { ...@@ -9,4 +9,6 @@ module todolist.rest {
requires org.slf4j; requires org.slf4j;
requires todolist.core; requires todolist.core;
opens todolist.restapi to jersey.server;
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment