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 a7b82357324ffe2bdee3539fab5b1a840644fcd4..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,21 +104,15 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
-            <!-- Cardinal -->
+            <!-- CONTROLLER -->
             <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>odl-cardinal-ui</artifactId>
-                <version>${cardinal.version}</version>
-                <type>xml</type>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>odl-mdsal-broker</artifactId>
+                <version>${mdsal.version}</version>
                 <classifier>features</classifier>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.cardinal</groupId>
-                <artifactId>odl-cardinal</artifactId>
-                <version>${cardinal.version}</version>
                 <type>xml</type>
-                <classifier>features</classifier>
             </dependency>
 
             <!-- Dlux Apps -->
@@ -308,6 +303,7 @@
             </dependency>
 
             <!-- OCP Plugin -->
+            <!-- Not active project
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>
                 <artifactId>odl-ocpplugin-all</artifactId>
@@ -315,6 +311,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- OF-CONFIG -->
             <dependency>
@@ -325,6 +322,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- P4 Plugin -->
+            <dependency>
+                <groupId>org.opendaylight.p4plugin</groupId>
+                <artifactId>odl-p4plugin-all</artifactId>
+                <version>${p4plugin.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- Packetcable -->
             <dependency>
                 <groupId>org.opendaylight.packetcable</groupId>
@@ -440,15 +446,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- TTP -->
-            <dependency>
-                <groupId>org.opendaylight.ttp</groupId>
-                <artifactId>odl-ttp-model-rest</artifactId>
-                <version>${ttp.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-
             <!-- UNIMGR -->
             <dependency>
                 <groupId>org.opendaylight.unimgr</groupId>