From 3d13d8ad1ce3cd3bed6d0b789d2ae460c57ae085 Mon Sep 17 00:00:00 2001
From: Johannes Schnatterer <johannes.schnatterer@cloudogu.com>
Date: Mon, 6 Aug 2018 14:08:57 +0200
Subject: [PATCH] Introduces assertJ for more efficient and maintainable
 testing.

---
 pom.xml          | 46 +++++++++++++++++++++++++++++++++++++++++-----
 scm-test/pom.xml |  4 ++--
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index fd5f2ac0ee..d1b2f4f690 100644
--- a/pom.xml
+++ b/pom.xml
@@ -120,28 +120,31 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-core</artifactId>
-      <version>${hamcrest.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.hamcrest</groupId>
       <artifactId>hamcrest-library</artifactId>
-      <version>${hamcrest.version}</version>
       <scope>test</scope>
     </dependency>
 
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>${mokito.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.assertj</groupId>
+      <artifactId>assertj-core</artifactId>
+      <version>3.10.0</version>
       <scope>test</scope>
     </dependency>
 
@@ -204,7 +207,6 @@
         <groupId>de.otto.edison</groupId>
         <artifactId>edison-hal</artifactId>
         <version>2.0.1</version>
-        <scope>compile</scope>
       </dependency>
 
       <dependency>
@@ -276,6 +278,40 @@
         <version>${jackson.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-core</artifactId>
+        <version>${hamcrest.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.hamcrest</groupId>
+        <artifactId>hamcrest-library</artifactId>
+        <version>${hamcrest.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-all</artifactId>
+        <version>${mokito.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <dependency>
+        <groupId>org.assertj</groupId>
+        <artifactId>assertj-core</artifactId>
+        <version>3.10.0</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/scm-test/pom.xml b/scm-test/pom.xml
index 7556fa4a80..9bc5019a1d 100644
--- a/scm-test/pom.xml
+++ b/scm-test/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>${junit.version}</version>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>
@@ -44,7 +44,7 @@
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-all</artifactId>
-      <version>${mokito.version}</version>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>