Add NIC feature to Nitrogen

Change-Id: Icaff35f984996b82a43f5360da6cfc137e2725fc
Signed-off-by: Yrineu Rodrigues <yrineu.rodrigues@serro.com>
Signed-off-by: Andrej Kilvady <akilvady@cisco.com>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 0b5b205ce006f6eb662a8ccde99eec6a5274bb39..398aa6a6c026c9eca63b817d156e527dbfaf4497 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -136,6 +136,15 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- NIC -->
+            <dependency>
+                <groupId>org.opendaylight.nic</groupId>
+                <artifactId>features-nic</artifactId>
+                <version>${nic.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- OCP Plugin -->
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 0f9c438be33519ad4d05c76fbfc2787d2bfd4a8b..c98de70e75ff9434d5877f25bff1f0828ea60de6 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -136,6 +136,29 @@
                 <type>xml</type>
             </dependency>
 
+            <!-- NIC -->
+            <dependency>
+                <groupId>org.opendaylight.nic</groupId>
+                <artifactId>odl-nic-all</artifactId>
+                <version>${nic.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.nic</groupId>
+                <artifactId>odl-nic-intent-common</artifactId>
+                <version>${nic.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.nic</groupId>
+                <artifactId>odl-nic-core-mdsal</artifactId>
+                <version>${nic.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
+
             <!-- OCP Plugin -->
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>
@@ -286,7 +309,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-
-      </dependencies>
+        </dependencies>
     </dependencyManagement>
 </project>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index dffd47447ef5e26218a39164412cfc48af75eac0..a0a8aeaeb2d0659532fd936de4bdc485751e048b 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -261,6 +261,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- NIC -->
+        <dependency>
+            <groupId>org.opendaylight.nic</groupId>
+            <artifactId>features-nic</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- OCPplugin -->
         <dependency>
             <groupId>org.opendaylight.ocpplugin</groupId>

diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 6804ef63132fe724e9693e3060bc97df0da809f1..f1edac449e54157e9c506017d2ffefef4aa5e5df 100644 (file)
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -218,6 +218,16 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- NIC -->
+        <!-- Commenting this feature because SFT memory issues
+        <dependency>
+            <groupId>org.opendaylight.nic</groupId>
+            <artifactId>odl-nic-intent-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        -->
+
         <!-- OCPplugin -->
         <dependency>
             <groupId>org.opendaylight.ocpplugin</groupId>