From aa4d8afd0d10c79a0605bc9402da2dc7f838f8ee Mon Sep 17 00:00:00 2001
From: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Date: Mon, 10 Oct 2022 14:30:01 +0000
Subject: Migrate Mockito 1 to version 2 in the resources service

- update mockito to version 2.4.0
- update eelf-core since it has a compile time dependency to mockito 1.10.19 in version 1

Issue-ID: AAI-3546

Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Change-Id: I6ba724fe26b57e9a468bdeb89cadaa6f51e68634
---
 aai-resources/pom.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'aai-resources/pom.xml')

diff --git a/aai-resources/pom.xml b/aai-resources/pom.xml
index 3b29f25..0e3a979 100644
--- a/aai-resources/pom.xml
+++ b/aai-resources/pom.xml
@@ -87,6 +87,7 @@
         <micrometer-registry-prometheus.version>1.6.6</micrometer-registry-prometheus.version>
         <micrometer-jersey2>1.6.6</micrometer-jersey2>
         <testcontainers.version>1.6.1</testcontainers.version>
+        <mockito.core.version>2.4.0</mockito.core.version>
         <!-- Setting some default value to not complain by editor but it will be overridden by gmaven plugin -->
 
         <!-- Integration tests will be skipped by default. Could be enabled here or by -DskipITs=false-->
@@ -414,6 +415,7 @@
         <dependency>
             <groupId>com.att.eelf</groupId>
             <artifactId>eelf-core</artifactId>
+            <version>2.0.0-oss</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -457,16 +459,12 @@
             <groupId>com.fasterxml.jackson.jaxrs</groupId>
             <artifactId>jackson-jaxrs-json-provider</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-all</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
+            <version>${mockito.core.version}</version>
             <scope>test</scope>
-        </dependency>
+          </dependency>
         <dependency>
             <groupId>com.beust</groupId>
             <artifactId>jcommander</artifactId>
-- 
cgit 1.2.3-korg