Remove VTN from Carbon distribution

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

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 67ed27fb424e7516a587fce3f7e774ded214ea32..d09192d838df6ea253835f728386f32e04501fb7 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -504,14 +504,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Vtn -->
-            <dependency>
-                <groupId>org.opendaylight.vtn</groupId>
-                <artifactId>features-vtn-manager</artifactId>
-                <version>${vtn-manager.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>

diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 21b1adc4ed03c841db556e309b3085191b76b459..efa3b9f6422c004a0868d21e7909fd87c500973e 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -93,7 +93,6 @@
         <unimgr.version>0.2.4-SNAPSHOT</unimgr.version>
         <usc.version>1.3.4-SNAPSHOT</usc.version>
         <vpnservice.version>0.4.4-SNAPSHOT</vpnservice.version>
-        <vtn-manager.version>0.6.4-SNAPSHOT</vtn-manager.version>
         <yangtools.version>1.1.4-SNAPSHOT</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 808730b2dbed276fa73fe21af7e2573ff124165a..b9ab90b542a51672f7e4058d0a4a2556ae4d0753 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -422,11 +422,5 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>features-vtn-manager</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 1ebda0edac6b4fb84695c887076ccf437fa884c8..db9eaf3f835bad1e447a781f140ef1172f2f20c6 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -91,5 +91,4 @@
     <repository>mvn:org.opendaylight.ttp/features-ttp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/{{VERSION}}/xml/features</repository>
-    <repository>mvn:org.opendaylight.vtn/features-vtn-manager/{{VERSION}}/xml/features</repository>
 </features>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index f6ce8c214ef95c5a8dbc3b34ae6616a8a7cdb33c..aa9cb191bfe439f949e95dacae4cc72c71689804 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -150,8 +150,6 @@
         <feature>odl-sfc-openflow-renderer</feature>
         <feature>odl-tsdr-hsqldb-all</feature>
         <feature>odl-unimgr</feature>
-        <feature>odl-vtn-manager-neutron</feature>
-        <feature>odl-vtn-manager-rest</feature>
     </feature>
 
 </features>