From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 7 Jan 2018 20:24:20 +0000 (+0000)
Subject: Revert "Comment NIC project in distribution"
X-Git-Tag: release/oxygen~26
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=4538139da8e4628b58db3f1702f0f3ab52a76ba5;p=integration%2Fdistribution.git

Revert "Comment NIC project in distribution"

This reverts commit 87331022857a54bd3be0a4dbe784feffbf84acf0.

Change-Id: I886e2922783c5cb8bd723eeeb4e7963ffb551da6
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 e930d08f..bf458900 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -167,7 +167,6 @@
             </dependency>
 
             <!-- NIC -->
-            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>features-nic</artifactId>
@@ -175,7 +174,6 @@
                 <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 99a2bd1e..1bb26484 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -287,7 +287,6 @@
             </dependency>
 
             <!-- NIC -->
-            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>odl-nic-intent-common</artifactId>
@@ -302,7 +301,6 @@
                 <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 8f8f7298..4e33482e 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -296,15 +296,12 @@
         </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