From bd39dd62c605bf0d3d9545ec94cfd2f5b9e79380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hallvard=20Tr=C3=A6tteberg?= <hal@ntnu.no>
Date: Mon, 12 Apr 2021 07:40:57 +0000
Subject: [PATCH] Oppgraderer til java 16 og diverse maven
---
.gitpod.Dockerfile | 4 +--
.gitpod.yml | 2 +-
todolist/core/pom.xml | 2 --
todolist/fxui/pom.xml | 12 ++++----
todolist/integrationtests/pom.xml | 8 +++++-
todolist/pom.xml | 39 +++++++++++++++++---------
todolist/restserver/pom.xml | 2 --
todolist/springboot/restserver/pom.xml | 10 +++----
8 files changed, 45 insertions(+), 34 deletions(-)
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
index 013bb80..bac8a45 100644
--- a/.gitpod.Dockerfile
+++ b/.gitpod.Dockerfile
@@ -9,5 +9,5 @@ RUN apt -y install graphviz
USER gitpod
RUN bash -c ". /home/gitpod/.sdkman/bin/sdkman-init.sh \
- && sdk install java 14.0.2.j9-adpt \
- && sdk default java 14.0.2.j9-adpt"
+ && sdk install java 16.0.0.j9-adpt \
+ && sdk default java 16.0.0.j9-adpt"
diff --git a/.gitpod.yml b/.gitpod.yml
index 2763942..0d07d59 100644
--- a/.gitpod.yml
+++ b/.gitpod.yml
@@ -2,7 +2,7 @@ image:
file: .gitpod.Dockerfile
tasks:
- - init: sdk use java 14.0.2.j9-adpt
+ - init: sdk use 16.0.0.j9-adpt
command: cd todolist
ports:
diff --git a/todolist/core/pom.xml b/todolist/core/pom.xml
index 383d0a1..5a30f71 100644
--- a/todolist/core/pom.xml
+++ b/todolist/core/pom.xml
@@ -16,13 +16,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.11.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.11.2</version>
</dependency>
<dependency>
diff --git a/todolist/fxui/pom.xml b/todolist/fxui/pom.xml
index e92981a..cba6b64 100644
--- a/todolist/fxui/pom.xml
+++ b/todolist/fxui/pom.xml
@@ -28,20 +28,20 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.11.2</version>
+ <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.11.2</version>
+ <version>2.12.2</version>
</dependency>
<!-- https://mvnrepository.com/artifact/org.openjfx/javafx-fxml -->
<dependency>
<groupId>org.openjfx</groupId>
<artifactId>javafx-fxml</artifactId>
- <version>14.0.2</version>
+ <version>16</version>
</dependency>
<!-- https://mvnrepository.com/artifact/de.jensd/fontawesomefx-controls -->
@@ -110,7 +110,7 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.4</version>
+ <version>0.0.5</version>
<configuration>
<mainClass>todolist.ui.TodoDocumentApp</mainClass>
</configuration>
@@ -125,7 +125,7 @@
<plugin>
<groupId>org.openjfx</groupId>
<artifactId>javafx-maven-plugin</artifactId>
- <version>0.0.4</version>
+ <version>0.0.5</version>
<configuration>
<mainClass>todolist.ui.TodoRemoteApp</mainClass>
</configuration>
@@ -152,7 +152,7 @@
<plugin>
<groupId>com.sandec.jpro</groupId>
<artifactId>jpro-maven-plugin</artifactId>
- <version>2020.1.0</version>
+ <version>2020.1.5</version>
<configuration>
<visible>false</visible>
<JVMArgs>
diff --git a/todolist/integrationtests/pom.xml b/todolist/integrationtests/pom.xml
index 97c6e19..06bd96e 100644
--- a/todolist/integrationtests/pom.xml
+++ b/todolist/integrationtests/pom.xml
@@ -80,7 +80,10 @@
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
</plugin>
-
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.3.1</version>
+ </plugin>
<!-- Reservere porter og tilordne dem til variabler -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
@@ -105,7 +108,10 @@
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
+ <version>11.0.2</version>
+ <!--
<version>9.4.31.v20200723</version>
+ -->
<configuration>
<httpConnector>
<port>${jetty.port}</port>
diff --git a/todolist/pom.xml b/todolist/pom.xml
index b4c1f32..948fd72 100644
--- a/todolist/pom.xml
+++ b/todolist/pom.xml
@@ -14,31 +14,47 @@
<dependencyManagement>
<dependencies>
+
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
- <version>5.7.0</version>
+ <version>5.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
- <version>5.7.0</version>
+ <version>5.7.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
- <version>5.7.0</version>
+ <version>5.7.1</version>
<scope>test</scope>
</dependency>
+
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-core -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>3.5.10</version>
+ <version>3.9.0</version>
<scope>test</scope>
</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>
</dependencyManagement>
@@ -50,12 +66,7 @@
<version>3.8.1</version>
<configuration>
<encoding>UTF-8</encoding>
- <release>14</release>
- <compilerArgs>
- <!--
- <arg>dash dash enable-preview</arg>
- -->
- </compilerArgs>
+ <release>16</release>
</configuration>
</plugin>
<plugin>
@@ -72,12 +83,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>3.1.1</version>
+ <version>3.1.2</version>
<dependencies>
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.36.1</version>
+ <version>8.41.1</version>
</dependency>
</dependencies>
<configuration>
@@ -101,7 +112,7 @@
<plugin>
<groupId>com.github.spotbugs</groupId>
<artifactId>spotbugs-maven-plugin</artifactId>
- <version>4.0.4</version>
+ <version>4.2.2</version>
<configuration>
<xmlOutput>false</xmlOutput>
<htmlOutput>true</htmlOutput>
@@ -120,7 +131,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
- <version>0.8.5</version>
+ <version>0.8.6</version>
<executions>
<execution>
<id>jacoco-prepare-agent</id>
diff --git a/todolist/restserver/pom.xml b/todolist/restserver/pom.xml
index 1601fdb..cf5ded7 100644
--- a/todolist/restserver/pom.xml
+++ b/todolist/restserver/pom.xml
@@ -34,13 +34,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.11.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.11.2</version>
</dependency>
<dependency>
diff --git a/todolist/springboot/restserver/pom.xml b/todolist/springboot/restserver/pom.xml
index 4f6f8b8..7d47889 100644
--- a/todolist/springboot/restserver/pom.xml
+++ b/todolist/springboot/restserver/pom.xml
@@ -24,13 +24,11 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
- <version>2.11.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.11.2</version>
</dependency>
<dependency>
@@ -53,7 +51,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>2.3.4.RELEASE</version>
+ <version>2.4.4</version>
<exclusions>
<exclusion>
<groupId>org.springframework.boot</groupId>
@@ -64,13 +62,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jetty</artifactId>
- <version>2.3.4.RELEASE</version>
+ <version>2.4.4</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>2.3.4.RELEASE</version>
+ <version>2.4.4</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -115,7 +113,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>2.3.4.RELEASE</version>
+ <version>2.4.4</version>
</plugin>
</plugins>
</build>
--
GitLab