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>

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

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

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

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

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

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

diff --git a/features/features-sli-plugins/pom.xml b/features/features-sli-plugins/pom.xml
index 1e82332..4f8cd5c 100644 (file)
--- a/features/features-sli-plugins/pom.xml
+++ b/features/features-sli-plugins/pom.xml
@@ -17,6 +17,45 @@
     <name>ccsdk-sli-plugins :: features :: ${project.artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.plugins</groupId>
+            <artifactId>ccsdk-gr-toolkit</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>ccsdk-properties-node</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>ccsdk-restapi-call-node</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ccsdk-sli-plugins-all</artifactId>

diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 70393eb..686eb81 100755 (executable)
--- a/features/installer/pom.xml
+++ b/features/installer/pom.xml
@@ -24,7 +24,84 @@
        </properties>
 
        <dependencies>
-
+               <dependency>
+                       <groupId>org.onap.ccsdk.sli.plugins</groupId>
+                       <artifactId>ccsdk-gr-toolkit</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>ccsdk-properties-node</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>ccsdk-restapi-call-node</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>ccsdk-restconf-client</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>ccsdk-sshapi-call-node</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>ccsdk-template-node</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>${application.name}</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index 59f2e32..7f8bb91 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -17,6 +17,12 @@
        <name>ccsdk-sli-plugins :: features</name>
 
        <modules>
+               <module>ccsdk-gr-toolkit</module>
+               <module>ccsdk-properties-node</module>
+               <module>ccsdk-restapi-call-node</module>
+               <module>ccsdk-restconf-client</module>
+               <module>ccsdk-sshapi-call-node</module>
+               <module>ccsdk-template-node</module>
         <module>ccsdk-sli-plugins-all</module>
         <module>features-sli-plugins</module>
         <module>installer</module>

diff --git a/grToolkit/features/.gitignore b/grToolkit/features/.gitignore
deleted file mode 100755 (executable)
index 05a0d25..0000000
--- a/grToolkit/features/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/target-ide/
-/bin/

diff --git a/grToolkit/features/features-gr-toolkit/pom.xml b/grToolkit/features/features-gr-toolkit/pom.xml
deleted file mode 100755 (executable)
index f19e2d8..0000000
--- a/grToolkit/features/features-gr-toolkit/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-gr-toolkit</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>feature</packaging>
-
-    <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
-
-    <dependencies>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ccsdk-gr-toolkit</artifactId>
-            <version>${project.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
-    </dependencies>
-
-</project>

diff --git a/grToolkit/features/pom.xml b/grToolkit/features/pom.xml
deleted file mode 100755 (executable)
index 8a351ca..0000000
--- a/grToolkit/features/pom.xml
+++ /dev/null
@@ -1,21 +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>
-
-    <name>ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId}</name>
-    <artifactId>gr-toolkit-features</artifactId>
-    <groupId>org.onap.ccsdk.sli.plugins</groupId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>ccsdk-gr-toolkit</module>
-        <module>features-gr-toolkit</module>
-    </modules>
-</project>

diff --git a/grToolkit/installer/pom.xml b/grToolkit/installer/pom.xml
index 8830fdc..6350e26 100755 (executable)
--- a/grToolkit/installer/pom.xml
+++ b/grToolkit/installer/pom.xml
@@ -20,19 +20,6 @@
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </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>gr-toolkit-provider</artifactId>

diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml
index 770c40b..4102c8c 100755 (executable)
--- a/grToolkit/pom.xml
+++ b/grToolkit/pom.xml
@@ -19,20 +19,12 @@
 
     <modules>
         <module>model</module>
-        <module>features</module>
         <module>installer</module>
         <module>provider</module>
     </modules>
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.onap.ccsdk.sli.plugins</groupId>
-                <artifactId>gr-toolkit-features</artifactId>
-                <classifier>features</classifier>
-                <type>xml</type>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.onap.ccsdk.sli.plugins</groupId>
                 <artifactId>gr-toolkit-model</artifactId>

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

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

diff --git a/properties-node/installer/pom.xml b/properties-node/installer/pom.xml
index 88ce8aa..8af5020 100755 (executable)
--- a/properties-node/installer/pom.xml
+++ b/properties-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>properties-node-provider</artifactId>

diff --git a/properties-node/pom.xml b/properties-node/pom.xml
index 8b2811a..7dd655a 100755 (executable)
--- a/properties-node/pom.xml
+++ b/properties-node/pom.xml
@@ -19,7 +19,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 </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 (file)
index a2a2c92..0000000
--- 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 (executable)
index 10646ed..0000000
--- 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 1e13610..f4db07b 100755 (executable)
--- 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 39a0a70..1c3b8dd 100755 (executable)
--- 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>

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

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

diff --git a/restconf-client/installer/pom.xml b/restconf-client/installer/pom.xml
index db75310..f770429 100755 (executable)
--- a/restconf-client/installer/pom.xml
+++ b/restconf-client/installer/pom.xml
@@ -25,20 +25,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>restconf-client-provider</artifactId>

diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml
index 0f04513..76fb65c 100755 (executable)
--- a/restconf-client/pom.xml
+++ b/restconf-client/pom.xml
@@ -18,7 +18,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 </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 (file)
index 26ab0ca..0000000
--- 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 (executable)
index 2c2d4ee..0000000
--- 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 b2f5cb0..d99170b 100755 (executable)
--- 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 0860c78..caa0a4c 100755 (executable)
--- 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>

diff --git a/template-node/features/features-template-node/pom.xml b/template-node/features/features-template-node/pom.xml
deleted file mode 100644 (file)
index 3baba62..0000000
--- a/template-node/features/features-template-node/pom.xml
+++ /dev/null
@@ -1,27 +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-template-node</artifactId>
-       <version>0.7.0-SNAPSHOT</version>
-       <packaging>feature</packaging>
-
-       <dependencies>
-               <dependency>
-                       <groupId>${project.groupId}</groupId>
-                       <artifactId>ccsdk-template-node</artifactId>
-                       <version>${project.version}</version>
-                       <type>xml</type>
-                       <classifier>features</classifier>
-               </dependency>
-
-       </dependencies>
-</project>

diff --git a/template-node/features/pom.xml b/template-node/features/pom.xml
deleted file mode 100644 (file)
index 9d2af0f..0000000
--- a/template-node/features/pom.xml
+++ /dev/null
@@ -1,20 +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>template-node-features</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <modules>
-        <module>ccsdk-template-node</module>
-        <module>features-template-node</module>
-    </modules>
-</project>

diff --git a/template-node/installer/pom.xml b/template-node/installer/pom.xml
index 99ef46f..9e2b15e 100644 (file)
--- a/template-node/installer/pom.xml
+++ b/template-node/installer/pom.xml
@@ -23,19 +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>template-node-provider</artifactId>

diff --git a/template-node/pom.xml b/template-node/pom.xml
index f1200b3..781a798 100644 (file)
--- a/template-node/pom.xml
+++ b/template-node/pom.xml
@@ -15,7 +15,6 @@
 
     <modules>
         <module>provider</module>
-        <module>features</module>
         <module>installer</module>
     </modules>
 </project>