Add unimgr to distribution

Change-Id: I73322602e0432700dfe09a07f40f71881ff55a57
Signed-off-by: Ravit Peretz <ravit.peretz@hpe.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 648c3466e371e14a8b7b9861acb0dd5ff12bf7c0..5b227c254f2fff2bcb6ae619bdf48d97869127d1 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -492,7 +492,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Unimgr -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.unimgr</groupId>
                 <artifactId>unimgr-features</artifactId>
@@ -500,7 +499,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Usc -->
             <dependency>
                 <groupId>org.opendaylight.usc</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index a1702947b29001253340060fd06bbe3437995f87..30900996de59e4d1b01f9df77152cacefa366e45 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -414,14 +414,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>
             <artifactId>unimgr-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.usc</groupId>
             <artifactId>usc-features</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 811d33930a7589a5256b7f4ad903fad975563e5a..fb3d6bf5606eeddec908307c568e705a637d97ef 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -98,9 +98,7 @@
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.tsdr/features-tsdr/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.ttp/features-ttp/{{VERSION}}/xml/features</repository>
-    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.usc/usc-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/{{VERSION}}/xml/features</repository>
 </features>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 4cb16308f8f677812e604dc2c4e4c89efad5a8a6..9fdc034df077cc232903c70cfd74845661de40b1 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -158,9 +158,7 @@
         -->
         <feature>odl-sfc-openflow-renderer</feature>
         <feature>odl-tsdr-hsqldb-all</feature>
-        <!-- Temporary remove because of karaf 4
         <feature>odl-unimgr</feature>
-        -->
         <feature>odl-vtn-manager-neutron</feature>
         <feature>odl-vtn-manager-rest</feature>
     </feature>