X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=vpnservice%2Ffeatures%2Fpom.xml;h=5d4be955965a132a06b758fa9c707803ded4ded3;hb=3acc0ae0377e1c3e1dd7c1e7cd5708ad23922561;hp=e75c9baee667ed064c657b5b02bbd6f7fa35fcae;hpb=08d50ff396934938e80080289aaecbcf33c2ee22;p=netvirt.git

diff --git a/vpnservice/features/pom.xml b/vpnservice/features/pom.xml
index e75c9baee6..5d4be95596 100644
--- a/vpnservice/features/pom.xml
+++ b/vpnservice/features/pom.xml
@@ -15,11 +15,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <groupId>org.opendaylight.netvirt</groupId>
   <artifactId>vpnservice-features</artifactId>
   <version>0.4.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
+  <name>ODL :: netvirt :: ${project.artifactId}</name>
   <modelVersion>4.0.0</modelVersion>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
   <properties>
     <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
     <openflowplugin.version>0.4.0-SNAPSHOT</openflowplugin.version>
@@ -91,16 +88,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>utils.ovsdb-it-utils</artifactId>
-      <version>${ovsdb.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.netvirt</groupId>
-      <artifactId>netvirt-it-utils</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.netvirt</groupId>
       <artifactId>utils.servicehelper</artifactId>
@@ -169,6 +156,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>elanmanager-impl</artifactId>
       <version>${elanmgr.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>elanmanager-impl</artifactId>
+      <version>${elanmgr.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>elanmanager-api</artifactId>
@@ -184,13 +178,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>alivenessmonitor-impl</artifactId>
       <version>${genius.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>alivenessmonitor-impl</artifactId>
-      <version>${genius.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
       <artifactId>alivenessmonitor-api</artifactId>
@@ -241,6 +228,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>dhcpservice-api</artifactId>
       <version>${vpnservices.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>dhcpservice-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>natservice-impl</artifactId>
@@ -265,7 +259,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <groupId>${project.groupId}</groupId>
       <artifactId>aclservice-impl</artifactId>
       <version>${project.version}</version>
-      <type>cfg</type>
+      <type>xml</type>
       <classifier>config</classifier>
     </dependency>
     <dependency>
@@ -293,6 +287,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>neutronvpn-shell</artifactId>
       <version>${neutronvpn.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>vpnmanager-shell</artifactId>
+      <version>${vpnmanager.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutronvpn-impl</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>
       <artifactId>libthrift</artifactId>
@@ -320,13 +326,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>cloud-servicechain-impl</artifactId>
       <version>${cloud-servicechain.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>cloud-servicechain-impl</artifactId>
-      <version>${cloud-servicechain.version}</version>
-      <classifier>config</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>statemanager-impl</artifactId>
@@ -351,6 +350,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <artifactId>ovsdb-ui-bundle</artifactId>
       <version>${ovsdb.version}</version>
     </dependency>
+    <dependency>
+      <!-- TODO Remove when https://git.opendaylight.org/gerrit/#/c/44502/ is merged -->
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+    </dependency>
   </dependencies>
 
   <!--