Fix cord config app dependencies
Change-Id: I29580a03e538339d1ddfca730b673eaa41f17e46
diff --git a/apps/cordmcast/features.xml b/apps/cordmcast/features.xml
deleted file mode 100644
index a6aab98..0000000
--- a/apps/cordmcast/features.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- ~ Copyright 2016-present Open Networking Laboratory
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
- <feature name="${project.artifactId}" version="${project.version}"
- description="${project.description}">
- <feature>onos-api</feature>
- <bundle>mvn:${project.groupId}/onos-app-olt-api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-app-cord-mcast/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-cord-config/${project.version}</bundle>
- </feature>
-</features>
diff --git a/apps/cordmcast/pom.xml b/apps/cordmcast/pom.xml
index d39489c..0d94597 100644
--- a/apps/cordmcast/pom.xml
+++ b/apps/cordmcast/pom.xml
@@ -36,6 +36,7 @@
<onos.app.category>Traffic Steering</onos.app.category>
<onos.app.title>CORD Multicast App</onos.app.title>
<onos.app.url>http://opencord.org</onos.app.url>
+ <onos.app.requires>org.onosproject.cord-config</onos.app.requires>
</properties>
<dependencies>
diff --git a/apps/igmp/features.xml b/apps/igmp/features.xml
deleted file mode 100644
index 47e878f..0000000
--- a/apps/igmp/features.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
- ~ Copyright 2016-present Open Networking Laboratory
- ~
- ~ Licensed under the Apache License, Version 2.0 (the "License");
- ~ you may not use this file except in compliance with the License.
- ~ You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
- <feature name="onos-app-igmp" version="${project.version}"
- description="${project.description}">
- <feature>onos-api</feature>
- <bundle>mvn:${project.groupId}/onos-app-olt-api/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-app-igmp/${project.version}</bundle>
- <bundle>mvn:${project.groupId}/onos-cord-config/${project.version}</bundle>
- </feature>
-</features>
diff --git a/apps/igmp/pom.xml b/apps/igmp/pom.xml
index 2451a52..5f26275 100644
--- a/apps/igmp/pom.xml
+++ b/apps/igmp/pom.xml
@@ -37,6 +37,7 @@
<onos.app.category>Traffic Steering</onos.app.category>
<onos.app.url>http://onosproject.org</onos.app.url>
<onos.app.readme>IGMP implementation.</onos.app.readme>
+ <onos.app.requires>org.onosproject.cord-config</onos.app.requires>
</properties>
<dependencies>
diff --git a/apps/olt/app/app.xml b/apps/olt/app/app.xml
index ac9b562..5fcb040 100644
--- a/apps/olt/app/app.xml
+++ b/apps/olt/app/app.xml
@@ -17,7 +17,7 @@
<app name="org.onosproject.olt" origin="ON.Lab" version="${project.version}"
category="Traffic Steering" url="http://onosproject.org" title="Optical Line Terminal App"
featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
- features="${project.artifactId}">
+ features="${project.artifactId}" apps="org.onosproject.cord-config">
<description>${project.description}</description>
<artifact>mvn:${project.groupId}/${project.artifactId}/${project.version}</artifact>
<artifact>mvn:${project.groupId}/onos-app-olt-api/${project.version}</artifact>