Add NIC back to distribution

Change-Id: I790fdf344832f8cb9059e79fc9e259219ebe8370
Signed-off-by: Colin Dixon <colin@colindixon.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 704e8776431910f34368309ed7b12aadde7c5f58..fa82493ee2aefdfcc5cef26d7b6a31f77a5efb8d 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -324,7 +324,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Nic -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.nic</groupId>
                 <artifactId>features-nic</artifactId>
@@ -332,7 +331,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Ocpplugin -->
             <dependency>
                 <groupId>org.opendaylight.ocpplugin</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 4534b705ff93054117c497df35d91ec1c3c6a78c..90af909504d855a3c004f5720a77d712f591a5bd 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -282,14 +282,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.nic</groupId>
             <artifactId>features-nic</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.ocpplugin</groupId>
             <artifactId>features-ocpplugin</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 70cb45c26d64e05fbcc663d235c0797752c07042..e6db1fdea2fa0a1361e71b27088e8b3078d0922f 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -71,9 +71,7 @@
     <repository>mvn:org.opendaylight.netide/netide-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netvirt/vpnservice-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/{{VERSION}}/xml/features</repository>
-    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.nic/features-nic/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.ocpplugin/features-ocpplugin/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-akka/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 383a08202dfed186839a2ec28c985880cd344b80..5119827fa961c138295eadd3a0ce8aa89badc239 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -146,10 +146,7 @@
         <feature>odl-netconf-clustered-topology</feature>
         <feature>odl-netconf-connector-ssh</feature>
         <feature>odl-netvirt-openstack</feature>
-        <!-- Commented out, because NIC brings in Li designed OpenFlowPlugin
-            which leads to BindException.
         <feature>odl-nic-core-mdsal</feature>
-        -->
         <feature>odl-of-config-all</feature>
         <!-- Commented out, because it produces OutOfMemoryError in SingleFeature test
         <feature>odl-sfc-ios-xe-renderer</feature>