From 057bc260e7752bc11960cf9cab4005efec1739c7 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Fri, 4 Jan 2019 09:22:20 -0500
Subject: 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>
---
 .../features/ccsdk-properties-node/pom.xml         | 30 ++------------
 .../features/features-properties-node/pom.xml      | 46 ++++++++++------------
 properties-node/features/pom.xml                   |  4 +-
 properties-node/installer/pom.xml                  |  4 +-
 properties-node/pom.xml                            |  4 +-
 properties-node/provider/pom.xml                   | 17 ++++++--
 6 files changed, 44 insertions(+), 61 deletions(-)

(limited to 'properties-node')

diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml
index 9e7988e3..1d5feae6 100644
--- a/properties-node/features/ccsdk-properties-node/pom.xml
+++ b/properties-node/features/ccsdk-properties-node/pom.xml
@@ -5,42 +5,18 @@
     <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-properties-node</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-plugins :: properties-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>
 
         <dependency>
diff --git a/properties-node/features/features-properties-node/pom.xml b/properties-node/features/features-properties-node/pom.xml
index 61365c4f..e00d2cfa 100644
--- a/properties-node/features/features-properties-node/pom.xml
+++ b/properties-node/features/features-properties-node/pom.xml
@@ -1,33 +1,29 @@
 <?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>
+	<modelVersion>4.0.0</modelVersion>
 
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>feature-repo-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath/>
-    </parent>
+	<parent>
+		<groupId>org.onap.ccsdk.parent</groupId>
+		<artifactId>feature-repo-parent</artifactId>
+		<version>1.2.1-SNAPSHOT</version>
+		<relativePath/>
+	</parent>
 
-    <groupId>org.onap.ccsdk.sli.plugins</groupId>
-    <artifactId>features-properties-node</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
+	<groupId>org.onap.ccsdk.sli.plugins</groupId>
+	<artifactId>features-properties-node</artifactId>
+	<version>0.4.1-SNAPSHOT</version>
+	<packaging>feature</packaging>
 
-    <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
+	<name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
 
-    <properties>
-        <ccsdk.sli.plugins.version>${project.version}</ccsdk.sli.plugins.version>
-    </properties>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>ccsdk-properties-node</artifactId>
+			<version>${project.version}</version>
+			<type>xml</type>
+			<classifier>features</classifier>
+		</dependency>
 
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-properties-node</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
+	</dependencies>
 </project>
diff --git a/properties-node/features/pom.xml b/properties-node/features/pom.xml
index 339e9f7c..27bea029 100755
--- a/properties-node/features/pom.xml
+++ b/properties-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>properties-node-features</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml
index 5c95c023..c431b521 100755
--- a/properties-node/installer/pom.xml
+++ b/properties-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>properties-node-installer</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
diff --git a/properties-node/pom.xml b/properties-node/pom.xml
index ac1b2881..c8d9c9a3 100755
--- a/properties-node/pom.xml
+++ b/properties-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>properties-node</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>ccsdk-sli-plugins :: properties-node</name>
diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml
index 668e1168..92cff999 100755
--- a/properties-node/provider/pom.xml
+++ b/properties-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>properties-node-provider</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-plugins :: properties-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>
-- 
cgit 1.2.3-korg