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 1e4839a0be43a945180f9f39c47da253cd8b9ad2..1bb26484ab148c9196c58efdb1848772274d9c6c 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -14,7 +14,7 @@
     <parent>
         <groupId>org.opendaylight.integration</groupId>
         <artifactId>properties</artifactId>
-        <version>0.7.0-SNAPSHOT</version>
+        <version>0.8.0-SNAPSHOT</version>
         <relativePath>../properties</relativePath>
     </parent>
     <artifactId>single-feature-artifacts</artifactId>
@@ -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 -->
@@ -150,6 +145,29 @@
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- Eman -->
+            <dependency>
+                <groupId>org.opendaylight.eman</groupId>
+                <artifactId>odl-eman-ui</artifactId>
+                <version>${eman.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.eman</groupId>
+                <artifactId>odl-eman-api</artifactId>
+                <version>${eman.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.eman</groupId>
+                <artifactId>odl-eman</artifactId>
+                <version>${eman.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+
             <!-- FAAS -->
             <dependency>
                 <groupId>org.opendaylight.faas</groupId>
@@ -285,6 +303,7 @@
             </dependency>
 
             <!-- OCP Plugin -->
+            <!-- Not active project
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>
                 <artifactId>odl-ocpplugin-all</artifactId>
@@ -292,6 +311,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- OF-CONFIG -->
             <dependency>
@@ -302,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>
@@ -390,6 +419,15 @@
                 <classifier>features</classifier>
             </dependency>
 
+            <!-- SNMP -->
+            <dependency>
+                <groupId>org.opendaylight.snmp</groupId>
+                <artifactId>odl-snmp-plugin</artifactId>
+                <version>${snmp.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- SNMP4SDN -->
             <dependency>
                 <groupId>org.opendaylight.snmp4sdn</groupId>
@@ -408,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>