Change the mockito to use one version

Issue-ID: AAI-2806
Change-Id: I23dc5efa936d9efe2ecf326064ae5e5046764339
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

diff --git a/aai-aaf-auth/pom.xml b/aai-aaf-auth/pom.xml
index af2745a..7601c2f 100644 (file)
--- a/aai-aaf-auth/pom.xml
+++ b/aai-aaf-auth/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-aaf-auth</artifactId>

diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml
index a44ed7c..8f4c8f6 100644 (file)
--- a/aai-annotations/pom.xml
+++ b/aai-annotations/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-annotations</artifactId>

diff --git a/aai-auth/pom.xml b/aai-auth/pom.xml
index da41861..9b3fc71 100644 (file)
--- a/aai-auth/pom.xml
+++ b/aai-auth/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-auth</artifactId>

diff --git a/aai-common-docker/aai-common-images/pom.xml b/aai-common-docker/aai-common-images/pom.xml
index a40cb8e..ce5754f 100644 (file)
--- a/aai-common-docker/aai-common-images/pom.xml
+++ b/aai-common-docker/aai-common-images/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>aai-common-images</artifactId>
-    <version>1.6.7-SNAPSHOT</version>
+    <version>1.6.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common-images</name>
     <description>Contains dockerfiles for aai-common images (alpine and ubuntu based).</description>

diff --git a/aai-common-docker/aai-haproxy-image/pom.xml b/aai-common-docker/aai-haproxy-image/pom.xml
index 6068df6..e63b4c0 100644 (file)
--- a/aai-common-docker/aai-haproxy-image/pom.xml
+++ b/aai-common-docker/aai-haproxy-image/pom.xml
@@ -25,11 +25,11 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-common-docker</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
     </parent>
 
     <artifactId>aai-haproxy-image</artifactId>
-    <version>1.6.7-SNAPSHOT</version>
+    <version>1.6.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-haproxy-image</name>
     <description>Contains dockerfiles for aai-haproxy image.</description>

diff --git a/aai-common-docker/pom.xml b/aai-common-docker/pom.xml
index 79633bf..39018d5 100644 (file)
--- a/aai-common-docker/pom.xml
+++ b/aai-common-docker/pom.xml
@@ -26,7 +26,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
 

diff --git a/aai-core/pom.xml b/aai-core/pom.xml
index 3d757ec..a8725ee 100644 (file)
--- a/aai-core/pom.xml
+++ b/aai-core/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.6.7-SNAPSHOT</version>
+               <version>1.6.8-SNAPSHOT</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-core</artifactId>

diff --git a/aai-els-onap-logging/pom.xml b/aai-els-onap-logging/pom.xml
index 85e3006..4235b0f 100644 (file)
--- a/aai-els-onap-logging/pom.xml
+++ b/aai-els-onap-logging/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-els-onap-logging</artifactId>

diff --git a/aai-parent/pom.xml b/aai-parent/pom.xml
index fbc013f..ae8e8c7 100644 (file)
--- a/aai-parent/pom.xml
+++ b/aai-parent/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-common</artifactId>
-               <version>1.6.7-SNAPSHOT</version>
+               <version>1.6.8-SNAPSHOT</version>
        </parent>
        <artifactId>aai-parent</artifactId>
        <name>aai-parent</name>
@@ -101,7 +101,7 @@ limitations under the License.
         <slf4j.version>1.7.25</slf4j.version>
                <log4j.version>1.2.17</log4j.version>
                <mockito.all.version>1.10.19</mockito.all.version>
-               <mockito.core.version>2.15.0</mockito.core.version>
+               <mockito.core.version>1.10.19</mockito.core.version>
                <netty.handler.version>4.1.43.Final</netty.handler.version>
                <netty.version>4.0.56.Final</netty.version>
                <opencsv.version>3.1</opencsv.version>

diff --git a/aai-rest/pom.xml b/aai-rest/pom.xml
index c8a2ca1..18b7414 100644 (file)
--- a/aai-rest/pom.xml
+++ b/aai-rest/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-rest</artifactId>

diff --git a/aai-schema-abstraction/pom.xml b/aai-schema-abstraction/pom.xml
index 1bbd9fe..a59d21d 100644 (file)
--- a/aai-schema-abstraction/pom.xml
+++ b/aai-schema-abstraction/pom.xml
@@ -28,7 +28,7 @@
   <parent>
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-parent</artifactId>
-    <version>1.6.7-SNAPSHOT</version>
+    <version>1.6.8-SNAPSHOT</version>
     <relativePath>../aai-parent/pom.xml</relativePath>
   </parent>
 

