Add snmp4sdn back

snmp4sdn karaf 4 migration is done so request to add back

Change-Id: I54f456e087b61e2a811b476b722420fad244c828
Signed-off-by: ylhsieh <ylhsieh@itri.org.tw>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 31639752e45dd34ed6a0427354ddbff19087ff55..02b09dcad25d052c025a88d9e1243d3809de75ca 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -454,7 +454,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Snmp4sdn -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.snmp4sdn</groupId>
                 <artifactId>features-snmp4sdn</artifactId>
@@ -462,7 +461,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Sxp -->
             <dependency>
                 <groupId>org.opendaylight.sxp</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 882404f3cd0a4033853d4726b6759e47e3234f47..48f1f76692a3a70deee4156243fc15795c8f8562 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -386,14 +386,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.snmp4sdn</groupId>
             <artifactId>features-snmp4sdn</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.sxp</groupId>
             <artifactId>features</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index aecb08a24b08502fea016e1f0793331a6ea93bb5..4e9bcdd58ef9a91510f58e90478173760a2b6854 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -95,9 +95,7 @@
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/{{VERSION}}/xml/features</repository>
-    <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.sxp/features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.topoprocessing/features-topoprocessing/{{VERSION}}/xml/features</repository>
     <!-- Temporay remove because of karaf 4

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 8acae834e3d07870018391343200f7737f7597a6..f3ec31e8b2f3176c2811a20ada42b17efa021531 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -107,9 +107,7 @@
         <feature>odl-sfclisp</feature>
         <feature>odl-sxp-controller</feature>
         <feature>odl-snmp-plugin</feature>
-        <!-- Issues with yang parser show up in aaa distribution-check
         <feature>odl-snmp4sdn-all</feature>
-        -->
         <feature>odl-topoprocessing-i2rs</feature>
         <feature>odl-topoprocessing-inventory</feature>
         <feature>odl-topoprocessing-inventory-rendering</feature>