From: adetalhouet <adetalhouet@inocybe.com>
Date: Wed, 21 Oct 2015 16:53:43 +0000 (-0400)
Subject: Adding UniMgr feature
X-Git-Tag: release/beryllium~60
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F58%2F28658%2F2;p=integration%2Fdistribution.git

Adding UniMgr feature

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/unimgr/job/unimgr-merge-beryllium/

2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=unimgr.git;a=blob;f=features/src/main/features/features.xml;h=41026ead2607c4be5339b25680df257dcf8dba29;hb=HEAD
a) Feature Names: odl-unimgr
b) Features Descriptions: Present
c) Features Start-Levels: N/A

3) Features Tested: Features have been tested for functionality with
a) feature:install odl-unimgr
b) feature:install odl-unimgr odl-integration-compatible-with-all

4) Integration Test Impact: N/A

Change-Id: I423b91ed2607c0661ab20f9ca05fdf8bbd145885
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>
---

diff --git a/features/index/pom.xml b/features/index/pom.xml
index be248248..413b7b42 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -403,6 +403,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.unimgr</groupId>
+      <artifactId>unimgr-features</artifactId>
+      <version>${feature.unimgr.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.usc</groupId>
       <artifactId>usc-features</artifactId>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index b24b22a2..43b60ef0 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -86,6 +86,7 @@
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/${feature.topoprocessing.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.tsdr/features-tsdr/${feature.tsdr.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index f44f0b61..93d039f5 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -122,6 +122,7 @@
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-link-computation</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
         <feature version='${feature.ttp.version}'>odl-ttp-all</feature>
+        <feature version='${feature.unimgr.version}'>odl-unimgr</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
diff --git a/pom.xml b/pom.xml
index e35bcbeb..efb1a8d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,6 +53,7 @@
     <feature.topoprocessing.version>0.1.0-SNAPSHOT</feature.topoprocessing.version>
     <feature.tsdr.version>1.1.0-SNAPSHOT</feature.tsdr.version>
     <feature.ttp.version>0.2.0-SNAPSHOT</feature.ttp.version>
+    <feature.unimgr.version>0.0.1-SNAPSHOT</feature.unimgr.version>
     <feature.usc.version>1.1.0-SNAPSHOT</feature.usc.version>
     <feature.vpnservice.version>0.2.0-SNAPSHOT</feature.vpnservice.version>
     <feature.vtn-manager.version>0.4.0-SNAPSHOT</feature.vtn-manager.version>