diff options
Diffstat (limited to 'appc-config/appc-config-generator/features')
| -rw-r--r-- | appc-config/appc-config-generator/features/pom.xml | 15 | ||||
| -rw-r--r-- | appc-config/appc-config-generator/features/src/main/resources/features.xml | 20 |
2 files changed, 4 insertions, 31 deletions
diff --git a/appc-config/appc-config-generator/features/pom.xml b/appc-config/appc-config-generator/features/pom.xml index 8dfd5aab1..afcdd3355 100644 --- a/appc-config/appc-config-generator/features/pom.xml +++ b/appc-config/appc-config-generator/features/pom.xml @@ -18,7 +18,6 @@ See the License for the specific language governing permissions and limitations under the License. ============LICENSE_END========================================================= - ECOMP is a trademark and service mark of AT&T Intellectual Property. --> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -59,22 +58,8 @@ </dependency> - <!-- dependency for opendaylight-karaf-empty for use by testing --> - <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>opendaylight-karaf-empty</artifactId> - <version>${odl.karaf.empty.distro.version}</version> - <type>zip</type> - </dependency> - <dependency> - <!-- Required for launching the feature tests --> - <groupId>org.opendaylight.odlparent</groupId> - <artifactId>features-test</artifactId> - <version>${odl.commons.opendaylight.version}</version> - <scope>test</scope> - </dependency> </dependencies> diff --git a/appc-config/appc-config-generator/features/src/main/resources/features.xml b/appc-config/appc-config-generator/features/src/main/resources/features.xml index a039b5081..5840fcc10 100644 --- a/appc-config/appc-config-generator/features/src/main/resources/features.xml +++ b/appc-config/appc-config-generator/features/src/main/resources/features.xml @@ -3,7 +3,7 @@ ============LICENSE_START======================================================= ONAP : APP-C ================================================================================ - Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. ================================================================================ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -24,26 +24,14 @@ 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-generator' description="Application Controller Config Generator" 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> - - <bundle>wrap:mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle> + <feature >odl-mdsal-broker</feature> + <feature>ccsdk-sli</feature> <bundle>mvn:commons-lang/commons-lang/2.6</bundle> - <bundle>wrap:mvn:commons-io/commons-io/${common.io.version}</bundle> - <bundle>wrap:mvn:org.apache.velocity/velocity/${velocity.version}</bundle> - <bundle>wrap:mvn:commons-collections/commons-collections/${common.collections.version}</bundle> - <bundle>wrap:mvn:com.att.eelf/eelf-core/${eelf.version}</bundle> - <!-- bundle>wrap:mvn:com.fasterxml.jackson.dataformat/jackson-dataformat-properties/${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.core/jackson-databind/${jackson.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-generator-provider/${project.version}</bundle> </feature> </features> |