X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=commons%2Fparent%2Fpom.xml;h=3fa43dc7b6a10182ce09f5f737487da2b6954d11;hb=92cd80f059267e21c4159f4d442749ac8a0cb4b2;hp=a3b3b7afdc9547231be0a0df982968571666160c;hpb=00d470a7c68a15769369f5b4231f8574612f0773;p=netvirt.git

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index a3b3b7afdc..3fa43dc7b6 100755
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -30,18 +30,19 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <properties>
     <checkstyle.rules.version>0.1.0-SNAPSHOT</checkstyle.rules.version>
     <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
-    <!-- ODL repository / plugin repository -->
-    <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <!-- Surefire/Failsafe Arguments -->
     <argLine>-Xmx1024m -XX:MaxPermSize=256m</argLine>
     <!-- OVSDB Component Versions -->
     <openstack.netvirt.version>1.1.0-SNAPSHOT</openstack.netvirt.version>
     <openstack.netvirt.providers.version>1.1.0-SNAPSHOT</openstack.netvirt.providers.version>
+    <ovsdb.features.version>1.1.0-SNAPSHOT</ovsdb.features.version>
     <ovsdb.library.version>1.1.0-SNAPSHOT</ovsdb.library.version>
     <ovsdb.northbound.version>0.7.0-SNAPSHOT</ovsdb.northbound.version>
     <ovsdb.plugin.version>1.1.0-SNAPSHOT</ovsdb.plugin.version>
+    <ovsdb.plugin.compatibility.layer.version>1.1.0-SNAPSHOT</ovsdb.plugin.compatibility.layer.version>
     <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
     <ovsdb.utils.config.version>1.1.0-SNAPSHOT</ovsdb.utils.config.version>
+    <ovsdb.utils.servicehelper.version>1.1.0-SNAPSHOT</ovsdb.utils.servicehelper.version>
     <plugin.shell.version>1.1.0-SNAPSHOT</plugin.shell.version>
     <schema.hardwarevtep.version>1.1.0-SNAPSHOT</schema.hardwarevtep.version>
     <schema.openvswitch.version>1.1.0-SNAPSHOT</schema.openvswitch.version>
@@ -68,6 +69,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <northbound.commons.version>0.5.0-SNAPSHOT</northbound.commons.version>
     <nsf.version>0.5.0-SNAPSHOT</nsf.version>
     <odl.karaf.base.version>1.5.0-SNAPSHOT</odl.karaf.base.version>
+    <odlparent.version>1.5.0-SNAPSHOT</odlparent.version>
     <opendaylight-l2-types.version>2013.08.27.7-SNAPSHOT</opendaylight-l2-types.version>
     <openflowjava-nicira.version>0.1.0-SNAPSHOT</openflowjava-nicira.version>
     <openflowjava-extension.version>0.1.0-SNAPSHOT</openflowjava-extension.version>
@@ -132,8 +134,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <version>${forwardingrulesmanager.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>networkconfig.neutron</artifactId>
+        <groupId>org.opendaylight.neutron</groupId>
+        <artifactId>neutron-spi</artifactId>
         <version>${networkconfig.neutron.version}</version>
       </dependency>
       <dependency>
@@ -173,25 +175,31 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <version>${switchmanager.api.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller.model</groupId>
+        <groupId>org.opendaylight.openflowplugin.model</groupId>
         <artifactId>model-flow-base</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${openflowplugin.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller.model</groupId>
+        <groupId>org.opendaylight.openflowplugin.model</groupId>
         <artifactId>model-flow-service</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${openflowplugin.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller.model</groupId>
+        <groupId>org.opendaylight.openflowplugin.model</groupId>
         <artifactId>model-flow-statistics</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${openflowplugin.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller.model</groupId>
         <artifactId>model-inventory</artifactId>
         <version>${mdsal.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>features-test</artifactId>
+        <version>${odlparent.version}</version>
+        <scope>test</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools</groupId>
         <artifactId>concepts</artifactId>
@@ -207,12 +215,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>yang-common</artifactId>
         <version>${yangtools.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.yangtools</groupId>
-        <artifactId>features-test</artifactId>
-        <version>${yangtools.version}</version>
-        <scope>test</scope>
-      </dependency>
       <dependency>
         <groupId>org.opendaylight.yangtools.model</groupId>
         <artifactId>ietf-inet-types</artifactId>
@@ -288,6 +290,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>openflowplugin-extension-nicira-config</artifactId>
         <version>${openflowplugin.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>features-ovsdb</artifactId>
+        <version>${ovsdb.features.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>library</artifactId>
@@ -308,6 +315,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>openstack.net-virt-providers</artifactId>
         <version>${openstack.netvirt.providers.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>ovsdb-plugin-compatibility-layer</artifactId>
+        <version>${ovsdb.plugin.compatibility.layer.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>plugin</artifactId>
@@ -316,7 +328,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
         <artifactId>plugin-mdsal-adapter</artifactId>
-        <version>${ovsdb.plugin.version}</version>
+        <version>${ovsdb.plugin.adapter.version}</version>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.ovsdb</groupId>
@@ -343,6 +355,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>utils.mdsal-openflow</artifactId>
         <version>${utils.mdsal.openflow.version}</version>
       </dependency>
+      <dependency>
+        <groupId>org.opendaylight.ovsdb</groupId>
+        <artifactId>utils.servicehelper</artifactId>
+        <version>${ovsdb.utils.servicehelper.version}</version>
+      </dependency>
       <dependency>
         <groupId>org.powermock</groupId>
         <artifactId>powermock-module-junit4</artifactId>