commit 79c4f1b492b438789854b35201ea9b2231251367
author Jian Li <pyguni@gmail.com> Tue Jan 26 14:38:22 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Fri Jan 29 21:19:41 2016 +0000
tree dddaea69b287cecb10be79e9a3a2f8964b0e6be6
parent 0c7c43b1366e237708ce0484bf06612eec3df560

Fix openstackswitching app activation issue

Change-Id: I61baf008bfbde4fab23dc2ae6b1cb05bb4017a5b

apps/openstackswitching/app/features.xml

diff --git a/apps/openstackswitching/app/features.xml b/apps/openstackswitching/app/features.xml
index a13c2aa..1a9c9a4 100644
--- a/apps/openstackswitching/app/features.xml
+++ b/apps/openstackswitching/app/features.xml
@@ -18,10 +18,10 @@
     <feature name="${project.artifactId}" version="${project.version}"
              description="${project.description}">
         <feature>onos-api</feature>
+        <bundle>mvn:${project.groupId}/onos-app-openstackswitching-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-app-dhcp-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-app-dhcp/${project.version}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
-        <bundle>mvn:${project.groupId}/${project.artifactId}/${project.version}</bundle>
     </feature>
 </features>

apps/openstackswitching/app/pom.xml

diff --git a/apps/openstackswitching/app/pom.xml b/apps/openstackswitching/app/pom.xml
index d0c04a4..fadcec4 100644
--- a/apps/openstackswitching/app/pom.xml
+++ b/apps/openstackswitching/app/pom.xml
@@ -39,9 +39,6 @@
         </api.description>
         <api.package>org.onosproject.openstackswitching.web</api.package>
         <onos.app.origin>SKT, Inc.</onos.app.origin>
-        <onos.app.requires>
-            org.onosproject.dhcp
-        </onos.app.requires>
     </properties>