Fixed tests.

Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>

pom.xml

@@ -66,7 +66,13 @@
       <!-- Spring boot version overrides (should be reviewed with every boot upgrade) - START -->
       <!-- Newer versions needed than defined in Boot-->
       <spring-cloud-connectors.version>1.2.0.RELEASE</spring-cloud-connectors.version>
+<<<<<<< Upstream, based on master
       <spring-amqp.version>1.6.1.RELEASE</spring-amqp.version>
+=======
+      <spring-amqp.version>1.6.0.RELEASE</spring-amqp.version>
+      <rabbitmq.version>3.6.2</rabbitmq.version>
+      <spring-security.version>4.1.1.RELEASE</spring-security.version>
+>>>>>>> e285495 Fixed tests.
       <!--  Support for MongoDB 3 -->
       <mongodb.version>3.2.2</mongodb.version>
       <!-- Spring boot version overrides - END -->
@@ -99,7 +105,6 @@
       <guava.version>19.0</guava.version>
       <mariadb-java-client.version>1.4.3</mariadb-java-client.version>
       <embedded-mongo.version>1.50.5</embedded-mongo.version>
-      <jersey-client.version>1.18.1</jersey-client.version>
       <javax.el-api.version>2.2.4</javax.el-api.version>
       <corn-cps.version>1.1.7</corn-cps.version>
       <jlorem.version>1.1</jlorem.version>
@@ -558,12 +563,6 @@
             <version>${allure.version}</version>
             <scope>test</scope>
          </dependency>
-         <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey-client.version}</version>
-            <scope>test</scope>
-         </dependency>
          <dependency>
             <groupId>pl.pragmatists</groupId>
             <artifactId>JUnitParams</artifactId>