From: Madhu Venugopal <mavenugo@gmail.com>
Date: Mon, 15 Sep 2014 17:44:15 +0000 (-0700)
Subject: Reording bundle dependencies in features.xml to solve Bug 1887
X-Git-Tag: release/helium~35
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=bd3e975a8047b86aad81870573b316c675ece4c4;p=ovsdb.git

Reording bundle dependencies in features.xml to solve Bug 1887

Change-Id: I475b9c486056d4eb8b80a8fd3be6406ad9f868e6
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
---

diff --git a/features/of-nxm-extensions/src/main/resources/features.xml b/features/of-nxm-extensions/src/main/resources/features.xml
index a7284de23..da203c925 100644
--- a/features/of-nxm-extensions/src/main/resources/features.xml
+++ b/features/of-nxm-extensions/src/main/resources/features.xml
@@ -3,17 +3,17 @@
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
 
     <feature name="odl-openflow-nxm-extensions" description="OpenDaylight :: Openflow :: Nicira Extensions" version='${openflowplugin.version}'>
-        <feature version="${openflowplugin.version}">odl-openflowplugin-southbound</feature>
-        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira/${openflowplugin.version}</bundle>
-        <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira-api/${openflowplugin.version}</bundle>
-        <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira/${openflowplugin.version}</bundle>
-        <bundle>mvn:org.opendaylight.ovsdb/of-extension.nx-ofjava/${ovsdb.nx.version}</bundle>
-        <bundle>mvn:org.opendaylight.ovsdb/of-extension.nx-sal/${ovsdb.nx.version}</bundle>
-        <configfile finalname="etc/opendaylight/karaf/44-openflowjava-nx-config.xml">mvn:org.opendaylight.ovsdb/of-extension.openflowjava-nx-config/${ovsdb.ofextension.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/43-openflowjava-nx-api-config.xml">mvn:org.opendaylight.ovsdb/of-extension.openflowjava-nx-api-config/${ovsdb.ofextension.version}/xml/config</configfile>
+        <configfile finalname="etc/opendaylight/karaf/44-openflowjava-nx-config.xml">mvn:org.opendaylight.ovsdb/of-extension.openflowjava-nx-config/${ovsdb.ofextension.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/44-nicira-extension.xml">mvn:org.opendaylight.ovsdb/of-extension.nicira-extension-config/${ovsdb.ofextension.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/50-ovs-nx-api-config.xml">mvn:org.opendaylight.ovsdb/of-extension.ovs-nx-api-config/${ovsdb.ofextension.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/51-ovs-nx-config.xml">mvn:org.opendaylight.ovsdb/of-extension.ovs-nx-config/${ovsdb.ofextension.version}/xml/config</configfile>
         <configfile finalname="etc/opendaylight/karaf/52-ovs-nx-sal-config.xml">mvn:org.opendaylight.ovsdb/of-extension.nx-sal-config/${ovsdb.ofextension.version}/xml/config</configfile>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira-api/${openflowplugin.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowjava-extension-nicira/${openflowplugin.version}</bundle>
+        <bundle>mvn:org.opendaylight.openflowplugin/openflowplugin-extension-nicira/${openflowplugin.version}</bundle>
+        <bundle>mvn:org.opendaylight.ovsdb/of-extension.nx-ofjava/${ovsdb.nx.version}</bundle>
+        <bundle>mvn:org.opendaylight.ovsdb/of-extension.nx-sal/${ovsdb.nx.version}</bundle>
+        <feature version="${openflowplugin.version}">odl-openflowplugin-southbound</feature>
     </feature>
 </features>