Jian Li
Committed by Gerrit Code Review

Resolve openstacknetworking and openstackswitching dependency issue

Change-Id: If246d09af29cfa0379ee9666de2931a3175f46e9
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Copyright 2015 Open Networking Laboratory 3 + ~ Copyright 2015-2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
...@@ -17,12 +17,9 @@ ...@@ -17,12 +17,9 @@
17 <app name="org.onosproject.openstacknetworking" origin="ON.Lab" version="${project.version}" 17 <app name="org.onosproject.openstacknetworking" origin="ON.Lab" version="${project.version}"
18 category="default" url="http://onosproject.org" 18 category="default" url="http://onosproject.org"
19 featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features" 19 featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
20 - features="${project.artifactId}"> 20 + features="${project.artifactId}"
21 + apps="org.onosproject.openstackswitching,org.onosproject.openstackrouting">
21 <description>${project.description}</description> 22 <description>${project.description}</description>
22 <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</artifact> 23 <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</artifact>
23 <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version}</artifact> 24 <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version}</artifact>
24 - <artifact>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</artifact>
25 - <artifact>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</artifact>
26 - <artifact>mvn:${project.groupId}/onos-app-dhcp-api/${project.version}</artifact>
27 - <artifact>mvn:${project.groupId}/onos-app-dhcp/${project.version}</artifact>
28 </app> 25 </app>
......
1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?> 1 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 <!-- 2 <!--
3 - ~ Copyright 2015-16 Open Networking Laboratory 3 + ~ Copyright 2015-2016 Open Networking Laboratory
4 ~ 4 ~
5 ~ Licensed under the Apache License, Version 2.0 (the "License"); 5 ~ Licensed under the Apache License, Version 2.0 (the "License");
6 ~ you may not use this file except in compliance with the License. 6 ~ you may not use this file except in compliance with the License.
...@@ -20,10 +20,6 @@ ...@@ -20,10 +20,6 @@
20 <feature>onos-api</feature> 20 <feature>onos-api</feature>
21 <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</bundle> 21 <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</bundle>
22 <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version}</bundle> 22 <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version}</bundle>
23 - <bundle>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</bundle>
24 - <bundle>mvn:${project.groupId}/onos-app-dhcp-api/${project.version}</bundle>
25 - <bundle>mvn:${project.groupId}/onos-app-dhcp/${project.version}</bundle>
26 - <bundle>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</bundle>
27 <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle> 23 <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
28 </feature> 24 </feature>
29 </features> 25 </features>
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2016 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<app name="org.onosproject.openstackrouting" origin="ON.Lab" version="${project.version}"
18 + category="default" url="http://onosproject.org"
19 + featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
20 + features="${project.artifactId}" >
21 + <description>${project.description}</description>
22 + <artifact>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</artifact>
23 + <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</artifact>
24 +</app>
1 +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 +<!--
3 + ~ Copyright 2016 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 + <feature name="${project.artifactId}" version="${project.version}"
19 + description="${project.description}">
20 + <feature>onos-api</feature>
21 + <bundle>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</bundle>
22 + <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</bundle>
23 + </feature>
24 +</features>
...@@ -49,6 +49,5 @@ ...@@ -49,6 +49,5 @@
49 <version>${project.version}</version> 49 <version>${project.version}</version>
50 </dependency> 50 </dependency>
51 </dependencies> 51 </dependencies>
52 -
53 </project> 52 </project>
54 53
......
1 +<?xml version="1.0" encoding="UTF-8"?>
2 +<!--
3 + ~ Copyright 2016 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<app name="org.onosproject.openstackswitching" origin="ON.Lab" version="${project.version}"
18 + category="default" url="http://onosproject.org"
19 + featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
20 + features="${project.artifactId}"
21 + apps="org.onosproject.dhcp">
22 + <description>${project.description}</description>
23 + <artifact>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</artifact>
24 + <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</artifact>
25 +</app>
1 +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 +<!--
3 + ~ Copyright 2016 Open Networking Laboratory
4 + ~
5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
8 + ~
9 + ~ http://www.apache.org/licenses/LICENSE-2.0
10 + ~
11 + ~ Unless required by applicable law or agreed to in writing, software
12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
16 + -->
17 +<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
18 + <feature name="${project.artifactId}" version="${project.version}"
19 + description="${project.description}">
20 + <feature>onos-api</feature>
21 + <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</bundle>
22 + <bundle>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</bundle>
23 + </feature>
24 +</features>
...@@ -38,12 +38,12 @@ ...@@ -38,12 +38,12 @@
38 <dependency> 38 <dependency>
39 <groupId>org.onosproject</groupId> 39 <groupId>org.onosproject</groupId>
40 <artifactId>onos-app-dhcp</artifactId> 40 <artifactId>onos-app-dhcp</artifactId>
41 - <version>1.5.0-SNAPSHOT</version> 41 + <version>${project.version}</version>
42 </dependency> 42 </dependency>
43 <dependency> 43 <dependency>
44 <groupId>org.onosproject</groupId> 44 <groupId>org.onosproject</groupId>
45 <artifactId>onos-app-dhcp-api</artifactId> 45 <artifactId>onos-app-dhcp-api</artifactId>
46 - <version>1.5.0-SNAPSHOT</version> 46 + <version>${project.version}</version>
47 </dependency> 47 </dependency>
48 <dependency> 48 <dependency>
49 <groupId>org.onosproject</groupId> 49 <groupId>org.onosproject</groupId>
...@@ -61,6 +61,4 @@ ...@@ -61,6 +61,4 @@
61 <version>${project.version}</version> 61 <version>${project.version}</version>
62 </dependency> 62 </dependency>
63 </dependencies> 63 </dependencies>
64 -
65 -
66 </project> 64 </project>
......
...@@ -37,9 +37,5 @@ ...@@ -37,9 +37,5 @@
37 <module>openstackrouting</module> 37 <module>openstackrouting</module>
38 </modules> 38 </modules>
39 39
40 - 40 + <description>SONA Openstack Networking Application</description>
41 - <description>SONA Openstack Networking XXXX Application</description>
42 -
43 - <dependencies>
44 - </dependencies>
45 </project> 41 </project>
......