Changes for Fluorine

Updates to sli/plugins to run in OpenDaylight Fluorine

Change-Id: I093a663ff5459df5eacdb632ad3217c322cc9cfa
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>

6 files changed, 24 insertions, 39 deletions

diff --git a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml b/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
index ead54c77..3ac681f8 100644
--- a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
+++ b/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
@@ -5,41 +5,19 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>ccsdk-sshapi-call-node</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
 
 
 
-    <properties>
-        <ccsdk.sli.plugins.version>${project.version}</ccsdk.sli.plugins.version>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.opendaylight.mdsal.model</groupId>
-                <artifactId>mdsal-model-artifacts</artifactId>
-                <version>${odl.mdsal.model.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.controller</groupId>
-                <artifactId>mdsal-artifacts</artifactId>
-                <version>${odl.mdsal.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 <!--
     <dependencies>
 
diff --git a/sshapi-call-node/features/features-sshapi-call-node/pom.xml b/sshapi-call-node/features/features-sshapi-call-node/pom.xml
index 430a305f..69273c34 100644
--- a/sshapi-call-node/features/features-sshapi-call-node/pom.xml
+++ b/sshapi-call-node/features/features-sshapi-call-node/pom.xml
@@ -5,21 +5,17 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>features-sshapi-call-node</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.plugins.version>${project.version}</ccsdk.sli.plugins.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/sshapi-call-node/features/pom.xml b/sshapi-call-node/features/pom.xml
index aae34a5c..fae9df42 100755
--- a/sshapi-call-node/features/pom.xml
+++ b/sshapi-call-node/features/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>sshapi-call-node-features</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
diff --git a/sshapi-call-node/installer/pom.xml b/sshapi-call-node/installer/pom.xml
index a726f635..7e703a7a 100755
--- a/sshapi-call-node/installer/pom.xml
+++ b/sshapi-call-node/installer/pom.xml
@@ -5,12 +5,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>sshapi-call-node-installer</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.4.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
diff --git a/sshapi-call-node/pom.xml b/sshapi-call-node/pom.xml
index b6167c45..cc3187bc 100755
--- a/sshapi-call-node/pom.xml
+++ b/sshapi-call-node/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>sshapi-call-node</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node</name>
diff --git a/sshapi-call-node/provider/pom.xml b/sshapi-call-node/provider/pom.xml
index b25b69e4..6dff42fb 100755
--- a/sshapi-call-node/provider/pom.xml
+++ b/sshapi-call-node/provider/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.plugins</groupId>
     <artifactId>sshapi-call-node-provider</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
@@ -18,8 +18,19 @@
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <ccsdk.sli.plugins.version>${project.version}</ccsdk.sli.plugins.version>
     </properties>
+    
+    <dependencyManagement>
+    	<dependencies>
+    		<dependency>
+    			<groupId>org.onap.ccsdk.sli.core</groupId>
+    			<artifactId>sli-core-artifacts</artifactId>
+    			<version>${ccsdk.sli.core.version}</version>
+    			<type>pom</type>
+    			<scope>import</scope>
+    		</dependency>
+    	</dependencies>
+    </dependencyManagement>
 
     <dependencies>
         <dependency>