diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-09-22 19:44:47 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-22 19:44:47 +0000 |
| commit | 15cfb74776aafab9319a859f8b7cce9de23df209 (patch) | |
| tree | 75cd7897e8ad6133dbafefa58e90a2d57a4a7948 | |
| parent | b723f7258b8d067a5fa7039d8d8645d68b96a39c (diff) | |
| parent | 47815667f9f553d06a020fd0379fc109ee7c9b3a (diff) | |
Merge "Remove sdnc-sli version dependency"
| -rw-r--r-- | generic-resource-api/features/src/main/resources/features.xml | 2 | ||||
| -rw-r--r-- | vnfapi/features/src/main/resources/features.xml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic-resource-api/features/src/main/resources/features.xml b/generic-resource-api/features/src/main/resources/features.xml index ac7a1d06..ccf60324 100644 --- a/generic-resource-api/features/src/main/resources/features.xml +++ b/generic-resource-api/features/src/main/resources/features.xml @@ -6,7 +6,7 @@ <feature name='GENERIC-RESOURCE-API' description="generic-resource-api.GENERIC-RESOURCE-API" version='${project.version}'> <feature version="${odl.controller.mdsal.version}">odl-mdsal-broker</feature> - <feature version="${sdnctl.sli.version}">sdnc-sli</feature> + <feature>sdnc-sli</feature> <!-- It is assumed that applications are installed on BVC, which installs bvc-core including MD-SAL etc. Do not list those features out here as that will tie your implementation to a specific version of MD-SAL / BVC and force updates to your application for every upgrade of BVC core platform.--> diff --git a/vnfapi/features/src/main/resources/features.xml b/vnfapi/features/src/main/resources/features.xml index 5ea07002..3da86e07 100644 --- a/vnfapi/features/src/main/resources/features.xml +++ b/vnfapi/features/src/main/resources/features.xml @@ -30,7 +30,7 @@ <feature name='sdnc-vnfapi' description="sdnc-vnfapi" version='${project.version}'> <!-- Most applications will have a dependency on the ODL MD-SAL Broker --> <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature> - <feature version="${sdnctl.sli.version}">sdnc-sli</feature> + <feature>sdnc-sli</feature> <bundle>mvn:org.onap.sdnc.northbound/vnfapi-model/${project.version}</bundle> <bundle>mvn:org.onap.sdnc.northbound/vnfapi-provider/${project.version}</bundle> <configfile finalname="etc/opendaylight/karaf/200-vnfapi-provider.xml">mvn:org.openecomp.sdnc.northbound/vnfapi-provider/${project.version}/xml/config</configfile> |