Add unimgr into distribution

Change-Id: I467705a82a12a55a01ef084feec6ab4b06208340
Signed-off-by: Donald Hunter <donaldh@cisco.com>
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 276c20bca3876714312ad8b121340fa3dc6d481d..47e2292409c5ed7362e7b7e4183481a104468220 100644 (file)
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -160,6 +160,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.unimgr</groupId>
+                <artifactId>unimgr-artifacts</artifactId>
+                <version>${unimgr.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 8cda25628b7256e9e66b3a23d0973edd4d2c3a11..8b46737f07fc44a003b95d7b62b9dff61f1c1a3c 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -92,9 +92,7 @@
         <topoprocessing.version>0.4.0-SNAPSHOT</topoprocessing.version>
         <tsdr.version>1.4.0-SNAPSHOT</tsdr.version>
         <ttp.version>0.5.0-SNAPSHOT</ttp.version>
-        <!-- Removing on 5/23/17 b/c of compilation failures
         <unimgr.version>0.3.0-SNAPSHOT</unimgr.version>
-        -->
         <usc.version>1.4.0-SNAPSHOT</usc.version>
         <vpnservice.version>0.5.0-SNAPSHOT</vpnservice.version>
         <vtn-manager.version>0.7.0-SNAPSHOT</vtn-manager.version>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index c3bdd356109e9a94649b38680c19bdfc8cb27a19..42c443b3f2349ec3d61685fec58de3c8755631bd 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -105,6 +105,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- UNIMGR -->
+            <dependency>
+                <groupId>org.opendaylight.unimgr</groupId>
+                <artifactId>odl-unimgr</artifactId>
+                <version>${unimgr.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- VTN -->
             <dependency>
                 <groupId>org.opendaylight.vtn</groupId>
@@ -123,4 +132,4 @@
 
       </dependencies>
     </dependencyManagement>
-</project>
\ No newline at end of file
+</project>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index c7aab3a2aa20bb584fe24881a68f9b8d6a63ca3d..b334ac3fff2a4a9117b1d1cdd445360d32e3bc86 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -309,6 +309,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Unimgr -->
+        <dependency>
+            <groupId>org.opendaylight.unimgr</groupId>
+            <artifactId>features4-unimgr</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- VTN -->
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 613858e169d5aaf1f179b42db9239fb2791e651b..b09b4fbf26797d9e709d1b32ec7d345db4c92d69 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -289,5 +289,13 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- Unimgr -->
+        <dependency>
+            <groupId>org.opendaylight.unimgr</groupId>
+            <artifactId>odl-unimgr</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
     </dependencies>
 </project>