diff options
| author |   Smokowski, Kevin (ks6305) <kevin.smokowski@att.com> | 2019-05-29 21:25:31 +0000 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2019-06-25 18:48:34 +0000 |
| commit | bc136f3650f150b96e8940c5d6cf321376338510 (patch) | |
| tree | 041a3f18767f289c44e039120a0af2f7912bd852 /restapi-call-node | |
| parent | 743cf1a6bb13e952c0e36ac8fd7b39371c643a4d (diff) | |
feature file cleanup
instead of each feature file starting ccsdk-sli let it be handled by bootfeatures
Change-Id: Ie7f20c8861bf329471c6317ede8128a9c420a9f8
Issue-ID: CCSDK-1370
Signed-off-by: Smokowski, Kevin (ks6305) <kevin.smokowski@att.com>
Diffstat (limited to 'restapi-call-node')
| -rw-r--r-- | restapi-call-node/features/ccsdk-restapi-call-node/pom.xml | 8 | ||||
| -rw-r--r-- | restapi-call-node/features/src/main/resources/features.xml | 42 | ||||
| -rwxr-xr-x | restapi-call-node/provider/pom.xml | 5 |
3 files changed, 2 insertions, 53 deletions
diff --git a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml index 7062d6102..09657337c 100644 --- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml +++ b/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml @@ -22,13 +22,7 @@ <groupId>javax.ws.rs</groupId> <artifactId>javax.ws.rs-api</artifactId> </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>ccsdk-sli</artifactId> - <version>${ccsdk.sli.core.version}</version> - <type>xml</type> - <classifier>features</classifier> - </dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>restapi-call-node-provider</artifactId> diff --git a/restapi-call-node/features/src/main/resources/features.xml b/restapi-call-node/features/src/main/resources/features.xml deleted file mode 100644 index 3734a951a..000000000 --- a/restapi-call-node/features/src/main/resources/features.xml +++ /dev/null @@ -1,42 +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-restapi-call-node-${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-restapi-call-node' description="sdnc-restapi-call-node" - version='${project.version}'> - <feature>sdnc-sli</feature> - <feature>spring</feature> - <feature>spring-dm</feature> - <bundle>mvn:com.sun.jersey/jersey-client/${jersey.version}</bundle> - <bundle>mvn:com.sun.jersey.contribs.jersey-oauth/oauth-signature/${jersey.version}</bundle> - <bundle>mvn:com.sun.jersey.contribs.jersey-oauth/oauth-client/${jersey.version}</bundle> - <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle> - <bundle>mvn:org.onap.ccsdk.sli.plugins/restapi-call-node-provider/${project.version}</bundle> - </feature> - -</features> diff --git a/restapi-call-node/provider/pom.xml b/restapi-call-node/provider/pom.xml index 0d23912fd..57af60727 100755 --- a/restapi-call-node/provider/pom.xml +++ b/restapi-call-node/provider/pom.xml @@ -15,10 +15,6 @@ <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name> - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - <dependencyManagement> <dependencies> <dependency> @@ -39,6 +35,7 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> |