Remove SNMP4SDN and clean up feature files

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

diff --git a/features/index/pom.xml b/features/index/pom.xml
index adc0271e2c1b370bb9abd7a903228c8d6d17136c..59504406ddae10305225ccc25a13247e020160c8 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -219,14 +219,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!--<dependency>-->
-      <!--<groupId>org.opendaylight.ovsdb</groupId>-->
-      <!--<artifactId>features-ovs-sfc</artifactId>-->
-      <!--<version>0.1.0-SNAPSHOT</version>-->
-      <!--<classifier>features</classifier>-->
-      <!--<type>xml</type>-->
-    <!--</dependency>-->
-<!--
     <dependency>
        <groupId>org.opendaylight.packetcable</groupId>
        <artifactId>features-packetcable</artifactId>
@@ -234,16 +226,6 @@
        <classifier>features</classifier>
        <type>xml</type>
     </dependency>
--->
-<!--
-    <dependency>
-       <groupId>org.opendaylight.plugin2oc</groupId>
-       <artifactId>features-plugin2oc</artifactId>
-       <version>0.2.0-SNAPSHOT</version>
-       <classifier>features</classifier>
-       <type>xml</type>
-    </dependency>
--->
     <dependency>
       <groupId>org.opendaylight.sdninterfaceapp</groupId>
       <artifactId>features-sdninterfaceapp</artifactId>
@@ -307,13 +289,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.snmp4sdn</groupId>
-      <artifactId>features-snmp4sdn</artifactId>
-      <version>0.2.0-SNAPSHOT</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.tcpmd5</groupId>
       <artifactId>features-tcpmd5</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 07af4cf26d2b99c96d8df9278363bec82cc85184..9ce496cc3fd43851433797284d6769f3ba5c1623 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -58,13 +58,6 @@
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin.legacy/features-legacy/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.ovsdb/features-ovsdb/${feature.ovsdb.version}/xml/features</repository>
-    <!--<repository>mvn:org.opendaylight.ovsdb/features-ovs-sfc/0.1.0-SNAPSHOT/xml/features</repository>-->
-<!--
-    <repository>mvn:org.opendaylight.packetcable/features-packetcable/${feature.packetcable.version}/xml/features</repository>
--->
-<!--
-    <repository>mvn:org.opendaylight.plugin2oc/features-plugin2oc/0.2.0-SNAPSHOT/xml/features</repository>
--->
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/1.5.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc-netconf/${feature.sfc.version}/xml/features</repository>
@@ -74,7 +67,6 @@
     <repository>mvn:org.opendaylight.sfc/features-sfcofl2/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/0.2.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.tcpmd5/features-tcpmd5/${feature.tcpmd5.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/${feature.topoprocessing.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.tsdr/features-tsdr/${feature.tsdr.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 246977b0052e40c37fc96b9cfdca3d37cd15f3e1..7b64291037eec42dfa949333db00e94ecad4fcc1 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -85,9 +85,6 @@
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
-<!--
-        <feature version='${feature.packetcable.version}'>odl-packetcable-all</feature>
--->
         <feature version='1.2.0-SNAPSHOT'>odl-restconf</feature>
         <feature version="1.5.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-core</feature>
@@ -99,7 +96,6 @@
         <feature version='${feature.sfc.version}'>odl-sfc-ovs</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-netconf</feature>
         <feature version='${snmp.plugin.version}'>odl-snmp-plugin</feature>
-        <feature version='0.2.0-SNAPSHOT'>odl-snmp4sdn-all</feature>
         <feature version='${feature.tcpmd5.version}'>odl-tcpmd5-all</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-framework</feature>
         <feature version='${feature.topoprocessing.version}'>odl-topoprocessing-mlmt</feature>
@@ -119,11 +115,7 @@
         <feature version='0.2.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         <feature version='${feature.nic.version}'>odl-nic-core</feature>
-<!--
-        <feature version='0.2.0-SNAPSHOT'>odl-plugin2oc</feature>
--->
         <feature version='${feature.ovsdb.openstack.version}'>odl-ovsdb-openstack</feature>
-        <!--<feature version='0.1.0-SNAPSHOT'>odl-ovsdb-ovssfc</feature>-->
         <feature version='${feature.snbi.version}'>odl-snbi-all</feature>
         <feature version='${feature.tsdr.version}'>odl-tsdr-all</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>

diff --git a/pom.xml b/pom.xml
index 6e7e86a0c327a9e2e388363acf63581e98039fcd..e6665de09f5552fba0cb24fe581a580894659722 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,6 @@
     <feature.ovsdb.openstack.version>1.1.0-SNAPSHOT</feature.ovsdb.openstack.version>
     <feature.ovsdb.version>1.1.0-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.2.0-SNAPSHOT</feature.packetcable.version>
-    <feature.plugin2oc.version>0.2.0-SNAPSHOT</feature.plugin2oc.version>
     <feature.sfc.version>0.1.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.1.0-SNAPSHOT</feature.snbi.version>
     <feature.tcpmd5.version>1.1.0-SNAPSHOT</feature.tcpmd5.version>