Move to use flow models from openflowplugin

Change-Id: I7328d44e05cee345e41229b0999c6651de09d83f
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 28087626b1585c5b7f422c3d797851e8447fb0b3..6bb2dee9dac86f466eca666b254eb9c5bda06b74 100755 (executable)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -39,7 +39,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <openstack.netvirt.providers.version>1.1.0-SNAPSHOT</openstack.netvirt.providers.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.version>1.1.1-SNAPSHOT</ovsdb.plugin.version>
     <ovsdb.plugin.adapter.version>1.1.0-SNAPSHOT</ovsdb.plugin.adapter.version>
     <ovsdb.ovssfc.version>0.1.0-SNAPSHOT</ovsdb.ovssfc.version>
     <ovsdb.utils.config.version>1.1.0-SNAPSHOT</ovsdb.utils.config.version>
@@ -175,19 +175,19 @@ 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>

diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml
index 94db57b9a17f27ec05d264e5fd7de625d3294e47..1587eb9252e021bd955d66ae370168a926e123d0 100644 (file)
--- a/openstack/net-virt-providers/pom.xml
+++ b/openstack/net-virt-providers/pom.xml
@@ -51,11 +51,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>sal-binding-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
     </dependency>
     <dependency>

diff --git a/ovs-sfc/pom.xml b/ovs-sfc/pom.xml
index 60a3e008b226922593f4c87981107fb8d32b8d42..37982ce082700672144e7f9b11441f6675700819 100644 (file)
--- a/ovs-sfc/pom.xml
+++ b/ovs-sfc/pom.xml
@@ -67,11 +67,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>sal-common-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-base</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
     </dependency>
     <dependency>

diff --git a/plugin-mdsal-adapter/pom.xml b/plugin-mdsal-adapter/pom.xml
index c17b035e94117d2e8178a0cca10ff51630328dd1..92eb87d85c0f152f187cfe1909816ddaf1027601 100644 (file)
--- a/plugin-mdsal-adapter/pom.xml
+++ b/plugin-mdsal-adapter/pom.xml
@@ -61,7 +61,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>model-inventory</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-service</artifactId>
     </dependency>
     <dependency>

diff --git a/utils/mdsal-openflow/pom.xml b/utils/mdsal-openflow/pom.xml
index 29a4dcba9a7f313bd66028af96e255df46b9930e..05607cb3f070d54352015eb764a42efecbf44b0e 100644 (file)
--- a/utils/mdsal-openflow/pom.xml
+++ b/utils/mdsal-openflow/pom.xml
@@ -34,7 +34,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>model-inventory</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller.model</groupId>
+      <groupId>org.opendaylight.openflowplugin.model</groupId>
       <artifactId>model-flow-base</artifactId>
     </dependency>
     <dependency>