Merge pull request #100 from DavidDamke/feature/update_dependencys

Feature/update dependencies

Author: Death111

pom.xml

@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.3.7.RELEASE</version>
+    <version>2.7.5</version>
     <relativePath /> <!-- lookup parent from repository -->
   </parent>
 
@@ -37,7 +37,6 @@
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
 
-    <h2.version>1.4.197</h2.version>
 
     <maven-dependency-check.version>6.0.5</maven-dependency-check.version>
     <!-- USING HTML,XML (comma-separated list) did not work with plugin version 5.1.0 -->
@@ -56,7 +55,6 @@
     <dependency>
       <groupId>com.h2database</groupId>
       <artifactId>h2</artifactId>
-      <version>${h2.version}</version>
     </dependency>
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -69,29 +67,26 @@
       <artifactId>flyway-core</artifactId>
     </dependency>
 
-    <!-- https://mvnrepository.com/artifact/com.1stleg/jnativehook -->
+    <!-- https://mvnrepository.com/artifact/com.github.kwhat/jnativehook -->
     <dependency>
-      <groupId>com.1stleg</groupId>
+      <groupId>com.github.kwhat</groupId>
       <artifactId>jnativehook</artifactId>
-      <version>2.1.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.w3c</groupId>
-      <artifactId>dom</artifactId>
-      <version>2.3.0-jaxb-1.0.6</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
+      <version>2.2.2</version>
     </dependency>
 
     <!-- maven assembly plugin -->
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-assembly-plugin</artifactId>
-      <version>3.3.0</version>
+      <version>3.4.2</version>
       <type>maven-plugin</type>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <build>
     <plugins>
@@ -158,7 +153,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.9.1</version>
+        <version>3.12.1</version>
       </plugin>
 
       <plugin>

src/main/java/de/doubleslash/keeptime/viewpopup/GlobalScreenListener.java

@@ -24,14 +24,15 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import org.jnativehook.GlobalScreen;
-import org.jnativehook.NativeHookException;
-import org.jnativehook.keyboard.NativeKeyEvent;
-import org.jnativehook.keyboard.NativeKeyListener;
-import org.jnativehook.mouse.NativeMouseEvent;
-import org.jnativehook.mouse.NativeMouseMotionListener;
 import org.slf4j.LoggerFactory;
 
+import com.github.kwhat.jnativehook.GlobalScreen;
+import com.github.kwhat.jnativehook.NativeHookException;
+import com.github.kwhat.jnativehook.keyboard.NativeKeyEvent;
+import com.github.kwhat.jnativehook.keyboard.NativeKeyListener;
+import com.github.kwhat.jnativehook.mouse.NativeMouseEvent;
+import com.github.kwhat.jnativehook.mouse.NativeMouseMotionListener;
+
 import javafx.application.Platform;
 
 /**

src/main/resources/application.properties

@@ -1,5 +1,5 @@
 # H2
-spring.h2.console.enabled=true
+spring.h2.console.enabled=false
 spring.h2.console.path=/h2
 h2.version=@h2.version@
 

src/test/java/de/doubleslash/keeptime/common/DateFormatterTest.java

@@ -16,15 +16,15 @@
 
 package de.doubleslash.keeptime.common;
 
-import static org.junit.Assert.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
 
 import java.time.LocalDateTime;
 
 import org.hamcrest.Matchers;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
 
-@Ignore
+@Disabled
 public class DateFormatterTest {
 
    @Test

src/test/java/de/doubleslash/keeptime/controller/ControllerTest.java

@@ -16,13 +16,13 @@
 
 package de.doubleslash.keeptime.controller;
 
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.contains;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.not;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertThat;
-import static org.junit.Assert.assertTrue;
+import static org.springframework.test.util.AssertionErrors.assertEquals;
+import static org.springframework.test.util.AssertionErrors.assertTrue;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -31,8 +31,9 @@
 import java.util.concurrent.TimeUnit;
 
 import org.hamcrest.Matchers;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.Mockito;
 import org.springframework.test.util.ReflectionTestUtils;
@@ -48,15 +49,15 @@
 
 public class ControllerTest {
 
-   private Controller testee;
+   private static Controller testee;
 
-   private Model model;
-   private DateProvider mockedDateProvider;
+   private  Model model;
+   private  DateProvider mockedDateProvider;
 
    private WorkRepository mockedWorkRepository;
 
-   @Before
-   public void beforeTest() {
+   @BeforeEach
+   void beforeTest() {
       mockedWorkRepository = Mockito.mock(WorkRepository.class);
       model = new Model(Mockito.mock(ProjectRepository.class), mockedWorkRepository,
             Mockito.mock(SettingsRepository.class));

src/test/java/de/doubleslash/keeptime/view/ProjectReportTest.java

@@ -16,12 +16,14 @@
 
 package de.doubleslash.keeptime.view;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.lang.invoke.MethodHandles;
 
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,8 +36,8 @@ public class ProjectReportTest {
 
    private ProjectReport uut;
 
-   @Before
-   public void setUp() throws Exception {
+   @BeforeEach
+   void setUp() {
       this.uut = new ProjectReport(3);
    }
 

src/test/java/de/doubleslash/keeptime/view/ProjectsListViewControllerTest.java

@@ -16,12 +16,12 @@
 
 package de.doubleslash.keeptime.view;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
-import org.junit.Test;
 
 import de.doubleslash.keeptime.model.Project;
+import org.junit.jupiter.api.Test;
 
 public class ProjectsListViewControllerTest {