From dffc1fd635470b0fc0e940f78e69d8f0ab0d14f0 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Thu, 12 Dec 2019 14:08:33 -0500
Subject: 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>
---
 .../features/ccsdk-sshapi-call-node/pom.xml        | 42 ----------------------
 .../features/features-sshapi-call-node/pom.xml     | 29 ---------------
 sshapi-call-node/features/pom.xml                  | 22 ------------
 sshapi-call-node/installer/pom.xml                 | 14 --------
 sshapi-call-node/pom.xml                           |  1 -
 5 files changed, 108 deletions(-)
 delete mode 100644 sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
 delete mode 100644 sshapi-call-node/features/features-sshapi-call-node/pom.xml
 delete mode 100755 sshapi-call-node/features/pom.xml

(limited to 'sshapi-call-node')

diff --git a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml b/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
deleted file mode 100644
index 838405be..00000000
--- a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
+++ /dev/null
@@ -1,42 +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-sshapi-call-node</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
-
-
-
-<!--
-    <properties>
-        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
-    </properties>
-
-    <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>sshapi-call-node-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-    -->
-</project>
diff --git a/sshapi-call-node/features/features-sshapi-call-node/pom.xml b/sshapi-call-node/features/features-sshapi-call-node/pom.xml
deleted file mode 100644
index 26ab0ca3..00000000
--- a/sshapi-call-node/features/features-sshapi-call-node/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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-sshapi-call-node</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-sshapi-call-node</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/sshapi-call-node/features/pom.xml b/sshapi-call-node/features/pom.xml
deleted file mode 100755
index 2c2d4ee9..00000000
--- a/sshapi-call-node/features/pom.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0" 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>sshapi-call-node-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-sshapi-call-node</module>
-        <module>features-sshapi-call-node</module>
-    </modules>
-</project>
diff --git a/sshapi-call-node/installer/pom.xml b/sshapi-call-node/installer/pom.xml
index b2f5cb02..d99170b3 100755
--- a/sshapi-call-node/installer/pom.xml
+++ b/sshapi-call-node/installer/pom.xml
@@ -24,20 +24,6 @@
 
 	<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>sshapi-call-node-provider</artifactId>
diff --git a/sshapi-call-node/pom.xml b/sshapi-call-node/pom.xml
index 0860c78b..caa0a4cd 100755
--- a/sshapi-call-node/pom.xml
+++ b/sshapi-call-node/pom.xml
@@ -18,7 +18,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 </project>
-- 
cgit 1.2.3-korg