diff --git a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
index 6c7364a..6cfb5a7 100644 (file)
--- a/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
+++ b/aai-schema-abstraction/src/test/java/org/onap/aai/schemaif/oxm/OxmSchemaProviderTest.java
@@ -30,14 +30,14 @@ import java.util.Set;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.runners.MockitoJUnitRunner;
 import org.onap.aai.schemaif.SchemaProviderException;
 import org.onap.aai.schemaif.definitions.EdgeSchema;
 import org.onap.aai.schemaif.definitions.PropertySchema;
 import org.onap.aai.schemaif.definitions.VertexSchema;
 import org.onap.aai.schemaif.definitions.types.DataType.Type;
 
-@RunWith(MockitoJUnitRunner.Silent.class)
+@RunWith(MockitoJUnitRunner.class)
 public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
 
     @Test
@@ -49,15 +49,15 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             VertexSchema vertSchema = schemaProvider.getVertexSchema("pserver", schemaProvider.getLatestSchemaVersion());
             System.out.println(vertSchema.toString());
 
-            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", 
+            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn",
                     "cloud-region", "zone", schemaProvider.getLatestSchemaVersion());
             System.out.println(edgeSchema.toString());
-            
+
             // Validate vertex schema
             assertTrue(vertSchema.getName().equals("pserver"));
             assertTrue(vertSchema.getAnnotationValue("nameProps").equals("pserver-name2"));
             assertTrue(vertSchema.getAnnotationValue("dependentOn") == null);
-            
+
             PropertySchema propSchema = vertSchema.getPropertySchema("hostname");
             assertTrue(propSchema.getName().equals("hostname"));
             assertTrue(propSchema.getDefaultValue().equals(""));
@@ -66,7 +66,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
             Object obj = propSchema.validateValue("somestring");
             assertTrue(obj instanceof String);
-            
+
             propSchema = vertSchema.getPropertySchema("in-maint");
             assertTrue(propSchema.getName().equals("in-maint"));
             assertTrue(propSchema.getDefaultValue().equals("false"));
@@ -79,8 +79,8 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             obj = propSchema.validateValue("false");
             assertTrue(obj instanceof Boolean);
             assertTrue(propSchema.getDataType().validateValue("badValue") == null);
-            
-            
+
+
             propSchema = vertSchema.getPropertySchema("aai-node-type");
             assertTrue(propSchema.getName().equals("aai-node-type"));
             assertTrue(propSchema.getDefaultValue().equals(""));
@@ -88,7 +88,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(!propSchema.isKey());
             assertTrue(propSchema.isReserved());
             assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
-            
+
             propSchema = vertSchema.getPropertySchema("pserver-id");
             assertTrue(propSchema.getName().equals("pserver-id"));
             assertTrue(propSchema.getDefaultValue().equals(""));
@@ -96,7 +96,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(!propSchema.isReserved());
             assertTrue(propSchema.isKey());
             assertTrue(propSchema.getDataType().getType().compareTo(Type.STRING) == 0);
-            
+
             propSchema = vertSchema.getPropertySchema("number-of-cpus");
             assertTrue(propSchema.getName().equals("number-of-cpus"));
             assertTrue(propSchema.getAnnotationValue("source-of-truth-type").equals("openstack"));
@@ -107,7 +107,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(obj instanceof Integer);
             assertTrue(propSchema.getDataType().validateValue("5.5") == null);
             assertTrue(propSchema.getDataType().validateValue("xyz") == null);
-            
+
             // Validate edge schema
             assertTrue(edgeSchema.getName().equals("org.onap.relationships.inventory.LocatedIn"));
             assertTrue(edgeSchema.getSource().equals("cloud-region"));
@@ -115,7 +115,7 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(edgeSchema.getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_ONE));
             assertTrue(edgeSchema.getAnnotationValue("contains-other-v").equals("NONE"));
             assertTrue(edgeSchema.getPropertySchema("prevent-delete").getDataType().getType().equals(Type.STRING));
-            
+
             // Validate 'dependentOn' annotation
             vertSchema = schemaProvider.getVertexSchema("tenant", schemaProvider.getLatestSchemaVersion());
             assertTrue(vertSchema.getAnnotationValue("dependentOn").equals("cloud-region"));
@@ -128,19 +128,19 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(false);
         }
     }
