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, 54 insertions, 55 deletions

diff --git a/template-node/features/ccsdk-template-node/pom.xml b/template-node/features/ccsdk-template-node/pom.xml
index 30d8383af..442cc40ac 100644
--- a/template-node/features/ccsdk-template-node/pom.xml
+++ b/template-node/features/ccsdk-template-node/pom.xml
@@ -7,13 +7,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>single-feature-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath />
+		<version>1.2.1-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>ccsdk-template-node</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.4.1-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
 	<name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>
diff --git a/template-node/features/features-template-node/pom.xml b/template-node/features/features-template-node/pom.xml
index 058db5ca8..0e22b6137 100644
--- a/template-node/features/features-template-node/pom.xml
+++ b/template-node/features/features-template-node/pom.xml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>feature-repo-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-		<relativePath />
+		<version>1.2.1-SNAPSHOT</version>
+		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>features-template-node</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.4.1-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
-	<name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>
-
 	<dependencies>
 		<dependency>
 			<groupId>${project.groupId}</groupId>
diff --git a/template-node/features/pom.xml b/template-node/features/pom.xml
index 4056ab4e7..a7a2d67d7 100644
--- a/template-node/features/pom.xml
+++ b/template-node/features/pom.xml
@@ -1,24 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.2.1-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.onap.ccsdk.sli.plugins</groupId>
-	<artifactId>template-node-features</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.sli.plugins</groupId>
+    <artifactId>template-node-features</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>
-
-	<modules>
-		<module>ccsdk-template-node</module>
-		<module>features-template-node</module>
-	</modules>
+    <modules>
+        <module>ccsdk-template-node</module>
+        <module>features-template-node</module>
+    </modules>
 </project>
diff --git a/template-node/installer/pom.xml b/template-node/installer/pom.xml
index a298828b1..d8cdd69b3 100644
--- a/template-node/installer/pom.xml
+++ b/template-node/installer/pom.xml
@@ -7,12 +7,12 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>template-node-installer</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.4.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>
diff --git a/template-node/pom.xml b/template-node/pom.xml
index 0c9187807..3bfe36279 100644
--- a/template-node/pom.xml
+++ b/template-node/pom.xml
@@ -1,26 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
 
-	<parent>
-		<groupId>org.onap.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
-	</parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.2.1-SNAPSHOT</version>
+    </parent>
 
-	<groupId>org.onap.ccsdk.sli.plugins</groupId>
-	<artifactId>template-node</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
-	<packaging>pom</packaging>
+    <groupId>org.onap.ccsdk.sli.plugins</groupId>
+    <artifactId>template-node</artifactId>
+    <version>0.4.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-	<name>ccsdk-sli-plugins :: template-node</name>
-	<description>This is an implementation of DG Execute Node that resolves a Velocity Template</description>
-
-	<modules>
-		<module>provider</module>
-		<module>features</module>
-		<module>installer</module>
-	</modules>
+    <modules>
+        <module>provider</module>
+        <module>features</module>
+        <module>installer</module>
+    </modules>
 </project>
diff --git a/template-node/provider/pom.xml b/template-node/provider/pom.xml
index bf90d352d..23eee4d61 100644
--- a/template-node/provider/pom.xml
+++ b/template-node/provider/pom.xml
@@ -5,16 +5,28 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>binding-parent</artifactId>
-		<version>1.2.0-SNAPSHOT</version>
+		<version>1.2.1-SNAPSHOT</version>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.plugins</groupId>
 	<artifactId>template-node-provider</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.4.1-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>
 
+    <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>
 			<groupId>junit</groupId>