Merge "[SDNC-30] summary"

diff --git a/aai-service/features/pom.xml b/aai-service/features/pom.xml
index 9259d6c..b848503 100755 (executable)
--- a/aai-service/features/pom.xml
+++ b/aai-service/features/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>aai-service</artifactId>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-service-features</artifactId>
     <name>AAI Interface Service - Features</name>

diff --git a/aai-service/installer/pom.xml b/aai-service/installer/pom.xml
index 91db2ca..03b523d 100755 (executable)
--- a/aai-service/installer/pom.xml
+++ b/aai-service/installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>aai-service</artifactId>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>aai-service-installer</artifactId>
     <name>AAI Adaptor - Karaf  Installer</name>

diff --git a/aai-service/pom.xml b/aai-service/pom.xml
index e4561d8..9c89a17 100755 (executable)
--- a/aai-service/pom.xml
+++ b/aai-service/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                <artifactId>sdnc-adaptors</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
@@ -16,7 +16,7 @@
        <name>AAI Interface Service</name>
        <description>The AAI Interface service exposes an interface to AAI as an OSGi service</description>
 
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
        <dependencyManagement>
 
                <dependencies>

diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml
index 00334b5..e17dab8 100755 (executable)
--- a/aai-service/provider/pom.xml
+++ b/aai-service/provider/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                <artifactId>aai-service</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>aai-service-provider</artifactId>
        <packaging>bundle</packaging>
@@ -22,7 +22,7 @@
                </dependency>
                <dependency>
                        <groupId>org.mockito</groupId>
-                       <artifactId>mockito-all</artifactId>
+                       <artifactId>mockito-core</artifactId>
                        <version>${mockito.version}</version>
                        <scope>test</scope>
                </dependency>

diff --git a/mdsal-resource/features/pom.xml b/mdsal-resource/features/pom.xml
index 140810f..b4e7220 100755 (executable)
--- a/mdsal-resource/features/pom.xml
+++ b/mdsal-resource/features/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mdsal-resource</artifactId>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>mdsal-resource-features</artifactId>
     <name>MD-SAL Resource Adaptor - Features</name>

diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml
index d636f8d..259bc06 100755 (executable)
--- a/mdsal-resource/installer/pom.xml
+++ b/mdsal-resource/installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>mdsal-resource</artifactId>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>mdsal-resource-installer</artifactId>
     <name>MDSAL Resource - Karaf  Installer</name>

diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml
index a6f68b4..eddff30 100755 (executable)
--- a/mdsal-resource/pom.xml
+++ b/mdsal-resource/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
         <artifactId>sdnc-adaptors</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -15,7 +15,7 @@
     <name>MD-SAL Resource Adaptor</name>
     <description>The MD-SAL resource adaptor allows service logic to access persistent data from MD-SAL config and operational trees</description>
 
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
 
         <dependencyManagement>
 

diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml
index 92dada6..4ab921a 100755 (executable)
--- a/mdsal-resource/provider/pom.xml
+++ b/mdsal-resource/provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
         <artifactId>mdsal-resource</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>mdsal-resource-provider</artifactId>
     <packaging>bundle</packaging>

diff --git a/pom.xml b/pom.xml
index e387445..f4e8fcb 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-boron-sr3</artifactId>
+        <artifactId>odlparent-carbon-sr1</artifactId>
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
@@ -113,7 +113,7 @@
     <organization>
         <name>OpenECOMP</name>
     </organization>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
 
 
 </project>

diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml
index 338f7a1..2448576 100755 (executable)
--- a/resource-assignment/features/pom.xml
+++ b/resource-assignment/features/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>resource-assignment</artifactId>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>resource-assignment-features</artifactId>
     <name>Resource Assignment Adaptor - Features</name>

diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml
index 19359dc..8915b8d 100755 (executable)
--- a/resource-assignment/installer/pom.xml
+++ b/resource-assignment/installer/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>resource-assignment</artifactId>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>resource-assignment-installer</artifactId>
     <name>Resource allocator- Karaf  Installer</name>

diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml
index 5e44d5f..37889db 100755 (executable)
--- a/resource-assignment/pom.xml
+++ b/resource-assignment/pom.xml
@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
         <artifactId>sdnc-adaptors</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>pom</packaging>
     <groupId>org.onap.ccsdk.sli.adaptors</groupId>
     <artifactId>resource-assignment</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>0.1.0-SNAPSHOT</version>
 
 
     <name>Resource Assignment Adaptor</name>

diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml
index 4d80152..b36753a 100755 (executable)
--- a/resource-assignment/provider/pom.xml
+++ b/resource-assignment/provider/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.onap.ccsdk.sli.adaptors</groupId>
         <artifactId>resource-assignment</artifactId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>0.1.0-SNAPSHOT</version>
     </parent>
     <artifactId>resource-assignment-provider</artifactId>
     <packaging>bundle</packaging>

diff --git a/sql-resource/features/pom.xml b/sql-resource/features/pom.xml
index 4b32a9f..8c38ece 100755 (executable)
--- a/sql-resource/features/pom.xml
+++ b/sql-resource/features/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sql-resource</artifactId>
                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sql-resource-features</artifactId>
        <name>Sql Resource Adaptor - Features</name>

diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml
index fa27cfe..1ff621a 100755 (executable)
--- a/sql-resource/installer/pom.xml
+++ b/sql-resource/installer/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>sql-resource</artifactId>
                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sql-resource-installer</artifactId>
        <name>SQL Resource - Karaf  Installer</name>

diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml
index a3376c1..ffec0c4 100755 (executable)
--- a/sql-resource/pom.xml
+++ b/sql-resource/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                <artifactId>sdnc-adaptors</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
@@ -15,7 +15,7 @@
        <name>Sql Resource Adaptor</name>
        <description>The Sql resource adaptor allows service logic to read/write data from a local database using direct SQL statements</description>
 
-       <version>0.0.1-SNAPSHOT</version>
+       <version>0.1.0-SNAPSHOT</version>
 
        <dependencyManagement>
         <dependencies>

diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml
index 195a10e..a9a6349 100755 (executable)
--- a/sql-resource/provider/pom.xml
+++ b/sql-resource/provider/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.onap.ccsdk.sli.adaptors</groupId>
                <artifactId>sql-resource</artifactId>
-               <version>0.0.1-SNAPSHOT</version>
+               <version>0.1.0-SNAPSHOT</version>
        </parent>
        <artifactId>sql-resource-provider</artifactId>
        <packaging>bundle</packaging>