summaryrefslogtreecommitdiffstats
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
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>
-rw-r--r--features/ccsdk-gr-toolkit/pom.xml (renamed from grToolkit/features/ccsdk-gr-toolkit/pom.xml)0
-rw-r--r--features/ccsdk-properties-node/pom.xml (renamed from properties-node/features/ccsdk-properties-node/pom.xml)0
-rw-r--r--features/ccsdk-restapi-call-node/pom.xml (renamed from restapi-call-node/features/ccsdk-restapi-call-node/pom.xml)0
-rw-r--r--features/ccsdk-restconf-client/pom.xml (renamed from restconf-client/features/ccsdk-restconf-client/pom.xml)0
-rw-r--r--features/ccsdk-sshapi-call-node/pom.xml (renamed from sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml)0
-rw-r--r--features/ccsdk-template-node/pom.xml (renamed from template-node/features/ccsdk-template-node/pom.xml)0
-rw-r--r--features/features-sli-plugins/pom.xml39
-rwxr-xr-xfeatures/installer/pom.xml79
-rwxr-xr-xfeatures/pom.xml6
-rwxr-xr-xgrToolkit/features/.gitignore2
-rwxr-xr-xgrToolkit/features/features-gr-toolkit/pom.xml29
-rwxr-xr-xgrToolkit/features/pom.xml21
-rwxr-xr-xgrToolkit/installer/pom.xml13
-rwxr-xr-xgrToolkit/pom.xml8
-rw-r--r--properties-node/features/features-properties-node/pom.xml29
-rwxr-xr-xproperties-node/features/pom.xml22
-rwxr-xr-xproperties-node/installer/pom.xml14
-rwxr-xr-xproperties-node/pom.xml1
-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
-rw-r--r--restconf-client/features/features-restconf-client/pom.xml29
-rwxr-xr-xrestconf-client/features/pom.xml22
-rwxr-xr-xrestconf-client/installer/pom.xml14
-rwxr-xr-xrestconf-client/pom.xml1
-rw-r--r--sshapi-call-node/features/features-sshapi-call-node/pom.xml29
-rwxr-xr-xsshapi-call-node/features/pom.xml22
-rwxr-xr-xsshapi-call-node/installer/pom.xml14
-rwxr-xr-xsshapi-call-node/pom.xml1
-rw-r--r--template-node/features/features-template-node/pom.xml27
-rw-r--r--template-node/features/pom.xml20
-rw-r--r--template-node/installer/pom.xml13
-rw-r--r--template-node/pom.xml1
34 files changed, 123 insertions, 400 deletions
diff --git a/grToolkit/features/ccsdk-gr-toolkit/pom.xml b/features/ccsdk-gr-toolkit/pom.xml
index 1ac3f96b..1ac3f96b 100644
--- a/grToolkit/features/ccsdk-gr-toolkit/pom.xml
+++ b/features/ccsdk-gr-toolkit/pom.xml
diff --git a/properties-node/features/ccsdk-properties-node/pom.xml b/features/ccsdk-properties-node/pom.xml
index 9cdee255..9cdee255 100644
--- a/properties-node/features/ccsdk-properties-node/pom.xml
+++ b/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
index 1347c7a9..1347c7a9 100644
--- a/restapi-call-node/features/ccsdk-restapi-call-node/pom.xml
+++ b/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
index 70c75b92..70c75b92 100644
--- a/restconf-client/features/ccsdk-restconf-client/pom.xml
+++ b/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
index 838405be..838405be 100644
--- a/sshapi-call-node/features/ccsdk-sshapi-call-node/pom.xml
+++ b/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
index 7f4c1692..7f4c1692 100644
--- a/template-node/features/ccsdk-template-node/pom.xml
+++ b/features/ccsdk-template-node/pom.xml
diff --git a/features/features-sli-plugins/pom.xml b/features/features-sli-plugins/pom.xml
index 1e82332b..4f8cd5c1 100644
--- a/features/features-sli-plugins/pom.xml
+++ b/features/features-sli-plugins/pom.xml
@@ -18,6 +18,45 @@
<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>
<version>${project.version}</version>
diff --git a/features/installer/pom.xml b/features/installer/pom.xml
index 70393eb8..686eb812 100755
--- 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 59f2e329..7f8bb912 100755
--- 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
index 05a0d25f..00000000
--- 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
index f19e2d8e..00000000
--- 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
index 8a351ca9..00000000
--- 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 8830fdc4..6350e265 100755
--- a/grToolkit/installer/pom.xml
+++ b/grToolkit/installer/pom.xml
@@ -22,19 +22,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>gr-toolkit-provider</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml
index 770c40b3..4102c8ca 100755
--- a/grToolkit/pom.xml
+++ b/grToolkit/pom.xml
@@ -19,7 +19,6 @@
<modules>
<module>model</module>
- <module>features</module>
<module>installer</module>
<module>provider</module>
</modules>
@@ -28,13 +27,6 @@
<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>
<version>${project.version}</version>
</dependency>
diff --git a/properties-node/features/features-properties-node/pom.xml b/properties-node/features/features-properties-node/pom.xml
deleted file mode 100644
index 93d4b85b..00000000
--- 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
index 06dec869..00000000
--- 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 88ce8aa2..8af50203 100755
--- a/properties-node/installer/pom.xml
+++ b/properties-node/installer/pom.xml
@@ -26,20 +26,6 @@
<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>
<version>${project.version}</version>
</dependency>
diff --git a/properties-node/pom.xml b/properties-node/pom.xml
index 8b2811a9..7dd655ac 100755
--- 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
index a2a2c924..00000000
--- 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 10646ede..00000000
--- 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 1e136100..f4db07b5 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 39a0a70f..1c3b8ddf 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>
diff --git a/restconf-client/features/features-restconf-client/pom.xml b/restconf-client/features/features-restconf-client/pom.xml
deleted file mode 100644
index 5849dc03..00000000
--- 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
index b39f987b..00000000
--- 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 db75310b..f7704298 100755
--- a/restconf-client/installer/pom.xml
+++ b/restconf-client/installer/pom.xml
@@ -27,20 +27,6 @@
<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>
<version>${project.version}</version>
</dependency>
diff --git a/restconf-client/pom.xml b/restconf-client/pom.xml
index 0f04513a..76fb65c6 100755
--- 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
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
@@ -26,20 +26,6 @@
<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>
<version>${project.version}</version>
</dependency>
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>
diff --git a/template-node/features/features-template-node/pom.xml b/template-node/features/features-template-node/pom.xml
deleted file mode 100644
index 3baba62a..00000000
--- 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
index 9d2af0f4..00000000
--- 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 99ef46ff..9e2b15e1 100644
--- a/template-node/installer/pom.xml
+++ b/template-node/installer/pom.xml
@@ -25,19 +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>template-node-provider</artifactId>
<version>${project.version}</version>
</dependency>
diff --git a/template-node/pom.xml b/template-node/pom.xml
index f1200b32..781a798c 100644
--- 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>