Merge "Migrate Mockito 1 to version 2 in aai-core"

diff --combined aai-core/pom.xml
index 1cf73a7,1b91577..9a99089
--- 1/aai-core/pom.xml
--- 2/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@@ -38,6 -38,7 +38,7 @@@ limitations under the License
                <jacoco.line.coverage.limit>0.50</jacoco.line.coverage.limit>
                <gremlin.version>3.2.2</gremlin.version>
                <groovy.version>2.5.15</groovy.version>
+               <mockito.core.version>2.4.0</mockito.core.version>
                <!-- Start of Default ONAP Schema Properties -->
                <aai.wiki.link>https://wiki.onap.org/</aai.wiki.link>
                <gendoc.version>v15</gendoc.version>
@@@ -133,13 -134,7 +134,7 @@@
                <dependency>
                        <groupId>com.att.eelf</groupId>
                        <artifactId>eelf-core</artifactId>
-                       <exclusions><!-- excluding transitive dependency coming from this artifact,
-                                       as we would need powermock-api-mockito2 -->
-                               <exclusion>
-                                       <groupId>org.powermock</groupId>
-                                       <artifactId>powermock-api-mockito</artifactId>
-                               </exclusion>
-                       </exclusions>
+                       <version>2.0.0-oss</version>
                </dependency>
                <dependency>
                        <groupId>org.codehaus.jackson</groupId>
@@@ -164,11 -159,6 +159,6 @@@
                        <artifactId>hamcrest-core</artifactId>
                        <scope>test</scope>
                </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
-                       <scope>test</scope>
-               </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
                        <artifactId>mockito-core</artifactId>
@@@ -411,12 -401,12 +401,12 @@@
        <pluginRepositories>
                <pluginRepository>
                        <id>central</id>
 -                      <url>http://repo1.maven.org/maven2</url>
 +                      <url>https://repo1.maven.org/maven2</url>
                </pluginRepository>
                <pluginRepository>
                        <id>EvoSuite</id>
                        <name>EvoSuite Repository</name>
 -                      <url>http://www.evosuite.org/m2</url>
 +                      <url>https://www.evosuite.org/m2</url>
                </pluginRepository>
        </pluginRepositories>