diff options
Diffstat (limited to 'aai-service')
| -rw-r--r-- | aai-service/features/src/main/resources/features.xml | 46 | ||||
| -rwxr-xr-x | aai-service/provider/pom.xml | 6 |
2 files changed, 3 insertions, 49 deletions
diff --git a/aai-service/features/src/main/resources/features.xml b/aai-service/features/src/main/resources/features.xml deleted file mode 100644 index 97d352124..000000000 --- a/aai-service/features/src/main/resources/features.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ============LICENSE_START======================================================= - openECOMP : SDN-C - ================================================================================ - Copyright (C) 2017 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. - You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - ============LICENSE_END========================================================= - --> - - -<features name="sdnc-aai-service-${project.version}" 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> - - <feature name='sdnc-aai-service' description="sdnc-aai-service" 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>mvn:org.onap.ccsdk.sli.adaptors/aai-service-provider/${project.version}</bundle> - <bundle>mvn:com.sun.jersey/jersey-client/${jersey.client.version}</bundle> - <bundle>mvn:com.sun.jersey/jersey-core/${jersey.version}</bundle> - <bundle>mvn:org.apache.httpcomponents/httpcore-osgi/${apache.httpcomponents.core.version}</bundle> - <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${apache.httpcomponents.client.version}</bundle> - <bundle>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle> - <bundle>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle> - <bundle>mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle> - <bundle>mvn:commons-lang/commons-lang/${commons.lang.version}</bundle> - <bundle>mvn:com.fasterxml.jackson.module/jackson-module-jaxb-annotations/${jackson.version}</bundle> - <!-- - <bundle>mvn:org.jvnet.jaxb2_commons/jaxb2-basics-runtime/${jvnet.jaxb2.version}</bundle> - --> - </feature> -</features> diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml index 46cd8db81..bbd759f49 100755 --- a/aai-service/provider/pom.xml +++ b/aai-service/provider/pom.xml @@ -15,7 +15,6 @@ <packaging>bundle</packaging> <name>ccsdk-sli-adaptors :: aai-service :: ${project.artifactId}</name> - <url>http://maven.apache.org</url> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> @@ -48,17 +47,18 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>utils-provider</artifactId> <version>${ccsdk.sli.core.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> |