From a0b2ba716749964bd202bf7a7cf77ae3983ecf1a Mon Sep 17 00:00:00 2001
From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Mon, 7 Aug 2017 21:54:13 +0000
Subject: [PATCH] Revert "Remove unimgr from nitrogen distribution"

This reverts commit 8683e538264835e26c1c72c9066f8e63a6a71227.

Change-Id: I7395bb4e18cf5b7938893a6e3fcb7158213fe75b
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---
 artifacts/upstream/artifacts/pom.xml                         | 2 --
 artifacts/upstream/single-features/pom.xml                   | 2 --
 features/repos/index/pom.xml                                 | 2 --
 features/singles/odl-integration-compatible-with-all/pom.xml | 2 --
 4 files changed, 8 deletions(-)

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 93fa69bb..47e22924 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -160,7 +160,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <!-- This project is still using odlparent 1.9.0
             <dependency>
                 <groupId>org.opendaylight.unimgr</groupId>
                 <artifactId>unimgr-artifacts</artifactId>
@@ -168,7 +167,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            -->
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 8137b9d6..0b61efb5 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -323,7 +323,6 @@
             </dependency>
 
             <!-- UNIMGR -->
-            <!-- This project is still using odlparent 1.9.0
             <dependency>
                 <groupId>org.opendaylight.unimgr</groupId>
                 <artifactId>odl-unimgr</artifactId>
@@ -331,7 +330,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
 
             <!-- VTN -->
             <dependency>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 47287f85..f7148d02 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -390,14 +390,12 @@
         </dependency>
 
         <!-- Unimgr -->
-        <!-- This project is still using odlparent 1.9.0
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>
             <artifactId>features4-unimgr</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
 
         <!-- VTN -->
         <dependency>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index a6fce3a0..17e60502 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -419,14 +419,12 @@
         </dependency>
 
         <!-- Unimgr -->
-        <!-- This project is still using odlparent 1.9.0
         <dependency>
             <groupId>org.opendaylight.unimgr</groupId>
             <artifactId>odl-unimgr</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        -->
 
     </dependencies>
 </project>
-- 
2.36.6