summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgaurav <gaurav.agrawal@huawei.com>2018-09-14 14:36:21 +0530
committerDan Timoney <dt5972@att.com>2018-09-27 17:52:59 +0000
commit2c99dfb113ca8a960b08de00b90165f0c1565836 (patch)
tree45bce6dff5037b48e0de047f5b99b1e2cdd633ca
parent0944a6e54ac4a01035c601c44015634c2533d5fa (diff)
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>
-rw-r--r--features/ccsdk-sli-plugins-all/pom.xml7
-rw-r--r--restconf-client/features/ccsdk-restconf-client/pom.xml14
-rwxr-xr-xrestconf-client/provider/pom.xml22
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 d4715be62..714ad58a5 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 03d935296..462036e73 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 ac5c4cc32..43c9d1737 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>