홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
Committed by Gerrit Code Review
c9815e06 1 parent ab4c6ba1

Fix cord config app dependencies 

Change-Id: I29580a03e538339d1ddfca730b673eaa41f17e46
Inline Side-by-side
Showing 5 changed files with 3 additions and 51 deletions
1 -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 -<!--
3 - ~ Copyright 2016-present 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-olt-api/${project.version}</bundle>
22 - <bundle>mvn:${project.groupId}/onos-app-cord-mcast/${project.version}</bundle>
23 - <bundle>mvn:${project.groupId}/onos-cord-config/${project.version}</bundle>
24 - </feature>
25 -</features>
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
36 <onos.app.category>Traffic Steering</onos.app.category> 36 <onos.app.category>Traffic Steering</onos.app.category>
37 <onos.app.title>CORD Multicast App</onos.app.title> 37 <onos.app.title>CORD Multicast App</onos.app.title>
38 <onos.app.url>http://opencord.org</onos.app.url> 38 <onos.app.url>http://opencord.org</onos.app.url>
39 + <onos.app.requires>org.onosproject.cord-config</onos.app.requires>
39 </properties> 40 </properties>
40 41
41 <dependencies> 42 <dependencies>
......
1 -<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2 -<!--
3 - ~ Copyright 2016-present 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="onos-app-igmp" version="${project.version}"
19 - description="${project.description}">
20 - <feature>onos-api</feature>
21 - <bundle>mvn:${project.groupId}/onos-app-olt-api/${project.version}</bundle>
22 - <bundle>mvn:${project.groupId}/onos-app-igmp/${project.version}</bundle>
23 - <bundle>mvn:${project.groupId}/onos-cord-config/${project.version}</bundle>
24 - </feature>
25 -</features>
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
37 <onos.app.category>Traffic Steering</onos.app.category> 37 <onos.app.category>Traffic Steering</onos.app.category>
38 <onos.app.url>http://onosproject.org</onos.app.url> 38 <onos.app.url>http://onosproject.org</onos.app.url>
39 <onos.app.readme>IGMP implementation.</onos.app.readme> 39 <onos.app.readme>IGMP implementation.</onos.app.readme>
40 + <onos.app.requires>org.onosproject.cord-config</onos.app.requires>
40 </properties> 41 </properties>
41 42
42 <dependencies> 43 <dependencies>
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 <app name="org.onosproject.olt" origin="ON.Lab" version="${project.version}" 17 <app name="org.onosproject.olt" origin="ON.Lab" version="${project.version}"
18 category="Traffic Steering" url="http://onosproject.org" title="Optical Line Terminal App" 18 category="Traffic Steering" url="http://onosproject.org" title="Optical Line Terminal App"
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}" apps="org.onosproject.cord-config">
21 <description>${project.description}</description> 21 <description>${project.description}</description>
22 <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact> 22 <artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
23 <artifact>mvn:${project.groupId}/onos-app-olt-api/${project.version}</artifact> 23 <artifact>mvn:${project.groupId}/onos-app-olt-api/${project.version}</artifact>
......