commit 4d887e837262e5169ebe4b2f34306ec4e88c1e06
author Jonathan Hart <jono@onlab.us> Thu Jan 08 13:27:39 2015 -0800
committer Jonathan Hart <jono@onlab.us> Fri Jan 09 21:43:46 2015 +0000
tree 6213f7c8d2960313474a5a96fbdce36f5b6c5186
parent 081e737a4e4f3a64b0f170cba2b8d52335a00124

Moved onlab-rest bundle out of onos-api.

Having onlab-rest in onos-api creates a dependency issue because the
dependencies of onlab-rest are not included in onos-api. Usually people don't
see an issue because they also have another rest/web feature installed.

Fixes ONOS-505.

Change-Id: Ifd1526491eb526bb2d751d915fc97cceef5a64a9
(cherry picked from commit 449bd5bc62f5723f914efe8117f19190d1b9ff49)

features/features.xml

diff --git a/features/features.xml b/features/features.xml
index 7a159f4..a4dfd75 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -67,7 +67,6 @@
         <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
         <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
         <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
-
     </feature>
 
     <feature name="onos-api" version="@FEATURE-VERSION"
@@ -76,7 +75,6 @@
         <feature>onos-thirdparty-base</feature>
         <bundle>mvn:org.onosproject/onlab-misc/@ONOS-VERSION</bundle>
         <bundle>mvn:org.onosproject/onlab-osgi/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
 
         <bundle>mvn:org.onosproject/onos-api/@ONOS-VERSION</bundle>
     </feature>
@@ -101,6 +99,7 @@
              description="ONOS REST API components">
         <feature>onos-api</feature>
         <feature>onos-thirdparty-web</feature>
+        <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
         <bundle>mvn:org.onosproject/onos-rest/@ONOS-VERSION</bundle>
     </feature>
 
@@ -109,6 +108,7 @@
         <feature>onos-api</feature>
         <feature>onos-thirdparty-web</feature>
         <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.15.v20140411</bundle>
+        <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
         <bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle>
     </feature>
 
@@ -138,6 +138,7 @@
              description="ONOS sample topology viewer application">
         <feature>onos-api</feature>
         <feature>onos-thirdparty-web</feature>
+        <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
         <bundle>mvn:org.onosproject/onos-app-tvue/@ONOS-VERSION</bundle>
     </feature>
 
@@ -230,6 +231,4 @@
         <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
     </feature>
 
-
-
 </features>