summaryrefslogtreecommitdiffstats
path: root/restapi-call-node
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-12 14:08:33 -0500
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-12-12 14:08:33 -0500
commitdffc1fd635470b0fc0e940f78e69d8f0ab0d14f0 (patch)
tree92d6f8c71d390223e0b47520a5befd12f59126c7 /restapi-call-node
parent3e8b55b9d3841c175776d84d54edf2a284f1f4b5 (diff)
Refactor karaf features into single module
Refactor karaf features installation into a single installation bundle instead of embedding in each module's installer. Change-Id: I281973c5d6fda5eeb0483cf9e6d058b8a4992ed3 Issue-ID: CCSDK-1754 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'restapi-call-node')
-rw-r--r--restapi-call-node/features/ccsdk-restapi-call-node/pom.xml39
-rw-r--r--restapi-call-node/features/features-restapi-call-node/pom.xml29
-rwxr-xr-xrestapi-call-node/features/pom.xml22
-rwxr-xr-xrestapi-call-node/installer/pom.xml15
-rwxr-xr-xrestapi-call-node/pom.xml1
5 files changed, 0 insertions, 106 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
deleted file mode 100644
index 1347c7a99..000000000
--- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>single-feature-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>ccsdk-restapi-call-node</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
-
-
- <dependencies>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>restapi-call-node-provider</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <!-- let the filter module start and manage the common code -->
- <exclusion>
- <groupId>org.onap.logging-analytics</groupId>
- <artifactId>logging-filter-base</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-</project>
diff --git a/restapi-call-node/features/features-restapi-call-node/pom.xml b/restapi-call-node/features/features-restapi-call-node/pom.xml
deleted file mode 100644
index a2a2c9243..000000000
--- a/restapi-call-node/features/features-restapi-call-node/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>feature-repo-parent</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- <relativePath/>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>features-restapi-call-node</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>feature</packaging>
-
- <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>ccsdk-restapi-call-node</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- </dependency>
-
- </dependencies>
-</project>
diff --git a/restapi-call-node/features/pom.xml b/restapi-call-node/features/pom.xml
deleted file mode 100755
index 10646edee..000000000
--- a/restapi-call-node/features/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.onap.ccsdk.parent</groupId>
- <artifactId>odlparent-lite</artifactId>
- <version>1.5.1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>restapi-call-node-features</artifactId>
- <version>0.7.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId}</name>
-
- <modules>
- <module>ccsdk-restapi-call-node</module>
- <module>features-restapi-call-node</module>
- </modules>
-</project>
diff --git a/restapi-call-node/installer/pom.xml b/restapi-call-node/installer/pom.xml
index 1e1361002..f4db07b59 100755
--- a/restapi-call-node/installer/pom.xml
+++ b/restapi-call-node/installer/pom.xml
@@ -23,21 +23,6 @@
</properties>
<dependencies>
-
- <dependency>
- <groupId>org.onap.ccsdk.sli.plugins</groupId>
- <artifactId>${application.name}</artifactId>
- <version>${project.version}</version>
- <type>xml</type>
- <classifier>features</classifier>
- <exclusions>
- <exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
<dependency>
<groupId>org.onap.ccsdk.sli.plugins</groupId>
<artifactId>restapi-call-node-provider</artifactId>
diff --git a/restapi-call-node/pom.xml b/restapi-call-node/pom.xml
index 39a0a70f9..1c3b8ddf3 100755
--- a/restapi-call-node/pom.xml
+++ b/restapi-call-node/pom.xml
@@ -18,7 +18,6 @@
<modules>
<module>provider</module>
- <module>features</module>
<module>installer</module>
</modules>
</project>