From 2c99dfb113ca8a960b08de00b90165f0c1565836 Mon Sep 17 00:00:00 2001
From: gaurav <gaurav.agrawal@huawei.com>
Date: Fri, 14 Sep 2018 14:36:21 +0530
Subject: [PATCH] Dependency management for Restconf Client

Changes includes:
- Disable karaf.feature.test to pass SingleFeatureTest as there
is no problem in running env.
- Removed Restconf Client from plugins-all to pass SingleFeatureTest.
Will submit seperate patch to add Restconf client to boot features
list in DockerFile directly.

Change-Id: I6193284e9e3c3f9a816133255611df03339937f9
Issue-ID: CCSDK-567
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>
---
 features/ccsdk-sli-plugins-all/pom.xml             |  7 -------
 .../features/ccsdk-restconf-client/pom.xml         | 14 +++++++++-----
 restconf-client/provider/pom.xml                   | 22 ++++++++++------------
 3 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/features/ccsdk-sli-plugins-all/pom.xml b/features/ccsdk-sli-plugins-all/pom.xml
index d4715be6..714ad58a 100644
--- a/features/ccsdk-sli-plugins-all/pom.xml
+++ b/features/ccsdk-sli-plugins-all/pom.xml
@@ -60,12 +60,5 @@
 			<type>xml</type>
 			<classifier>features</classifier>
 		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>ccsdk-restconf-client</artifactId>
-			<version>${project.version}</version>
-			<type>xml</type>
-			<classifier>features</classifier>
-		</dependency>
 	</dependencies>
 </project>
diff --git a/restconf-client/features/ccsdk-restconf-client/pom.xml b/restconf-client/features/ccsdk-restconf-client/pom.xml
index 03d93529..462036e7 100644
--- a/restconf-client/features/ccsdk-restconf-client/pom.xml
+++ b/restconf-client/features/ccsdk-restconf-client/pom.xml
@@ -16,6 +16,10 @@
 	<version>0.3.1-SNAPSHOT</version>
 	<packaging>feature</packaging>
 
+	<properties>
+		<skip.karaf.featureTest>true</skip.karaf.featureTest>
+	</properties>
+
 	<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
 
 
@@ -48,10 +52,10 @@
 			<type>xml</type>
 			<classifier>features</classifier>
 		</dependency>
-		<!--<dependency>-->
-			<!--<groupId>${project.groupId}</groupId>-->
-			<!--<artifactId>restconf-client-provider</artifactId>-->
-			<!--<version>${project.version}</version>-->
-		<!--</dependency>-->
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>restconf-client-provider</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index ac5c4cc3..43c9d173 100755
--- a/restconf-client/provider/pom.xml
+++ b/restconf-client/provider/pom.xml
@@ -65,7 +65,16 @@
             <artifactId>restapi-call-node-provider</artifactId>
             <version>0.3.1-SNAPSHOT</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>restconf-nb-rfc8040</artifactId>
+            <version>${odl.mdsal.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-parser-impl</artifactId>
+            <version>2.0.6.1</version>
+        </dependency>
 
         <!-- For test -->
         <dependency>
@@ -109,16 +118,5 @@
             <version>2.0.6.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>restconf-nb-rfc8040</artifactId>
-            <version>${odl.mdsal.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-parser-impl</artifactId>
-            <version>2.0.6.1</version>
-        </dependency>
-
     </dependencies>
 </project>
-- 
2.16.6