Fix odl-netconf-ssh single feature test

Add dependency on odl-netconf-tcp and odl-netconf-util modules so we
will see their features repositories generated in odl-netconf-ssh
feature.xml file.

Also set dependency="true" atribute for both dependency features when
overriding generated feature.xml file.

Change-Id: I290f63d36961c1eb9cac06d48dfeb2bfee4dace4
Signed-off-by: Jakub Morvay <jmorvay@cisco.com>
(cherry picked from commit 855980926d53f158e8d3e76eb0fbe9e13661fb43)

diff --git a/features/netconf/odl-netconf-ssh/pom.xml b/features/netconf/odl-netconf-ssh/pom.xml
index 93b3f7c64139c698d445419c04b4ae7d24a43d86..c0fff3f47008f035dde714a9a031fc815c12be5b 100644 (file)
--- a/features/netconf/odl-netconf-ssh/pom.xml
+++ b/features/netconf/odl-netconf-ssh/pom.xml
@@ -26,7 +26,6 @@
     <name>OpenDaylight :: Netconf Connector :: SSH</name>
 
     <dependencies>
-        <!-- These are pulled in via feature.xml directly for now (until we can configure prerequisites here
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-netconf-util</artifactId>
@@ -41,7 +40,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-aaa-netconf-plugin</artifactId>

diff --git a/features/netconf/odl-netconf-ssh/src/main/feature/feature.xml b/features/netconf/odl-netconf-ssh/src/main/feature/feature.xml
index 52637357d7d935e5cd5ecdc74cf82ef2a4037856..dacf429b7a89bc1e9006305b567f3f506a7915d4 100644 (file)
--- a/features/netconf/odl-netconf-ssh/src/main/feature/feature.xml
+++ b/features/netconf/odl-netconf-ssh/src/main/feature/feature.xml
@@ -8,7 +8,7 @@
  -->
 <features name="odl-netconf-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
     <feature name="odl-netconf-ssh" version="${project.version}">
-        <feature version="${project.version}" prerequisite="true">odl-netconf-tcp</feature>
-        <feature version="${project.version}" prerequisite="true">odl-netconf-util</feature>
+        <feature version="${project.version}" dependency="true" prerequisite="true">odl-netconf-tcp</feature>
+        <feature version="${project.version}" dependency="true" prerequisite="true">odl-netconf-util</feature>
     </feature>
 </features>