Upgrade testing frameworks to latest not-vulnerable versions

Signed-off-by: Vasyl Razinkov <vasyl.razinkov@est.tech>
Change-Id: Ie68290a79d075132c73e6cc9e82b9dbda92fbe8c
Issue-ID: SDC-4313

16 files changed, 45 insertions, 44 deletions

diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
index 2d6df03dfe..8017643390 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImplTest.java
@@ -16,8 +16,8 @@
 
 package org.openecomp.sdc.itempermissions.dao.impl;
 
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
@@ -127,7 +127,7 @@ public class PermissionsServicesImplTest {
     public void testListItemPermissions() {
         doReturn(Arrays.asList(createPermissionEntity(ITEM1_ID, USER1_ID, PERMISSION),
                 createPermissionEntity(ITEM1_ID, USER2_ID, PERMISSION))).when(permissionsDaoMock)
-                                                                        .listItemPermissions(anyObject());
+                                                                        .listItemPermissions(any());
 
         Collection<ItemPermissionsEntity> actual = permissionsServices.listItemPermissions(ITEM1_ID);
         Assert.assertEquals(2, actual.size());
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java
index 85b8a4085b..f837f25398 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java
@@ -20,7 +20,7 @@
 
 package org.openecomp.sdc.enrichment.impl.external.artifact;
 
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.times;
 
@@ -131,7 +131,7 @@ public class MonitoringMibEnricherTest {
         "pd_server"));
     returnedComponents.add(getComponentEntity(vspId, version, componentId2,
         "pd_server"));
-    Mockito.when(componentDaoMock.list(anyObject()))
+    Mockito.when(componentDaoMock.list(any()))
         .thenReturn(returnedComponents);
     setMockToEnrichComponent(vspId, version, componentId1);
 
@@ -166,9 +166,9 @@ public class MonitoringMibEnricherTest {
     returnedArtifact.setArtifactName("mib.zip");
     returnedArtifact.setArtifact(getMibByteBuffer("/mock/enrichMib/MIB.zip"));
 
-    Mockito.when(componentArtifactDaoMock.getByType(anyObject()))
+    Mockito.when(componentArtifactDaoMock.getByType(any()))
         .thenReturn(Optional.of(returnedArtifact));
-    Mockito.doNothing().when(enrichedServiceModelDaoMock).storeExternalArtifact(anyObject());
+    Mockito.doNothing().when(enrichedServiceModelDaoMock).storeExternalArtifact(any());
   }
 
   private ComponentEntity getComponentEntity(String vspId,
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java
index 9edac107b0..706e189b69 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java
@@ -16,7 +16,7 @@
 
 package org.openecomp.sdc.enrichment.impl.external.artifact;
 
-import static org.mockito.Matchers.anyObject;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.atLeastOnce;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.when;
@@ -81,13 +81,13 @@ public class ProcessArtifactEnricherTest {
 
     Collection<ComponentEntity> componentList = new ArrayList<>();
     componentList.add(componentEntity);
-    when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+    when(componentDaoMock.list(any())).thenReturn(componentList);
 
     Collection<ProcessEntity> list = new ArrayList<>();
     list.add(processEntity);
     when(processDaoMock.list(entity)).thenReturn(list);
 
-    when(processDaoMock.getArtifact(anyObject())).thenReturn(processEntity);
+    when(processDaoMock.getArtifact(any())).thenReturn(processEntity);
 
     EnrichmentInfo info = new EnrichmentInfo();
     info.setVersion(version);
@@ -129,13 +129,13 @@ public class ProcessArtifactEnricherTest {
 
     Collection<ComponentEntity> componentList = new ArrayList<>();
     componentList.add(componentEntity);
-    when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+    when(componentDaoMock.list(any())).thenReturn(componentList);
 
     Collection<ProcessEntity> list = new ArrayList<>();
     list.add(processEntity);
     when(processDaoMock.list(entity)).thenReturn(list);
 
-    when(processDaoMock.getArtifact(anyObject())).thenReturn(processEntity);
+    when(processDaoMock.getArtifact(any())).thenReturn(processEntity);
 
     EnrichmentInfo info = new EnrichmentInfo();
     info.setVersion(version);
@@ -171,13 +171,13 @@ public class ProcessArtifactEnricherTest {
 
     Collection<ComponentEntity> componentList = new ArrayList<>();
     componentList.add(componentEntity);
-    when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+    when(componentDaoMock.list(any())).thenReturn(componentList);
 
     Collection<ProcessEntity> list = new ArrayList<>();
     list.add(processEntity);
     when(processDaoMock.list(entity)).thenReturn(list);
 
-    when(processDaoMock.getArtifact(anyObject())).thenReturn(null);
+    when(processDaoMock.getArtifact(any())).thenReturn(null);
 
     EnrichmentInfo info = new EnrichmentInfo();
     info.setVersion(version);
@@ -211,13 +211,13 @@ public class ProcessArtifactEnricherTest {
 
     Collection<ComponentEntity> componentList = new ArrayList<>();
     componentList.add(componentEntity);
-    when(componentDaoMock.list(anyObject())).thenReturn(componentList);
+    when(componentDaoMock.list(any())).thenReturn(componentList);
 
     Collection<ProcessEntity> list = new ArrayList<>();
     list.add(processEntity);
     when(processDaoMock.list(entity)).thenReturn(list);
 
-    when(processDaoMock.getArtifact(anyObject())).thenReturn(processEntity);
+    when(processDaoMock.getArtifact(any())).thenReturn(processEntity);
 
     EnrichmentInfo info = new EnrichmentInfo();
     info.setVersion(version);
diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/destinationprovider/impl/MulticastDestinationTest.java b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/destinationprovider/impl/MulticastDestinationTest.java
index 78265769e5..a71b1645f7 100644
--- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/destinationprovider/impl/MulticastDestinationTest.java
+++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/destinationprovider/impl/MulticastDestinationTest.java
@@ -35,7 +35,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 
 /**
diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationPropagationManagerImplTest.java b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationPropagationManagerImplTest.java
index 2a98953408..b222af8968 100644
--- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationPropagationManagerImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationPropagationManagerImplTest.java
@@ -31,6 +31,7 @@ import org.openecomp.sdc.notification.dtos.Event;
 import org.openecomp.sdc.notification.services.PropagationService;
 import org.openecomp.sdc.notification.services.SubscriptionService;
 
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.verify;
 
 
@@ -61,7 +62,7 @@ public class NotificationPropagationManagerImplTest {
     public void shouldCallPropagationServiceNotifyWithMulticastDestinationWhenNotifySubscribers()
         throws Exception {
         notificationPropagationManager.notifySubscribers(eventMock);
-        verify(propagationServiceMock).notify(Matchers.eq(eventMock), destinationProviderCaptor
+        verify(propagationServiceMock).notify(eq(eventMock), destinationProviderCaptor
             .capture());
         Assert.assertTrue(destinationProviderCaptor.getValue() instanceof MulticastDestination);
 
@@ -71,7 +72,7 @@ public class NotificationPropagationManagerImplTest {
     public void shouldCallPropagationServiceNotifyWithUnicastDestinationWhenDirectNotification()
         throws Exception {
         notificationPropagationManager.directNotification(eventMock, "aaa");
-        verify(propagationServiceMock).notify(Matchers.eq(eventMock), destinationProviderCaptor
+        verify(propagationServiceMock).notify(eq(eventMock), destinationProviderCaptor
             .capture());
         Assert.assertTrue(destinationProviderCaptor.getValue() instanceof UnicastDestination);
     }
diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationsServiceImplTest.java b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationsServiceImplTest.java
index 1625156c3c..f893983e5f 100644
--- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationsServiceImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/NotificationsServiceImplTest.java
@@ -33,7 +33,7 @@ import org.openecomp.sdc.notification.exceptons.NotificationNotExistException;
 
 import java.util.UUID;
 
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/PropagationServiceImplTest.java b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/PropagationServiceImplTest.java
index b118e023fa..21072d727e 100644
--- a/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/PropagationServiceImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-notification-lib/openecomp-sdc-notification-core/src/test/java/org/openecomp/sdc/notification/services/impl/PropagationServiceImplTest.java
@@ -35,7 +35,7 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 
-import static org.mockito.Matchers.anyList;
+import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.Mockito.*;
 
 /**
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
index 771d9abf3c..0e3bf64751 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/ConsolidationServiceTest.java
@@ -37,8 +37,8 @@ import java.io.IOException;
 import java.net.URISyntaxException;
 import java.util.*;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
index 24293fda44..30fc214177 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/UnifiedCompositionServiceTest.java
@@ -17,8 +17,8 @@
 package org.openecomp.sdc.translator.services.heattotosca;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
@@ -647,7 +647,7 @@ public class UnifiedCompositionServiceTest {
         unifiedCompositionDataList.add(unifiedCompositionData);
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
         unifiedCompositionService
                 .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
@@ -682,7 +682,7 @@ public class UnifiedCompositionServiceTest {
 
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService
@@ -710,7 +710,7 @@ public class UnifiedCompositionServiceTest {
         unifiedCompositionDataList.add(unifiedCompositionData);
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
         unifiedCompositionService
                 .updateCompositionConnectivity(inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML),
@@ -746,7 +746,7 @@ public class UnifiedCompositionServiceTest {
 
         Mockito.doNothing().when(unifiedCompositionService).updNodesConnectedOutConnectivity
                 (inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML), unifiedCompositionDataList, context);
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService
@@ -774,7 +774,7 @@ public class UnifiedCompositionServiceTest {
         List<UnifiedCompositionData> unifiedCompositionDataList = new ArrayList<>();
         unifiedCompositionDataList.add(unifiedCompositionData);
 
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         Optional<ServiceTemplate> substitutionServiceTemplate = unifiedCompositionService
@@ -846,7 +846,7 @@ public class UnifiedCompositionServiceTest {
         inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
                 .put(FSB1, abstractNodeTemplate);
 
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService.
@@ -886,7 +886,7 @@ public class UnifiedCompositionServiceTest {
         inputServiceTemplates.get(MAIN_SERVICE_TEMPLATE_YAML).getTopology_template().getNode_templates()
                 .put(FSB1, abstractNodeTemplate);
 
-        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(anyObject(),
+        Mockito.doReturn(FSB1).when(context).getUnifiedAbstractNodeTemplateId(any(),
                 anyString());
 
         unifiedCompositionService.
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java
index 1488edc16e..ec21bdb19c 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/ResourceTranslationResourceGroupImplTest.java
@@ -25,7 +25,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 
 import java.io.IOException;
 
diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java
index 2749185213..9859c33a16 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImplTest.java
@@ -17,7 +17,7 @@
 package org.openecomp.sdc.versioning.dao.impl.zusammen;
 
 import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.openecomp.sdc.versioning.dao.impl.zusammen.ItemZusammenDaoImpl.ItemInfoProperty.ITEM_TYPE;
diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java
index 74d75f7eee..3e0f84bfd3 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/dao/impl/zusammen/VersionZusammenDaoImplTest.java
@@ -16,8 +16,8 @@
 
 package org.openecomp.sdc.versioning.dao.impl.zusammen;
 
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.isNull;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.isNull;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.verify;
 import static org.openecomp.sdc.versioning.dao.impl.zusammen.TestUtil.createZusammenContext;
@@ -130,7 +130,7 @@ public class VersionZusammenDaoImplTest {
     String versionId = "versionId";
     doReturn(new Id(versionId)).when(zusammenAdaptorMock)
         .createVersion(eq(createZusammenContext(USER)), eq(new Id(itemId)),
-            baseId == null ? isNull(Id.class) : eq(new Id(baseId)),
+            baseId == null ? isNull(/*Id.class*/) : eq(new Id(baseId)),
             capturedZusammenVersion.capture());
 
 
@@ -430,4 +430,4 @@ public class VersionZusammenDaoImplTest {
     Assert.assertEquals(revision.getUser(), zusammenRevision.getUser());
     Assert.assertEquals(revision.getTime(), zusammenRevision.getTime());
   }
-}
\ No newline at end of file
+}
diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/AsdcItemManagerImplTest.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/AsdcItemManagerImplTest.java
index e74e5d585f..e9c74f093c 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/AsdcItemManagerImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/AsdcItemManagerImplTest.java
@@ -19,7 +19,7 @@ package org.openecomp.sdc.versioning.impl;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -188,4 +188,4 @@ public class AsdcItemManagerImplTest {
     assertEquals(actual.getName(), expected.getName());
     assertEquals(actual.getType(), expected.getType());
   }
-}
\ No newline at end of file
+}
diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/VersioningManagerImplTest.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/VersioningManagerImplTest.java
index 6c69582ad2..e40fea8edc 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/VersioningManagerImplTest.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/test/java/org/openecomp/sdc/versioning/impl/VersioningManagerImplTest.java
@@ -20,8 +20,8 @@
 
 package org.openecomp.sdc.versioning.impl;
 
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.doThrow;
 import static org.mockito.Mockito.never;
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java
index 8b732df95c..e8b98f44c4 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/DataModelUtilTest.java
@@ -43,7 +43,7 @@ import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdc.tosca.datatypes.model.AttributeDefinition;
 import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition;
 import org.onap.sdc.tosca.datatypes.model.EntrySchema;
diff --git a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
index 9d81b06daf..435f6e79ed 100644
--- a/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
+++ b/openecomp-be/lib/openecomp-tosca-lib/src/test/java/org/openecomp/sdc/tosca/services/impl/ToscaAnalyzerServiceImplTest.java
@@ -42,7 +42,7 @@ import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.onap.sdc.tosca.datatypes.model.CapabilityDefinition;
 import org.onap.sdc.tosca.datatypes.model.CapabilityType;
 import org.onap.sdc.tosca.datatypes.model.Constraint;