diff options
| author |   Patrick Brady <pb071s@att.com> | 2018-03-22 15:12:48 -0700 |
|---|---|---|
| committer | Patrick Brady <pb071s@att.com> | 2018-04-11 17:42:20 +0000 |
| commit | 5b81764739425ccb4a418947e1565a7f691f4204 (patch) | |
| tree | 245b7d69f2bc2c093c88bc9fb3c2c3757468e9c1 /appc-config/appc-config-params/features/src/main/resources/features.xml | |
| parent | abd3c649e4e50d9e1e995f81cb080e470eb02b48 (diff) | |
ODL Upgrade Method 2
Changes necessary to support upgrade to ODL Nitrogen,
while continuing to use Karaf 3 style features
Change-Id: I2edf619e0b889420c32793b958c0926b0311e71d
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue-ID: APPC-403
Diffstat (limited to 'appc-config/appc-config-params/features/src/main/resources/features.xml')
| -rw-r--r-- | appc-config/appc-config-params/features/src/main/resources/features.xml | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/appc-config/appc-config-params/features/src/main/resources/features.xml b/appc-config/appc-config-params/features/src/main/resources/features.xml index fbacf644b..ea6b2b67b 100644 --- a/appc-config/appc-config-params/features/src/main/resources/features.xml +++ b/appc-config/appc-config-params/features/src/main/resources/features.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APPC ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Copyright (C) 2017 Amdocs ============================================================================= @@ -19,7 +19,6 @@ See the License for the specific language governing permissions and limitations under the License. - ECOMP is a trademark and service mark of AT&T Intellectual Property. ============LICENSE_END========================================================= --> @@ -28,28 +27,20 @@ xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> - <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository> + <!--<repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>--> <feature name='appc-config-params' description="Application Controller Config Params" 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>sdnc-sli</feature> + <feature >odl-mdsal-broker</feature> + <feature>ccsdk-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> <bundle>mvn:commons-collections/commons-collections/${common.collections.version}</bundle> - <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> - <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> - <bundle>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle> - <bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/${jackson.version}</bundle> - <bundle>wrap:mvn:org.yaml/snakeyaml/${snakeyaml.version}</bundle> - <bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle> + <!-- <bundle>wrap:mvn:org.onap.appc/appc-yang-generator/${project.version}</bundle> --> <bundle>wrap:mvn:org.openecomp.sdc.common/openecomp-tosca-datatype/${tosca.datatype.version}</bundle> - <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> - <bundle>mvn:ch.qos.logback/logback-core/${logback.version}</bundle> - <bundle>mvn:ch.qos.logback/logback-classic/${logback.version}</bundle> <bundle>mvn:org.onap.appc/appc-config-params-provider/${project.version}</bundle> </feature> </features> |