summaryrefslogtreecommitdiffstats
path: root/ansible-adapter
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-08-09 18:18:32 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-09 18:18:32 +0000
commitd9105054ab02ecbc7b323624ecfc563ed3c0c0f6 (patch)
tree2235c39c4a22cdcc38cd1fd3867264ab020f997b /ansible-adapter
parent3ed9bd274112e2a66a631dbdd3805de00892b9fa (diff)
parent7cf0006685aa6dcf357dc4705ee29ec2df75a663 (diff)
Merge "sli adaptors features file cleanup"
Diffstat (limited to 'ansible-adapter')
-rw-r--r--ansible-adapter/ansible-adapter-bundle/pom.xml23
-rw-r--r--ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml1
-rw-r--r--ansible-adapter/ansible-adapter-features/src/main/resources/features.xml40
3 files changed, 3 insertions, 61 deletions
diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml
index 56775009..8a77fa54 100644
--- a/ansible-adapter/ansible-adapter-bundle/pom.xml
+++ b/ansible-adapter/ansible-adapter-bundle/pom.xml
@@ -57,26 +57,21 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
-
-
<!-- Needed to run test cases -->
<dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-common</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -90,13 +85,13 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
+ <scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -106,24 +101,10 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </dependency>
-
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
</dependency>
-
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </dependency>
-
-
</dependencies>
diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
index 12a59ee3..cdf16094 100644
--- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
+++ b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml
@@ -28,6 +28,7 @@
<version>${ccsdk.sli.core.version}</version>
<type>xml</type>
<classifier>features</classifier>
+ <scope>provided</scope>
</dependency>
<dependency>
diff --git a/ansible-adapter/ansible-adapter-features/src/main/resources/features.xml b/ansible-adapter/ansible-adapter-features/src/main/resources/features.xml
deleted file mode 100644
index 69d3b9b0..00000000
--- a/ansible-adapter/ansible-adapter-features/src/main/resources/features.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- ONAP : APPC
- ================================================================================
- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- ================================================================================
- Copyright (C) 2017 Amdocs
- =============================================================================
- 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.
-
- ECOMP is a trademark and service mark of AT&T Intellectual Property.
- ============LICENSE_END=========================================================
- -->
-
-
-<features name="appc-ansible-adapter-${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='appc-ansible-adapter' description="appc-ansible-adapter" version='${project.version}'>
- <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
- <feature>sdnc-sli</feature>
- <bundle dependency="true">mvn:org.onap.appc/appc-common/${project.version}</bundle>
- <bundle>mvn:org.onap.appc/appc-ansible-adapter-bundle/${project.version}</bundle>
- </feature>
-
-</features>