Revert "Remove unimgr from nitrogen distribution"

This reverts commit 8683e538264835e26c1c72c9066f8e63a6a71227.

Change-Id: I7395bb4e18cf5b7938893a6e3fcb7158213fe75b
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 93fa69bb4e3ee133afb0ee38fcc05c20c5d86e1a..47e2292409c5ed7362e7b7e4183481a104468220 100644 (file)
--- 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 8137b9d6b1f23637c8efd0891b346de2ce96f5af..0b61efb5354ae84a88defee9c6fa5f2d504233d3 100644 (file)
--- 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 47287f85aedba5a03f809e5d06cfba707fc80d97..f7148d0240f0c44036f21f2b67fc555031696b53 100644 (file)
--- 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 a6fce3a0a026b7fed15538eb3d897bc60fd7a0b9..17e60502c7bd7612e4cb6a0516a0958808aaf492 100644 (file)
--- 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>