summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]grToolkit/features/ccsdk-gr-toolkit/pom.xml7
-rwxr-xr-xgrToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml7
-rwxr-xr-xgrToolkit/provider/pom.xml2
-rw-r--r--properties-node/features/ccsdk-properties-node/pom.xml8
-rwxr-xr-xproperties-node/provider/pom.xml10
-rw-r--r--restapi-call-node/features/ccsdk-restapi-call-node/pom.xml8
-rw-r--r--restapi-call-node/features/src/main/resources/features.xml42
-rwxr-xr-xrestapi-call-node/provider/pom.xml5
-rw-r--r--restconf-client/features/ccsdk-restconf-client/pom.xml8
-rwxr-xr-xrestconf-client/provider/pom.xml13
-rw-r--r--sshapi-call-node/features/src/main/resources/features.xml45
-rwxr-xr-xsshapi-call-node/provider/pom.xml10
-rw-r--r--template-node/features/ccsdk-template-node/pom.xml8
-rw-r--r--template-node/provider/pom.xml1
14 files changed, 17 insertions, 157 deletions
diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
index 37343c53c..fdbc61b78 100755..100644
--- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml
+++ b/grToolkit/features/ccsdk-gr-toolkit/pom.xml
@@ -24,13 +24,6 @@
<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>
- </dependency>
- <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>gr-toolkit-model</artifactId>
<version>${project.version}</version>
diff --git a/grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml b/grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml
deleted file mode 100755
index 4a21ca550..000000000
--- a/grToolkit/features/ccsdk-gr-toolkit/src/main/feature/feature.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="ccsdk-gr-toolkit">
- <repository>mvn:org.onap.ccsdk.sli.core/ccsdk-sli/LATEST/xml/features</repository>
- <feature name="ccsdk-gr-toolkit">
- <feature version="${ccsdk.sli.core.version}">ccsdk-sli</feature>
- </feature>
-</features>
diff --git a/grToolkit/provider/pom.xml b/grToolkit/provider/pom.xml
index b624e069e..67c711775 100755
--- a/grToolkit/provider/pom.xml
+++ b/grToolkit/provider/pom.xml
@@ -48,11 +48,13 @@
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
<version>${ccsdk.sli.core.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
<version>${ccsdk.sli.core.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<artifactId>sal-test-model</artifactId>
diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/properties-node/features/ccsdk-properties-node/pom.xml
index ae007d6e4..c919c8434 100644
--- a/properties-node/features/ccsdk-properties-node/pom.xml
+++ b/properties-node/features/ccsdk-properties-node/pom.xml
@@ -19,13 +19,7 @@
<dependencies>
- <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>properties-node-provider</artifactId>
diff --git a/properties-node/provider/pom.xml b/properties-node/provider/pom.xml
index 2e3b5e76c..3ecd80d59 100755
--- a/properties-node/provider/pom.xml
+++ b/properties-node/provider/pom.xml
@@ -14,12 +14,7 @@
<packaging>bundle</packaging>
<name>ccsdk-sli-plugins :: properties-node :: ${project.artifactId}</name>
- <url>http://maven.apache.org</url>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -46,10 +41,7 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-provider</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
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>
diff --git a/restconf-client/features/ccsdk-restconf-client/pom.xml b/restconf-client/features/ccsdk-restconf-client/pom.xml
index 677a24671..985cc8daf 100644
--- a/restconf-client/features/ccsdk-restconf-client/pom.xml
+++ b/restconf-client/features/ccsdk-restconf-client/pom.xml
@@ -25,13 +25,7 @@
<dependencies>
- <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>restconf-client-provider</artifactId>
diff --git a/restconf-client/provider/pom.xml b/restconf-client/provider/pom.xml
index 9fa247557..2c4b8c3ea 100755
--- a/restconf-client/provider/pom.xml
+++ b/restconf-client/provider/pom.xml
@@ -14,11 +14,6 @@
<packaging>bundle</packaging>
<name>ccsdk-sli-plugins :: restconf-client :: ${project.artifactId}</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<dependencyManagement>
<dependencies>
@@ -44,7 +39,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>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-provider</artifactId>
diff --git a/sshapi-call-node/features/src/main/resources/features.xml b/sshapi-call-node/features/src/main/resources/features.xml
deleted file mode 100644
index fd7caf535..000000000
--- a/sshapi-call-node/features/src/main/resources/features.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- openECOMP : SDN-C
- ================================================================================
- Copyright (C) 2018 Samsung Electronics. 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- name="sdnc-sshapi-call-node-${project.version}"
- xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
- 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-sshapi-call-node' description="sdnc-sshapi-call-node"
- version='${project.version}'>
- <feature>sdnc-sli</feature>
- <feature>spring</feature>
- <feature>spring-dm</feature>
- <bundle>mvn:org.codehaus.jettison/jettison/${jettison.version}</bundle>
- <bundle>mvn:org.onap.ccsdk.sli.core/sli-common/${project.version}</bundle>
- <bundle>mvn:org.onap.ccsdk.sli.core/sli-provider/${project.version}</bundle>
- <bundle dependency="true">mvn:org.onap.appc/appc-ssh-adapter-api/1.3.0</bundle>
- <bundle>mvn:org.onap.ccsdk.sli.plugins/sshapi-call-node-provider/${project.version}</bundle>
- </feature>
-
-</features>
diff --git a/sshapi-call-node/provider/pom.xml b/sshapi-call-node/provider/pom.xml
index 39f99d4bc..b71e15765 100755
--- a/sshapi-call-node/provider/pom.xml
+++ b/sshapi-call-node/provider/pom.xml
@@ -14,11 +14,6 @@
<packaging>bundle</packaging>
<name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
- <url>http://maven.apache.org</url>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
<dependencyManagement>
<dependencies>
@@ -41,10 +36,7 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
- </dependency>
- <dependency>
- <groupId>org.onap.ccsdk.sli.core</groupId>
- <artifactId>sli-provider</artifactId>
+ <scope>provided</scope>
</dependency>
<!-- ILLEGAL DEPENDENCY : creates circular dependency between CCSDK and APPC -->
<dependency>
diff --git a/template-node/features/ccsdk-template-node/pom.xml b/template-node/features/ccsdk-template-node/pom.xml
index f7a708729..115329bf5 100644
--- a/template-node/features/ccsdk-template-node/pom.xml
+++ b/template-node/features/ccsdk-template-node/pom.xml
@@ -17,13 +17,7 @@
<name>ccsdk-sli-plugins :: template-node :: ${project.artifactId}</name>
<dependencies>
- <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>template-node-provider</artifactId>
diff --git a/template-node/provider/pom.xml b/template-node/provider/pom.xml
index 08ff17caf..543a40d5e 100644
--- a/template-node/provider/pom.xml
+++ b/template-node/provider/pom.xml
@@ -36,6 +36,7 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>