Bug 4653: Removed VTN.

VTN project build is disabled in autorelease jobs due to bug 4426.
Therefore, in order to build the int/distribution successfully in
autorelease jobs, VTN features need to be removed temporarily.

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

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

diff --git a/features/index/pom.xml b/features/index/pom.xml
index aeac09bc9e208389e21d99c55693049650f02f7d..71dbf7b6672feed9bb314c09db8cbd017c80cd01 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -445,6 +445,8 @@
       <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>
@@ -452,6 +454,7 @@
       <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 86cc525b9ccc8ad49db2c2de5a5d4529030ce3ea..e7c7126a7ee8cdb653eb231d46e3b347c3ffe39a 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -93,5 +93,8 @@
     <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>