diff options
9 files changed, 14 insertions, 129 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 97d35212..00000000 --- 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 46cd8db8..bbd759f4 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> 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> diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml index 6bb5cb3c..5c7899c3 100644 --- a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml +++ b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml @@ -29,8 +29,8 @@ <version>${ccsdk.sli.core.version}</version> <type>xml</type> <classifier>features</classifier> + <scope>provided</scope> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>mdsal-resource-provider</artifactId> diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml index c2775718..61dcf4ec 100644 --- a/netbox-client/features/ccsdk-netbox-client/pom.xml +++ b/netbox-client/features/ccsdk-netbox-client/pom.xml @@ -31,36 +31,27 @@ <name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name> - <properties> <ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version> </properties> - <dependencies> <dependency> - <groupId>org.opendaylight.controller</groupId> - <artifactId>odl-mdsal-broker</artifactId> - <type>xml</type> - <classifier>features</classifier> - </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> + <scope>provided</scope> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>ccsdk-dblib</artifactId> <version>${ccsdk.sli.core.version}</version> <type>xml</type> <classifier>features</classifier> + <scope>provided</scope> </dependency> - <dependency> <groupId>${project.groupId}</groupId> <artifactId>netbox-client-provider</artifactId> diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml index 04f18c87..997dffe8 100644 --- a/netbox-client/provider/pom.xml +++ b/netbox-client/provider/pom.xml @@ -71,13 +71,13 @@ <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>sliPluginUtils-provider</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml index 0b11d2cf..2e1bd765 100644 --- a/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -66,10 +66,6 @@ <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>jcl-over-slf4j</artifactId> - </dependency> <!-- Needed to run SSH --> <!-- VERSION CONFLICT !!!!! --> @@ -102,11 +98,13 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-common</artifactId> - </dependency> + <scope>provided</scope> + </dependency> <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> + <scope>provided</scope> </dependency> <dependency> |