From 1efd16dce0ecedb81039b26b81d1490cadeb3395 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 20 Dec 2018 13:44:40 -0500
Subject: Code changes to sli/core for ODL Fluorine

Code changes needed to support port to ODL Fluorine.

Change-Id: I539aeaabeab1056cd109b6bee12046d91d61cab1
Issue-ID: CCSDK-870
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 utils/features/ccsdk-slicore-utils/pom.xml | 26 ++------------------------
 utils/features/features-util/pom.xml       |  8 ++------
 utils/features/pom.xml                     |  2 +-
 utils/installer/pom.xml                    |  4 ++--
 utils/pom.xml                              |  4 ++--
 utils/provider/pom.xml                     | 10 ++--------
 6 files changed, 11 insertions(+), 43 deletions(-)

(limited to 'utils')

diff --git a/utils/features/ccsdk-slicore-utils/pom.xml b/utils/features/ccsdk-slicore-utils/pom.xml
index 7ff4d7682..a4d568805 100644
--- a/utils/features/ccsdk-slicore-utils/pom.xml
+++ b/utils/features/ccsdk-slicore-utils/pom.xml
@@ -5,39 +5,17 @@
     <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.core</groupId>
     <artifactId>ccsdk-slicore-utils</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
-    
-    <properties>
-    	<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.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/utils/features/features-util/pom.xml b/utils/features/features-util/pom.xml
index 9981b2cd2..e6adfbc85 100644
--- a/utils/features/features-util/pom.xml
+++ b/utils/features/features-util/pom.xml
@@ -5,20 +5,16 @@
     <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.core</groupId>
     <artifactId>features-util</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
-    
-    <properties>
-    	<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
-    </properties>
 
     <dependencies>
         <dependency>
diff --git a/utils/features/pom.xml b/utils/features/pom.xml
index 33277b88f..daa5cafd0 100755
--- a/utils/features/pom.xml
+++ b/utils/features/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
diff --git a/utils/installer/pom.xml b/utils/installer/pom.xml
index b0c1d4a37..4d2574b2b 100755
--- a/utils/installer/pom.xml
+++ b/utils/installer/pom.xml
@@ -5,13 +5,13 @@
 	<parent>
 		<groupId>org.onap.ccsdk.parent</groupId>
 		<artifactId>odlparent-lite</artifactId>
-		<version>1.2.0</version>
+		<version>1.2.1-SNAPSHOT</version>
 		<relativePath/>
 	</parent>
 
 	<groupId>org.onap.ccsdk.sli.core</groupId>
 	<artifactId>utils-installer</artifactId>
-	<version>0.4.0-SNAPSHOT</version>
+	<version>0.4.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
diff --git a/utils/pom.xml b/utils/pom.xml
index be130eb50..44b8e9880 100755
--- a/utils/pom.xml
+++ b/utils/pom.xml
@@ -5,13 +5,13 @@
    <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
    <groupId>org.onap.ccsdk.sli.core</groupId>
    <artifactId>utils</artifactId>
-   <version>0.4.0-SNAPSHOT</version>
+   <version>0.4.1-SNAPSHOT</version>
    <packaging>pom</packaging>
 
    <name>ccsdk-sli-core :: utils</name>
diff --git a/utils/provider/pom.xml b/utils/provider/pom.xml
index 88983bd84..0ff0efd8c 100644
--- a/utils/provider/pom.xml
+++ b/utils/provider/pom.xml
@@ -5,22 +5,16 @@
     <parent>
         <groupId>org.onap.ccsdk.parent</groupId>
         <artifactId>binding-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.2.1-SNAPSHOT</version>
         <relativePath/>
     </parent>
 
     <groupId>org.onap.ccsdk.sli.core</groupId>
     <artifactId>utils-provider</artifactId>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>ccsdk-sli-core :: utils :: ${project.artifactId}</name>
-
-    
-    <properties>
-    	<ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
-    </properties>
-
     <description>
         The SLI Core Utilities Package provides common functionality for setting up SLI connectivity.
     </description>
-- 
cgit 1.2.3-korg