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 1743407b51f68f3917955e93ee5454ff7770208b..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>
@@ -301,6 +303,7 @@
             </dependency>
 
             <!-- OCP Plugin -->
+            <!-- Not active project
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>
                 <artifactId>odl-ocpplugin-all</artifactId>
@@ -308,6 +311,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- OF-CONFIG -->
             <dependency>