move vpnservice and cleanup poms

[netvirt.git] / features / netvirt-features / pom.xml

diff --git a/vpnservice/features/netvirt-features/pom.xml b/features/netvirt-features/pom.xml
similarity index 83%
rename from vpnservice/features/netvirt-features/pom.xml
rename to features/netvirt-features/pom.xml
index 69f6ca91682c72e44c01cc531d895a2ceeffb9bb..1b9e481d30648a7414c05627bfff6edd612c267d 100644 (file)
--- a/vpnservice/features/netvirt-features/pom.xml
+++ b/features/netvirt-features/pom.xml
@@ -6,10 +6,8 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
@@ -23,6 +21,7 @@
     <version>0.6.0-SNAPSHOT</version>
     <name>ODL :: netvirt :: ${project.artifactId}</name>
     <packaging>feature</packaging>
+    <modelVersion>4.0.0</modelVersion>
 
     <dependencies>
         <dependency>
@@ -53,12 +52,5 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <!--<dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>odl-netvirt-ui</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>-->
     </dependencies>
 </project>