Revert "Comment NIC project in distribution"

[integration/distribution.git] / artifacts / upstream / feature-repos / pom.xml

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 7d03626fbbce8b4783b81b69572bc704454d2122..bf458900964d6256cce0a9bf1e2c02811f20a5fd 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -51,13 +51,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.aaa</groupId>
-                <artifactId>features-aaa-shiro</artifactId>
-                <version>${aaa.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
 
             <!-- ALTO -->
             <dependency>
@@ -70,6 +63,7 @@
 
 
             <!-- BIER -->
+            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>features-bier</artifactId>
@@ -77,6 +71,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- Controller -->
             <dependency>