Revert "Bug 4653: Removed VTN."

This reverts commit 88db4505bfd39f48e2a412510a584807484bf07f.

This patch brings VTN features back to the features index. Since bug
4426 is fixed in VTN project and VTN build has been enabled again in
autorelease jobs, bringing VTN features back does not make any issues.

Change-Id: I6d752d8f7379eb363439c69d11627134487def85
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>

diff --git a/distributions/karaf/pom.xml b/distributions/karaf/pom.xml
index aac10d84efa1aca2c1e399107e18f61bf00c5f1a..1ffe2ceb3ca221dd82965bdb3ad6c68eff075942 100644 (file)
--- a/distributions/karaf/pom.xml
+++ b/distributions/karaf/pom.xml
@@ -94,8 +94,6 @@
     </dependency>
 
     <!-- External application -->
-    <!--
-         TODO: Add the following dependencies after the Bug 4426 is fixed.
     <dependency>
       <groupId>org.opendaylight.vtn</groupId>
       <artifactId>distribution.vtn-coordinator</artifactId>
@@ -139,7 +137,6 @@
         </exclusion>
       </exclusions>
     </dependency>
-    -->
   </dependencies>
 
   <build>
@@ -344,8 +341,6 @@
              <ignorePermissions>false</ignorePermissions>
             </configuration>
           </execution>
-          <!--
-             TODO: Add the execution after the Bug 4426 is fixed.
           <execution>
             <id>copy-externalapps</id>
             <phase>prepare-package</phase>
@@ -361,7 +356,6 @@
               <excludeTransitive>true</excludeTransitive>
             </configuration>
           </execution>
-          -->
         </executions>
       </plugin>
       <plugin>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index cbc0a3a71290be43ace04eba1f21a49c24524484..22616231c85097c32a117b8ece442231844e2ea0 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -417,8 +417,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!--
-         TODO: Add the following dependency after the Bug 4426 is fixed.
     <dependency>
       <groupId>org.opendaylight.vtn</groupId>
       <artifactId>features-vtn-manager</artifactId>
@@ -426,7 +424,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    -->
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>vpnservice-features</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 8c7d0577ea023a22c6a5f10b2c48e00233f4c82b..2acff022189610726dc72d154bd34f32cbce02f6 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -89,8 +89,5 @@
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vpnservice/vpnservice-features/${feature.vpnservice.version}/xml/features</repository>
-    <!--
-         TODO: Add the following repository after the Bug 4426 is fixed.
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
-    -->
 </features>