reorder feature install for netvirtsfc

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

diff --git a/openstack/net-virt-sfc/features/production/pom.xml b/openstack/net-virt-sfc/features/production/pom.xml
index 5067bdb98d71d5d3ce2cc49a5eaeb0fdaf4310eb..2ca5e83efec9ea5603e2440f6f4c6fe17e3437d3 100644 (file)
--- a/openstack/net-virt-sfc/features/production/pom.xml
+++ b/openstack/net-virt-sfc/features/production/pom.xml
@@ -28,6 +28,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <dlux.version>0.4.0-SNAPSHOT</dlux.version>
     <mdsal.model.version>0.9.0-SNAPSHOT</mdsal.model.version>
     <controller.mdsal.version>1.4.0-SNAPSHOT</controller.mdsal.version>
+    <neutron.version>0.7.0-SNAPSHOT</neutron.version>
     <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
     <restconf.version>1.4.0-SNAPSHOT</restconf.version>
     <sfc.version>0.3.0-SNAPSHOT</sfc.version>
@@ -36,6 +37,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <dependencyManagement>
     <dependencies>
       <!-- project specific dependencies -->
+      <dependency>
+        <groupId>org.opendaylight.yangtools</groupId>
+        <artifactId>yangtools-artifacts</artifactId>
+        <version>${yangtools.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>mdsal-artifacts</artifactId>
@@ -69,18 +77,16 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal.model</groupId>
-      <artifactId>features-mdsal-model</artifactId>
-      <version>${mdsal.model.version}</version>
-      <classifier>features</classifier>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
       <type>xml</type>
-      <scope>runtime</scope>
+      <classifier>features</classifier>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
+      <groupId>org.opendaylight.mdsal.model</groupId>
+      <artifactId>features-mdsal-model</artifactId>
+      <version>${mdsal.model.version}</version>
       <classifier>features</classifier>
-      <version>${controller.mdsal.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>

diff --git a/openstack/net-virt-sfc/features/production/src/main/features/features.xml b/openstack/net-virt-sfc/features/production/src/main/features/features.xml
index 60880931c8852a024afa5e8f55f1b6ac6d304b45..529633a1fa13380b33d7fe74490ef7bfca83cc54 100644 (file)
--- a/openstack/net-virt-sfc/features/production/src/main/features/features.xml
+++ b/openstack/net-virt-sfc/features/production/src/main/features/features.xml
@@ -27,16 +27,18 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <feature name='odl-ovsdb-sfc' version='${project.version}' description='OpenDaylight :: ovsdb-sfc'>
     <feature version='${controller.mdsal.version}'>odl-mdsal-broker</feature>
     <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-model</feature>
-    <feature version="${openflowplugin.version}">odl-openflowplugin-flow-services</feature>
-    <feature version='${openflowplugin.version}'>odl-openflowplugin-nxm-extensions</feature>
-    <feature version='${project.version}'>odl-ovsdb-southbound-impl</feature>
+    <!--<feature version="${neutron.version}">odl-neutron-service</feature>-->
+    <feature version="${project.version}">odl-ovsdb-southbound-impl-ui</feature>
+    <feature version="${openflowplugin.version}">odl-openflowplugin-southbound</feature>
+    <feature version="${openflowplugin.version}">odl-openflowplugin-nsf-services</feature>
+    <feature version="${openflowplugin.version}">odl-openflowplugin-nxm-extensions</feature>
     <feature version='${project.version}'>odl-ovsdb-openstack</feature>
     <feature version='${sfc.version}'>odl-sfc-provider</feature>
     <feature version='${sfc.version}'>odl-sfcofl2</feature>
     <feature version='${project.version}'>odl-ovsdb-sfc-api</feature>
+    <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.mdsal-utils/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/utils.southbound-utils/{{VERSION}}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/{{VERSION}}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-impl/{{VERSION}}</bundle>
     <configfile finalname="${configfile.directory}/openstack.net-virt-sfc.xml">mvn:org.opendaylight.ovsdb/openstack.net-virt-sfc-impl/{{VERSION}}/xml/config</configfile>
   </feature>