Comment NIC project in distribution

This is failing all projects distribution check.

Change-Id: I18ad4769e43025d6a932dc29e096cf1838a0b96d
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index ec9e4b5abe07808f97bb6607caec63157c128628..1be16e79e6960ebd6fc0df8430484ba54ab2b1e1 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -165,6 +165,7 @@
             </dependency>
 
             <!-- NIC -->
+            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>features-nic</artifactId>
@@ -172,6 +173,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- OCP Plugin -->
             <!-- Not active project

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 18948c267fcb1b8b31cdd54940b372c0108b8747..bf26c1ff64bbd0adf72549dd032164b4ccf075da 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -285,6 +285,7 @@
             </dependency>
 
             <!-- NIC -->
+            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>odl-nic-intent-common</artifactId>
@@ -299,6 +300,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- OCP Plugin -->
             <!-- Not active project

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index a27bd09bd454886e82217e21c390e8e6cc7ae928..883661424a6cbe1c3b524aba765232685d78506c 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -294,12 +294,15 @@
         </dependency>
 
         <!-- NIC -->
+        <!-- Comment due to fail merge job
+
         <dependency>
             <groupId>org.opendaylight.nic</groupId>
             <artifactId>features-nic</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- OCPplugin -->
         <!-- Not active project