-    
+
     @Test
     public void testAdjacentEdges() throws SchemaProviderException {
         try {
             OxmSchemaProvider schemaProvider = new OxmSchemaProvider();
             schemaProvider.loadSchema();
 
-            Set<EdgeSchema> edgeSchemaList = 
+            Set<EdgeSchema> edgeSchemaList =
                     schemaProvider.getAdjacentEdgeSchema("snapshot", schemaProvider.getLatestSchemaVersion());
-            
+
             // Validate edge schema
             assertTrue(edgeSchemaList.size() == 2);
-            
+
             for (EdgeSchema es : edgeSchemaList) {
                 System.out.println(es.toString());
                 if (es.getName().equals("org.onap.relationships.inventory.BelongsTo")) {
@@ -166,15 +166,15 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(false);
         }
     }
-    
+
     @Test
     public void testValidSourceTargetEdge() throws SchemaProviderException {
         try {
             OxmSchemaProvider schemaProvider = new OxmSchemaProvider();
             schemaProvider.loadSchema();
 
-            Set<EdgeSchema> edgeSchemaList = 
-                    schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer", 
+            Set<EdgeSchema> edgeSchemaList =
+                    schemaProvider.getEdgeSchemaForSourceTarget("service-instance", "customer",
                             schemaProvider.getLatestSchemaVersion());
 
             // Validate edge schema
@@ -183,14 +183,14 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(edgeSchemaList.iterator().next().getSource().equals("service-instance"));
             assertTrue(edgeSchemaList.iterator().next().getTarget().equals("customer"));
             assertTrue(edgeSchemaList.iterator().next().getMultiplicity().equals(EdgeSchema.Multiplicity.MANY_2_MANY));
-            
-            edgeSchemaList = 
-                    schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex", 
+
+            edgeSchemaList =
+                    schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "complex",
                             schemaProvider.getLatestSchemaVersion());
-            
+
             // Validate edge schema
             assertTrue(edgeSchemaList.size() == 2);
-            
+
             for (EdgeSchema es : edgeSchemaList) {
                 System.out.println(es.toString());
                 if (es.getName().equals("org.onap.relationships.inventory.FoundIn")) {
@@ -207,11 +207,11 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
                     assertTrue(false);
                 }
             }
-            
-            edgeSchemaList = 
-                    schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node", 
+
+            edgeSchemaList =
+                    schemaProvider.getEdgeSchemaForSourceTarget("cloud-region", "bad-node",
                             schemaProvider.getLatestSchemaVersion());
-            
+
             // Validate edge schema
             assertTrue(edgeSchemaList.size() == 0);
         }
@@ -223,23 +223,23 @@ public class OxmSchemaProviderTest extends OxmSchemaServiceSetup {
             assertTrue(false);
         }
     }
-    
+
     @Test
     public void testInvalidVertexOrEdge() throws SchemaProviderException {
         try {
             OxmSchemaProvider schemaProvider = new OxmSchemaProvider();
             schemaProvider.loadSchema();
 
-            VertexSchema vertSchema = 
+            VertexSchema vertSchema =
                     schemaProvider.getVertexSchema("bad-node", schemaProvider.getLatestSchemaVersion());
             assertTrue(vertSchema == null);
 
-            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn", 
+            EdgeSchema edgeSchema = schemaProvider.getEdgeSchema("org.onap.relationships.inventory.LocatedIn",
                     "cloud-region", "bad-node", schemaProvider.getLatestSchemaVersion());
             assertTrue(edgeSchema == null);
-            
-            Set<EdgeSchema> edgeSchemaList = 
-                    schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node", 
+
+            Set<EdgeSchema> edgeSchemaList =
+                    schemaProvider.getAdjacentEdgeSchema("org.onap.nodes.bad-node",
                             schemaProvider.getLatestSchemaVersion());
             assertTrue(edgeSchemaList.isEmpty());
         }

diff --git a/aai-schema-ingest/pom.xml b/aai-schema-ingest/pom.xml
index 5b545a0..e8ad5f9 100644 (file)
--- a/aai-schema-ingest/pom.xml
+++ b/aai-schema-ingest/pom.xml
@@ -26,7 +26,7 @@ limitations under the License.
        <parent>
                <groupId>org.onap.aai.aai-common</groupId>
                <artifactId>aai-parent</artifactId>
-               <version>1.6.7-SNAPSHOT</version>
+               <version>1.6.8-SNAPSHOT</version>
                <relativePath>../aai-parent/pom.xml</relativePath>
        </parent>
        <artifactId>aai-schema-ingest</artifactId>

diff --git a/aai-utils/pom.xml b/aai-utils/pom.xml
index dd90102..97d2f05 100644 (file)
--- a/aai-utils/pom.xml
+++ b/aai-utils/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <groupId>org.onap.aai.aai-common</groupId>
         <artifactId>aai-parent</artifactId>
-        <version>1.6.7-SNAPSHOT</version>
+        <version>1.6.8-SNAPSHOT</version>
         <relativePath>../aai-parent/pom.xml</relativePath>
     </parent>
     <artifactId>aai-utils</artifactId>

diff --git a/pom.xml b/pom.xml
index b09d171..9833fb8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -30,7 +30,7 @@
 
     <groupId>org.onap.aai.aai-common</groupId>
     <artifactId>aai-common</artifactId>
-    <version>1.6.7-SNAPSHOT</version>
+    <version>1.6.8-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>aai-aai-common</name>
     <description>Contains all of the common code for resources and traversal repos</description>

diff --git a/version.properties b/version.properties
index 95d9acb..f7e7893 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -5,7 +5,7 @@
 
 major_version=1
 minor_version=6
-patch_version=7
+patch_version=8
 
 base_version=${major_version}.${minor_version}.${patch_version}