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 8ca50e30ff09dd6aefda9a1c5401ccb34591b642..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,15 +71,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-
-            <!-- Cardinal -->
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>cardinal-features4</artifactId>
-                <version>${cardinal.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
+            -->
 
             <!-- Controller -->
             <dependency>
@@ -109,6 +95,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>features-mdsal-trace</artifactId>
+                <version>${mdsal.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
 
             <!-- Dlux -->
             <dependency>
@@ -128,6 +121,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- Eman -->
+            <dependency>
+                <groupId>org.opendaylight.eman</groupId>
+                <artifactId>features-eman</artifactId>
+                <version>${eman.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- FaaS -->
             <dependency>
                 <groupId>org.opendaylight.faas</groupId>
@@ -174,6 +176,7 @@
             </dependency>
 
             <!-- OCP Plugin -->
+            <!-- Not active project
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>
                 <artifactId>features-ocpplugin</artifactId>
@@ -181,6 +184,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- ODL Parent -->
             <dependency>
@@ -207,6 +211,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- P4 Plugin -->
+            <dependency>
+                <groupId>org.opendaylight.p4plugin</groupId>
+                <artifactId>features-p4plugin</artifactId>
+                <version>${p4plugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- Packetcable -->
             <dependency>
                 <groupId>org.opendaylight.packetcable</groupId>
@@ -252,15 +265,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- TTP -->
-            <dependency>
-                <groupId>org.opendaylight.ttp</groupId>
-                <artifactId>features-ttp</artifactId>
-                <version>${ttp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- USC -->
             <dependency>
                 <groupId>org.opendaylight.usc</groupId>