From 893680f892ab0dc6871c35cdf21af1da2d38edf2 Mon Sep 17 00:00:00 2001
From: "Timoney, Dan (dt5972)" <dtimoney@att.com>
Date: Fri, 13 Dec 2019 14:48:58 -0500
Subject: Refactor features to separate installer

Refactor karaf feature.xml files to separate installer

Change-Id: I32eace0e537ff302bf52c664f8c90dfbbe01a545
Issue-ID: CCSDK-1754
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
---
 asdcApi/features/ccsdk-asdcApi/pom.xml    | 44 -------------------------------
 asdcApi/features/features-asdcApi/pom.xml | 33 -----------------------
 asdcApi/features/pom.xml                  | 22 ----------------
 asdcApi/installer/pom.xml                 | 13 ---------
 asdcApi/pom.xml                           |  1 -
 5 files changed, 113 deletions(-)
 delete mode 100644 asdcApi/features/ccsdk-asdcApi/pom.xml
 delete mode 100644 asdcApi/features/features-asdcApi/pom.xml
 delete mode 100755 asdcApi/features/pom.xml

(limited to 'asdcApi')

diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml
deleted file mode 100644
index 35e2a54b6..000000000
--- a/asdcApi/features/ccsdk-asdcApi/pom.xml
+++ /dev/null
@@ -1,44 +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.northbound</groupId>
-    <artifactId>ccsdk-asdcApi</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
-    
-    <properties>
-        <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.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>asdcApi-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>asdcApi-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/asdcApi/features/features-asdcApi/pom.xml b/asdcApi/features/features-asdcApi/pom.xml
deleted file mode 100644
index 571175b92..000000000
--- a/asdcApi/features/features-asdcApi/pom.xml
+++ /dev/null
@@ -1,33 +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.northbound</groupId>
-    <artifactId>features-asdcApi</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-asdcApi</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>
diff --git a/asdcApi/features/pom.xml b/asdcApi/features/pom.xml
deleted file mode 100755
index 36d0245b3..000000000
--- a/asdcApi/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.northbound</groupId>
-    <artifactId>asdcApi-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-asdcApi</module>
-        <module>features-asdcApi</module>
-    </modules>
-</project>
diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml
index 93ddb55f5..cad3fb8b3 100755
--- a/asdcApi/installer/pom.xml
+++ b/asdcApi/installer/pom.xml
@@ -25,19 +25,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.onap.ccsdk.sli.northbound</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.northbound</groupId>
             <artifactId>asdcApi-model</artifactId>
diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml
index 6dcaf5cc6..baac617c2 100755
--- a/asdcApi/pom.xml
+++ b/asdcApi/pom.xml
@@ -22,7 +22,6 @@
 
     <modules>
         <module>model</module>
-        <module>features</module>
         <module>provider</module>
         <module>installer</module>
     </modules>
-- 
cgit 1.2.3-korg