Revert "Comment NIC project in distribution"

[integration/distribution.git] / artifacts / upstream / single-features / pom.xml

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index bf26c1ff64bbd0adf72549dd032164b4ccf075da..1bb26484ab148c9196c58efdb1848772274d9c6c 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -96,6 +96,7 @@
             </dependency>
 
             <!-- BIER -->
+            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>odl-bier-all</artifactId>
@@ -103,6 +104,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- CONTROLLER -->
             <dependency>
@@ -285,7 +287,6 @@
             </dependency>
 
             <!-- NIC -->
-            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>odl-nic-intent-common</artifactId>
@@ -300,7 +301,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
 
             <!-- OCP Plugin -->
             <!-- Not active project