Remove snbi from Carbon

Per TSC meeting on 2017-03-16 snbi is not participating in the Carbon
SimRel so remove them from the distribution.

https://meetings.opendaylight.org/opendaylight-meeting
/2017/tsc/opendaylight-meeting-tsc.2017-03-16-17.00.html

Change-Id: I21a210805c5da734bc1e5a5d11bfa1cfaecb9111
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 227c9a816a3fda33a4c30d14d7c0c5b68c8bcf82..947722d16b873a3a8267f3e6a3c80230b19a400a 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -482,14 +482,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Snbi -->
-            <dependency>
-                <groupId>org.opendaylight.snbi</groupId>
-                <artifactId>features-snbi</artifactId>
-                <version>${snbi.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <!-- Snmp -->
             <dependency>
                 <groupId>org.opendaylight.snmp</groupId>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index ebfd2d66fb986d18f94ba19fe1bf8da4a0778202..aa9f3dc21c6093e04a449ee4fac75fd874413a7d 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -91,7 +91,6 @@
         <restconf.version>1.5.0-SNAPSHOT</restconf.version>
         <sdninterfaceapp.version>1.8.0-SNAPSHOT</sdninterfaceapp.version>
         <sfc.version>0.5.0-SNAPSHOT</sfc.version>
-        <snbi.version>1.4.0-SNAPSHOT</snbi.version>
         <snmp.version>1.3.0-SNAPSHOT</snmp.version>
         <snmp4sdn.version>0.5.0-SNAPSHOT</snmp4sdn.version>
         <sxp.version>1.4.0-SNAPSHOT</sxp.version>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 9b1238dfc2ba0a0b79c756682430c59fd879c12f..845ca8d39106483618206ffb2e4ef91c6c51ad72 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -408,12 +408,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.snbi</groupId>
-            <artifactId>features-snbi</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.snmp</groupId>
             <artifactId>features-snmp</artifactId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index bc8e2a4781220c195e44f4b2c2fae73fb702516a..18a878285e8cf0fa7047dccc638ea47fc54322bd 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -92,7 +92,6 @@
     <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/{{VERSION}}/xml/features</repository>
     <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.snbi/features-snbi/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.sxp/features/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 1af62a9ed357485af473bf3bcaae3de5ea06b15e..d98e019ce00249d4f469c9637d98b50bd7a3bc4a 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -167,7 +167,6 @@
         <feature>odl-of-config-all</feature>
         <feature>odl-ovsdb-openstack</feature>
         <feature>odl-ovsdb-sfc</feature>
-        <feature>odl-snbi-all</feature>
         <!-- Commented out, because it produces OutOfMemoryError in SingleFeature test
         <feature>odl-sfc-ios-xe-renderer</feature>
         -->