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

Oppgraderer til java 16 og diverse maven

parent ca618898
No related branches found
No related tags found
No related merge requests found
...@@ -9,5 +9,5 @@ RUN apt -y install graphviz ...@@ -9,5 +9,5 @@ RUN apt -y install graphviz
USER gitpod USER gitpod
RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \ RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
&& sdk install java 14.0.2.j9-adpt \ && sdk install java 16.0.0.j9-adpt \
&& sdk default java 14.0.2.j9-adpt" && sdk default java 16.0.0.j9-adpt"
...@@ -2,7 +2,7 @@ image: ...@@ -2,7 +2,7 @@ image:
file: .gitpod.Dockerfile file: .gitpod.Dockerfile
tasks: tasks:
- init: sdk use java 14.0.2.j9-adpt - init: sdk use 16.0.0.j9-adpt
command: cd todolist command: cd todolist
ports: ports:
......
...@@ -16,13 +16,11 @@ ...@@ -16,13 +16,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.11.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.11.2</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -28,20 +28,20 @@ ...@@ -28,20 +28,20 @@
<dependency> <dependency>
<groupId>com.fasterxml.jackson.core</groupId> <groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId> <artifactId>jackson-core</artifactId>
<version>2.11.2</version> <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.11.2</version> <version>2.12.2</version>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml --> <!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
<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>
<!-- https://mvnrepository.com/artifact/de.jensd/fontawesomefx-controls --> <!-- https://mvnrepository.com/artifact/de.jensd/fontawesomefx-controls -->
...@@ -110,7 +110,7 @@ ...@@ -110,7 +110,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>todolist.ui.TodoDocumentApp</mainClass> <mainClass>todolist.ui.TodoDocumentApp</mainClass>
</configuration> </configuration>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,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>todolist.ui.TodoRemoteApp</mainClass> <mainClass>todolist.ui.TodoRemoteApp</mainClass>
</configuration> </configuration>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<plugin> <plugin>
<groupId>com.sandec.jpro</groupId> <groupId>com.sandec.jpro</groupId>
<artifactId>jpro-maven-plugin</artifactId> <artifactId>jpro-maven-plugin</artifactId>
<version>2020.1.0</version> <version>2020.1.5</version>
<configuration> <configuration>
<visible>false</visible> <visible>false</visible>
<JVMArgs> <JVMArgs>
......
...@@ -80,7 +80,10 @@ ...@@ -80,7 +80,10 @@
<plugin> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
</plugin> </plugin>
<plugin>
<artifactId>maven-war-plugin</artifactId>
<version>3.3.1</version>
</plugin>
<!-- Reservere porter og tilordne dem til variabler --> <!-- Reservere porter og tilordne dem til variabler -->
<plugin> <plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
...@@ -105,7 +108,10 @@ ...@@ -105,7 +108,10 @@
<plugin> <plugin>
<groupId>org.eclipse.jetty</groupId> <groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId> <artifactId>jetty-maven-plugin</artifactId>
<version>11.0.2</version>
<!--
<version>9.4.31.v20200723</version> <version>9.4.31.v20200723</version>
-->
<configuration> <configuration>
<httpConnector> <httpConnector>
<port>${jetty.port}</port> <port>${jetty.port}</port>
......
...@@ -14,31 +14,47 @@ ...@@ -14,31 +14,47 @@
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId> <artifactId>junit-jupiter-api</artifactId>
<version>5.7.0</version> <version>5.7.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>5.7.0</version> <version>5.7.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId> <artifactId>junit-jupiter-params</artifactId>
<version>5.7.0</version> <version>5.7.1</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core --> <!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
<dependency> <dependency>
<groupId>org.mockito</groupId> <groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId> <artifactId>mockito-core</artifactId>
<version>3.5.10</version> <version>3.9.0</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
<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>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -50,12 +66,7 @@ ...@@ -50,12 +66,7 @@
<version>3.8.1</version> <version>3.8.1</version>
<configuration> <configuration>
<encoding>UTF-8</encoding> <encoding>UTF-8</encoding>
<release>14</release> <release>16</release>
<compilerArgs>
<!--
<arg>dash dash enable-preview</arg>
-->
</compilerArgs>
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
...@@ -72,12 +83,12 @@ ...@@ -72,12 +83,12 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.1</version> <version>3.1.2</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.puppycrawl.tools</groupId> <groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId> <artifactId>checkstyle</artifactId>
<version>8.36.1</version> <version>8.41.1</version>
</dependency> </dependency>
</dependencies> </dependencies>
<configuration> <configuration>
...@@ -101,7 +112,7 @@ ...@@ -101,7 +112,7 @@
<plugin> <plugin>
<groupId>com.github.spotbugs</groupId> <groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId> <artifactId>spotbugs-maven-plugin</artifactId>
<version>4.0.4</version> <version>4.2.2</version>
<configuration> <configuration>
<xmlOutput>false</xmlOutput> <xmlOutput>false</xmlOutput>
<htmlOutput>true</htmlOutput> <htmlOutput>true</htmlOutput>
...@@ -120,7 +131,7 @@ ...@@ -120,7 +131,7 @@
<plugin> <plugin>
<groupId>org.jacoco</groupId> <groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId> <artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.5</version> <version>0.8.6</version>
<executions> <executions>
<execution> <execution>
<id>jacoco-prepare-agent</id> <id>jacoco-prepare-agent</id>
......
...@@ -34,13 +34,11 @@ ...@@ -34,13 +34,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.11.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.11.2</version>
</dependency> </dependency>
<dependency> <dependency>
......
...@@ -24,13 +24,11 @@ ...@@ -24,13 +24,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.11.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.11.2</version>
</dependency> </dependency>
<dependency> <dependency>
...@@ -53,7 +51,7 @@ ...@@ -53,7 +51,7 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>2.3.4.RELEASE</version> <version>2.4.4</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
...@@ -64,13 +62,13 @@ ...@@ -64,13 +62,13 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId> <artifactId>spring-boot-starter-jetty</artifactId>
<version>2.3.4.RELEASE</version> <version>2.4.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<version>2.3.4.RELEASE</version> <version>2.4.4</version>
<scope>test</scope> <scope>test</scope>
<exclusions> <exclusions>
<exclusion> <exclusion>
...@@ -115,7 +113,7 @@ ...@@ -115,7 +113,7 @@
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
<version>2.3.4.RELEASE</version> <version>2.4.4</version>
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment