From 67a67388f184f2798ba34afee1cb0f80dc376b9d Mon Sep 17 00:00:00 2001
From: Benjamin Eckstein <13351939+benjamineckstein@users.noreply.github.com>
Date: Tue, 10 Dec 2019 21:32:14 +0100
Subject: [PATCH] TSK-983: Cleanup dependencies

---
 history/pom.xml                                 |  4 ----
 lib/taskana-core/pom.xml                        | 17 ++---------------
 .../impl/CategoryReportBuilderImplTest.java     |  2 +-
 .../ClassificationReportBuilderImplTest.java    |  2 +-
 .../CustomFieldValueReportBuilderImplTest.java  |  2 +-
 .../impl/TaskStatusReportBuilderImplTest.java   |  2 +-
 .../impl/WorkbasketReportBuilderImplTest.java   |  2 +-
 lib/taskana-data/pom.xml                        |  8 +-------
 .../pro/taskana/TaskanaTransactionIntTest.java  |  4 ++--
 pom.xml                                         |  4 ++--
 10 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/history/pom.xml b/history/pom.xml
index 7525273d0..5691fede3 100644
--- a/history/pom.xml
+++ b/history/pom.xml
@@ -15,10 +15,6 @@
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
-	<properties>
-		<version.mockito>2.8.47</version.mockito>
-	</properties>
-
 	<modules>
 		<module>taskana-simplehistory-provider</module>
 		<module>taskana-simplehistory-rest-spring</module>
diff --git a/lib/taskana-core/pom.xml b/lib/taskana-core/pom.xml
index 7ee16cfa3..d7ef835aa 100644
--- a/lib/taskana-core/pom.xml
+++ b/lib/taskana-core/pom.xml
@@ -44,20 +44,14 @@
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${version.junit.jupiter}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
+			<artifactId>junit-jupiter</artifactId>
 			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.hamcrest</groupId>
 			<artifactId>hamcrest-library</artifactId>
-			<version>2.1</version>
+			<version>${version.hamcrest}</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -72,12 +66,6 @@
 			<version>${version.junit.mockito}</version>
 			<scope>test</scope>
 		</dependency>
-		<dependency>
-			<groupId>org.powermock</groupId>
-			<artifactId>powermock-api-mockito2</artifactId>
-			<version>${version.powermock}</version>
-			<scope>test</scope>
-		</dependency>
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
@@ -133,7 +121,6 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-
 	<!-- this repository is needed to fetch com.ibm.db2.jcc -->
 	<repositories>
 		<repository>
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
index b5c8bd33e..b92460af4 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CategoryReportBuilderImplTest.java
@@ -7,7 +7,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
index 3c98523c5..73d13f934 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/ClassificationReportBuilderImplTest.java
@@ -7,7 +7,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
index 6539aeee9..8eff34453 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/CustomFieldValueReportBuilderImplTest.java
@@ -6,7 +6,7 @@ import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
index fff0a09b9..285dc4656 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/TaskStatusReportBuilderImplTest.java
@@ -6,7 +6,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.inOrder;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
index fccd7d492..5cbd699e8 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/WorkbasketReportBuilderImplTest.java
@@ -7,7 +7,7 @@ import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
-import static org.powermock.api.mockito.PowerMockito.when;
+import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/lib/taskana-data/pom.xml b/lib/taskana-data/pom.xml
index 1e7750987..baaf91413 100644
--- a/lib/taskana-data/pom.xml
+++ b/lib/taskana-data/pom.xml
@@ -32,13 +32,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-api</artifactId>
-			<version>${version.junit.jupiter}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
+			<artifactId>junit-jupiter</artifactId>
 			<version>${version.junit.jupiter}</version>
 			<scope>test</scope>
 		</dependency>
diff --git a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java
index 4be5eb5f3..4ead65a20 100644
--- a/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java
+++ b/lib/taskana-spring-example/src/test/java/pro/taskana/TaskanaTransactionIntTest.java
@@ -1,7 +1,7 @@
 package pro.taskana;
 
-import static org.hamcrest.Matchers.containsString;
-import static org.hamcrest.Matchers.is;
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
diff --git a/pom.xml b/pom.xml
index e8efcefe4..bb94b6ad7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,8 +70,8 @@
 		<version.archunit>0.12.0</version.archunit>
 		<version.mockito>2.24.0</version.mockito>
 		<version.junit.mockito>3.2.0</version.junit.mockito>
-		<version.powermock>1.7.1</version.powermock>
-		<version.hamcrest>1.3</version.hamcrest>
+		<version.powermock>2.0.2</version.powermock>
+		<version.hamcrest>2.1</version.hamcrest>
 		<version.equalsverifier>3.1.10</version.equalsverifier>
 		<version.openpojo>0.8.13</version.openpojo>