홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
4d887e83 1 parent 081e737a

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 449bd5bc)
Inline Side-by-side
Showing 1 changed file with 3 additions and 4 deletions
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
67 <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle> 67 <bundle>mvn:com.sun.jersey/jersey-core/1.18.1</bundle>
68 <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle> 68 <bundle>mvn:com.sun.jersey/jersey-server/1.18.1</bundle>
69 <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle> 69 <bundle>mvn:com.sun.jersey/jersey-servlet/1.18.1</bundle>
70 -
71 </feature> 70 </feature>
72 71
73 <feature name="onos-api" version="@FEATURE-VERSION" 72 <feature name="onos-api" version="@FEATURE-VERSION"
...@@ -76,7 +75,6 @@ ...@@ -76,7 +75,6 @@
76 <feature>onos-thirdparty-base</feature> 75 <feature>onos-thirdparty-base</feature>
77 <bundle>mvn:org.onosproject/onlab-misc/@ONOS-VERSION</bundle> 76 <bundle>mvn:org.onosproject/onlab-misc/@ONOS-VERSION</bundle>
78 <bundle>mvn:org.onosproject/onlab-osgi/@ONOS-VERSION</bundle> 77 <bundle>mvn:org.onosproject/onlab-osgi/@ONOS-VERSION</bundle>
79 - <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
80 78
81 <bundle>mvn:org.onosproject/onos-api/@ONOS-VERSION</bundle> 79 <bundle>mvn:org.onosproject/onos-api/@ONOS-VERSION</bundle>
82 </feature> 80 </feature>
...@@ -101,6 +99,7 @@ ...@@ -101,6 +99,7 @@
101 description="ONOS REST API components"> 99 description="ONOS REST API components">
102 <feature>onos-api</feature> 100 <feature>onos-api</feature>
103 <feature>onos-thirdparty-web</feature> 101 <feature>onos-thirdparty-web</feature>
102 + <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
104 <bundle>mvn:org.onosproject/onos-rest/@ONOS-VERSION</bundle> 103 <bundle>mvn:org.onosproject/onos-rest/@ONOS-VERSION</bundle>
105 </feature> 104 </feature>
106 105
...@@ -109,6 +108,7 @@ ...@@ -109,6 +108,7 @@
109 <feature>onos-api</feature> 108 <feature>onos-api</feature>
110 <feature>onos-thirdparty-web</feature> 109 <feature>onos-thirdparty-web</feature>
111 <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.15.v20140411</bundle> 110 <bundle>mvn:org.eclipse.jetty/jetty-websocket/8.1.15.v20140411</bundle>
111 + <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
112 <bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle> 112 <bundle>mvn:org.onosproject/onos-gui/@ONOS-VERSION</bundle>
113 </feature> 113 </feature>
114 114
...@@ -138,6 +138,7 @@ ...@@ -138,6 +138,7 @@
138 description="ONOS sample topology viewer application"> 138 description="ONOS sample topology viewer application">
139 <feature>onos-api</feature> 139 <feature>onos-api</feature>
140 <feature>onos-thirdparty-web</feature> 140 <feature>onos-thirdparty-web</feature>
141 + <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
141 <bundle>mvn:org.onosproject/onos-app-tvue/@ONOS-VERSION</bundle> 142 <bundle>mvn:org.onosproject/onos-app-tvue/@ONOS-VERSION</bundle>
142 </feature> 143 </feature>
143 144
...@@ -230,6 +231,4 @@ ...@@ -230,6 +231,4 @@
230 <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle> 231 <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
231 </feature> 232 </feature>
232 233
233 -
234 -
235 </features> 234 </features>
......