From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 8 Apr 2018 20:41:50 +0000 (-0700)
Subject: Remove VTN from Nitrogen distribution
X-Git-Tag: release/nitrogen-sr3~2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=1caa636cb22d3c0e0c6c92884e62e3f7b0f5e250;hp=13e96de0d0431eb7ee6e676d553f20ce3ca8b4f5;p=integration%2Fdistribution.git

Remove VTN from Nitrogen distribution

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

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 707f4ea2..1969174e 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -286,15 +286,6 @@
                 <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 96903ef4..7e1903f7 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -95,7 +95,6 @@
         <unimgr.version>0.3.3-SNAPSHOT</unimgr.version>
         <usc.version>1.4.3-SNAPSHOT</usc.version>
         <vpnservice.version>0.5.3-SNAPSHOT</vpnservice.version>
-        <vtn-manager.version>0.7.3-SNAPSHOT</vtn-manager.version>
         <yangtools.version>1.2.3-SNAPSHOT</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index 62610bb2..4edf32d0 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -476,21 +476,6 @@
                 <type>xml</type>
             </dependency>
 
-            <!-- VTN -->
-            <dependency>
-                <groupId>org.opendaylight.vtn</groupId>
-                <artifactId>odl-vtn-manager-rest</artifactId>
-                <version>${vtn-manager.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.opendaylight.vtn</groupId>
-                <artifactId>odl-vtn-manager-neutron</artifactId>
-                <version>${vtn-manager.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 4b3a895e..a0b44235 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -451,14 +451,6 @@
             <type>xml</type>
         </dependency>
 
-        <!-- VTN -->
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>features-vtn-manager</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-
         <!-- FIXME: Add Yangtools -->
 
     </dependencies>
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 9a27a889..ab1ecc6c 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -352,19 +352,5 @@
             <classifier>features</classifier>
         </dependency>
 
-        <!-- VTN -->
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>odl-vtn-manager-rest</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>odl-vtn-manager-neutron</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
     </dependencies>
 </project>