Infrautils DiagStatus Integration For ELAN

[netvirt.git] / vpnservice / elanmanager / elanmanager-impl / pom.xml

diff --git a/vpnservice/elanmanager/elanmanager-impl/pom.xml b/vpnservice/elanmanager/elanmanager-impl/pom.xml
index 9c5b8a3e6dff3b7659af915da12fee8ef80d47d4..28b813a978ff3d8c384eadaf83efe2991c05e617 100644 (file)
--- a/vpnservice/elanmanager/elanmanager-impl/pom.xml
+++ b/vpnservice/elanmanager/elanmanager-impl/pom.xml
@@ -8,9 +8,9 @@
 
   <parent>
     <groupId>org.opendaylight.netvirt</groupId>
-    <artifactId>config-parent</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
-    <relativePath>../../commons/config-parent</relativePath>
+    <artifactId>binding-parent</artifactId>
+    <version>0.6.0-SNAPSHOT</version>
+    <relativePath>../../commons/binding-parent</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
@@ -35,9 +35,14 @@
       <version>${genius.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>idmanager-api</artifactId>
-      <version>${genius.version}</version>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>diagstatus-api</artifactId>
+      <version>${infrautils.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.cdi</groupId>
+      <artifactId>pax-cdi-api</artifactId>
+      <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.genius</groupId>
@@ -68,11 +73,6 @@
       <artifactId>org.apache.karaf.shell.console</artifactId>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.genius</groupId>
-      <artifactId>interfacemanager-impl</artifactId>
-      <version>${genius.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>dhcpservice-api</artifactId>
@@ -93,11 +93,6 @@
       <artifactId>utils.southbound-utils</artifactId>
       <version>${ovsdb.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>utils.config</artifactId>
-      <version>${ovsdb.version}</version>
-    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>vpnmanager-api</artifactId>
@@ -118,6 +113,12 @@
       <type>test-jar</type>
     </dependency>
     <dependency>
+        <groupId>org.opendaylight.genius</groupId>
+        <artifactId>mdsalutil-impl</artifactId>
+        <version>${genius.version}</version>
+        <scope>test</scope>
+    </dependency>
+      <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>sal-binding-broker-impl</artifactId>
       <scope>test</scope>
@@ -140,6 +141,12 @@
       <version>${genius.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>interfacemanager-impl</artifactId>
+      <version>${genius.version}</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>inject.guice.testutils</artifactId>
@@ -158,6 +165,33 @@
       <version>${genius.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netvirt</groupId>
+      <artifactId>neutronvpn-impl</artifactId>
+      <version>${project.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.genius</groupId>
+      <artifactId>testutils</artifactId>
+      <version>${genius.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin-extension-nicira</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-service</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
+      <artifactId>model-flow-base</artifactId>
+      <version>${openflowplugin.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -168,7 +202,6 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Embed-Dependency>utils.config;type=!pom;inline=false</Embed-Dependency>
             <Embed-Transitive>true</Embed-Transitive>
             <!-- This bundle works with Karaf 3 and 4.0 -->
             <Import-Package>