Merge "Moving the InventoryListener out of AbstractServiceInstance and into a common...

[ovsdb.git] / openstack / net-virt-providers / pom.xml

diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml
index d37ec9f111bf76dc9aee2175d8ec6f477dbc710b..b49fa1be0935d0e2e96c90827a51f8fec3465b49 100644 (file)
--- a/openstack/net-virt-providers/pom.xml
+++ b/openstack/net-virt-providers/pom.xml
@@ -60,16 +60,16 @@
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>openstack.net-virt</artifactId>
         </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-extension-nicira</artifactId>
-      <version>${openflowplugin-nicira.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>of-extension.nx-sal</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
+        <dependency>
+          <groupId>org.opendaylight.ovsdb</groupId>
+          <artifactId>utils.mdsal-openflow</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+          <groupId>junit</groupId>
+          <artifactId>junit</artifactId>
+          <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 
@@ -90,6 +90,11 @@
                             org.opendaylight.controller.sal.action,
                             org.opendaylight.ovsdb.plugin.api,
                             org.opendaylight.ovsdb.lib.notation,
+                            org.opendaylight.ovs.nx.sal.*;resolution:="optional",
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.ovs.nx.*;resolution:="optional",
+                            org.opendaylight.openflowplugin.*;resolution:="optional",
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.openflowjava.nx.*;resolution:="optional",
+                            org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.*;resolution:="optional",
                             org.opendaylight.controller.sal.binding.api,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819,
                             org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes,
@@ -99,6 +104,8 @@
                             org.osgi.framework,
                             *
                         </Import-Package>
+                        <Embed-Dependency>utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
+                        <Embed-Transitive>true</Embed-Transitive>
                         <Bundle-Activator>org.opendaylight.ovsdb.openstack.netvirt.providers.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>