Update to spring boot 2guilin

Update of dependencies and source code to spring boot 2

Issue-ID: AAI-3106
Signed-off-by: Igor Dysko <igor1.dysko@orange.com>
Change-Id: Ie12c330af37d3cc841913c22a3703bcc3ae8a5d5

1 files changed, 5 insertions, 4 deletions

diff --git a/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java b/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java
index b87e4af..3695fca 100644
--- a/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java
+++ b/src/test/java/org/onap/aai/validation/ruledriven/mock/TestDefaultRules.java
@@ -24,8 +24,9 @@ package org.onap.aai.validation.ruledriven.mock;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyListOf;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.anyListOf;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import com.google.gson.JsonObject;
@@ -41,7 +42,7 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.invocation.InvocationOnMock;
-import org.mockito.runners.MockitoJUnitRunner;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.onap.aai.validation.Validator;
 import org.onap.aai.validation.exception.ValidationServiceException;
@@ -58,7 +59,7 @@ import org.onap.aai.validation.ruledriven.RuleDrivenValidator;
  * for both a supported and an unsupported entity type.
  *
  */
-@RunWith(MockitoJUnitRunner.class)
+@RunWith(MockitoJUnitRunner.Silent.class)
 public class TestDefaultRules {
 
     static {