BUG-3593 : fixed error installing odl-bgpcep-bgp-all

Renamed dependencies feature to be unique in features list.

Change-Id: I217bb6a5ddf976e59900e62c3ce091a9e44aaca6
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>

diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index 5a7fe8b742f5e38aaabadbefeb805ba12cc6fd35..dabcb0216d6f5cb3609fd03679907d1e1ca4fd4f 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -28,7 +28,7 @@
         <configfile finalname="etc/opendaylight/karaf/41-bgp-example.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/${project.version}/xml/config-example</configfile>
     </feature>
 
-    <feature name='odl-bgpcep-dependencies' version='${project.version}'>
+    <feature name='odl-bgpcep-bgp-dependencies' version='${project.version}'>
         <!--  concepts -->
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
@@ -43,7 +43,7 @@
     </feature>
 
     <feature name='odl-bgpcep-bgp-inet' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-dependencies</feature>
         <feature version='${config.version}'>odl-config-api</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-rib-api/{{VERSION}}</bundle>
@@ -51,7 +51,7 @@
     </feature>
 
     <feature name='odl-bgpcep-bgp-parser' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-dependencies</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-inet</feature>
         <feature version='${config.version}'>odl-config-api</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/{{VERSION}}</bundle>
@@ -60,7 +60,7 @@
     </feature>
 
     <feature name='odl-bgpcep-bgp-rib' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
+        <feature version='${project.version}'>odl-bgpcep-bgp-dependencies</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-parser-api/{{VERSION}}</bundle>
         <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
         <feature version='${mdsal.version}'>odl-mdsal-broker</feature>

diff --git a/features/pcep/src/main/features/features.xml b/features/pcep/src/main/features/features.xml
index f0426a9389f0918d31c3d7dc5b9d72580683ecca..9793d40d2cb5246c60a706d5c0c277821004e1ec 100644 (file)
--- a/features/pcep/src/main/features/features.xml
+++ b/features/pcep/src/main/features/features.xml
@@ -30,7 +30,7 @@
         <feature version='${project.version}'>odl-bgpcep-programming-impl</feature>
     </feature>
 
-    <feature name='odl-bgpcep-dependencies' version='${project.version}'>
+    <feature name='odl-bgpcep-pcep-dependencies' version='${project.version}'>
         <!--  concepts -->
         <bundle>mvn:com.google.guava/guava/{{VERSION}}</bundle>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
@@ -43,7 +43,7 @@
     </feature>
 
     <feature name='odl-bgpcep-pcep' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-dependencies</feature>
         <bundle>mvn:org.opendaylight.bgpcep/rsvp-api/{{VERSION}}</bundle>
         <feature version='${tcpmd5.version}'>odl-tcpmd5-netty</feature>
         <feature version='${protocol-framework.version}'>odl-protocol-framework</feature>
@@ -60,7 +60,7 @@
     </feature>
 
     <feature name='odl-bgpcep-programming' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-dependencies</feature>
+        <feature version='${project.version}'>odl-bgpcep-pcep-dependencies</feature>
         <feature version='${config.version}'>odl-config-api</feature>
         <bundle>mvn:org.opendaylight.bgpcep/topology-api/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/topology-tunnel-api/{{VERSION}}</bundle>