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>

diff --git a/asdcApi/features/features-asdcApi/pom.xml b/asdcApi/features/features-asdcApi/pom.xml
deleted file mode 100644 (file)
index 571175b..0000000
--- 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 (executable)
index 36d0245..0000000
--- 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 93ddb55..cad3fb8 100755 (executable)
--- 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 6dcaf5c..baac617 100755 (executable)
--- 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>

diff --git a/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml b/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml
deleted file mode 100644 (file)
index 3a9d260..0000000
--- a/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml
+++ /dev/null
@@ -1,28 +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-daexim-offsite-backup</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-daexim-offsite-backup</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-</project>

diff --git a/daexim-offsite-backup/features/pom.xml b/daexim-offsite-backup/features/pom.xml
deleted file mode 100755 (executable)
index 9152cf5..0000000
--- a/daexim-offsite-backup/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>daexim-offsite-backup-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    
-    <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-daexim-offsite-backup</module>
-        <module>features-daexim-offsite-backup</module>
-    </modules>
-</project>

diff --git a/daexim-offsite-backup/installer/pom.xml b/daexim-offsite-backup/installer/pom.xml
index 3e36f56..dae4a4f 100755 (executable)
--- a/daexim-offsite-backup/installer/pom.xml
+++ b/daexim-offsite-backup/installer/pom.xml
@@ -20,19 +20,6 @@
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
     <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>daexim-offsite-backup-provider</artifactId>

diff --git a/daexim-offsite-backup/pom.xml b/daexim-offsite-backup/pom.xml
index 3af5753..65cf987 100755 (executable)
--- a/daexim-offsite-backup/pom.xml
+++ b/daexim-offsite-backup/pom.xml
@@ -20,7 +20,6 @@
     <modules>
         <module>model</module>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 

diff --git a/dataChange/features/features-dataChange/pom.xml b/dataChange/features/features-dataChange/pom.xml
deleted file mode 100644 (file)
index 9a34429..0000000
--- a/dataChange/features/features-dataChange/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-dataChange</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-dataChange</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/dataChange/features/pom.xml b/dataChange/features/pom.xml
deleted file mode 100755 (executable)
index f16ed69..0000000
--- a/dataChange/features/pom.xml
+++ /dev/null
@@ -1,23 +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>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.sli.northbound</groupId>
-    <artifactId>dataChange-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-dataChange</module>
-        <module>features-dataChange</module>
-    </modules>
-</project>

diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml
index abd4cc8..7516f0b 100755 (executable)
--- a/dataChange/installer/pom.xml
+++ b/dataChange/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>dataChange-model</artifactId>

diff --git a/dataChange/pom.xml b/dataChange/pom.xml
index 617f6b3..7563788 100755 (executable)
--- a/dataChange/pom.xml
+++ b/dataChange/pom.xml
@@ -18,7 +18,6 @@
 
     <modules>
         <module>model</module>
-        <module>features</module>
         <module>provider</module>
         <module>installer</module>
     </modules>

diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/features/ccsdk-asdcApi/pom.xml
similarity index 100%
rename from asdcApi/features/ccsdk-asdcApi/pom.xml
rename to features/ccsdk-asdcApi/pom.xml

diff --git a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml b/features/ccsdk-daexim-offsite-backup/pom.xml
similarity index 100%
rename from daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml
rename to features/ccsdk-daexim-offsite-backup/pom.xml

diff --git a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml b/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml
similarity index 100%
rename from daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml
rename to features/ccsdk-daexim-offsite-backup/src/main/feature/feature.xml

diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/features/ccsdk-dataChange/pom.xml
similarity index 100%
rename from dataChange/features/ccsdk-dataChange/pom.xml
rename to features/ccsdk-dataChange/pom.xml

diff --git a/lcm/features/ccsdk-lcm/pom.xml b/features/ccsdk-lcm/pom.xml
similarity index 100%
rename from lcm/features/ccsdk-lcm/pom.xml
rename to features/ccsdk-lcm/pom.xml

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 49196e7..b9ad99f 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -24,6 +24,59 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.northbound</groupId>
+            <artifactId>ccsdk-asdcApi</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>ccsdk-daexim-offsite-backup</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>ccsdk-dataChange</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>ccsdk-lcm</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>

diff --git a/features/pom.xml b/features/pom.xml
index 560f3a0..4f3c2ae 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,6 +17,10 @@
     <name>ccsdk-sli-northbound :: features</name>
 
     <modules>
+        <module>ccsdk-asdcApi</module>
+        <module>ccsdk-daexim-offsite-backup</module>
+        <module>ccsdk-dataChange</module>
+        <module>ccsdk-lcm</module>
         <module>ccsdk-sli-northbound-all</module>
         <module>features-sli-northbound</module>
         <module>installer</module>

diff --git a/lcm/features/features-lcm/pom.xml b/lcm/features/features-lcm/pom.xml
deleted file mode 100644 (file)
index 600ed43..0000000
--- a/lcm/features/features-lcm/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-lcm</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
-
-    <properties>
-        <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-lcm</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-
-    </dependencies>
-</project>

diff --git a/lcm/features/pom.xml b/lcm/features/pom.xml
deleted file mode 100755 (executable)
index ac0258b..0000000
--- a/lcm/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>lcm-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name>
-
-    <modules>
-        <module>ccsdk-lcm</module>
-        <module>features-lcm</module>
-    </modules>
-</project>

diff --git a/lcm/installer/pom.xml b/lcm/installer/pom.xml
index b7aa65f..38b4f84 100755 (executable)
--- a/lcm/installer/pom.xml
+++ b/lcm/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>lcm-model</artifactId>

diff --git a/lcm/pom.xml b/lcm/pom.xml
index 5559003..4f19f8c 100755 (executable)
--- a/lcm/pom.xml
+++ b/lcm/pom.xml
@@ -18,7 +18,6 @@
 
     <modules>
         <module>model</module>
-        <module>features</module>
         <module>provider</module>
         <module>installer</module>
     </modules>