Merge of new rebased code

[appc.git] / appc-dg / appc-dg-shared / appc-dg-shared-features / src / main / resources / features.xml

diff --git a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
index 3271f7a..c8925fe 100644 (file)
--- a/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
+++ b/appc-dg/appc-dg-shared/appc-dg-shared-features/src/main/resources/features.xml
@@ -29,7 +29,9 @@
        <feature name='appc-dg-shared' description="appc-dg-shared" version='${project.version}'>
                <feature version='${project.version}'>appc-ssh-adapter</feature>
                <feature version='${project.version}'>appc-netconf-adapter</feature>
-               <bundle>mvn:org.openecomp.appc/appc-dg-common/${project.version}</bundle>
+               <feature version='${sdnctl.sli.version}'>sdnc-sli</feature>
+        <bundle dependency="true">mvn:org.openecomp.appc/appc-common/${project.version}</bundle>
+        <bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-common/${project.version}</bundle>
                <bundle>mvn:org.openecomp.appc/appc-dg-ssh/${project.version}</bundle>
                <bundle start-level="85" start="true">mvn:org.openecomp.appc/appc-dg-netconf/${project.version}</bundle>
                <bundle>mvn:org.openecomp.appc/appc-dg-license-manager/${project.version}</bundle>