From dffc1fd635470b0fc0e940f78e69d8f0ab0d14f0 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 12 Dec 2019 14:08:33 -0500 Subject: [PATCH 1/1] 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) --- .../features => features}/ccsdk-gr-toolkit/pom.xml | 0 .../ccsdk-properties-node/pom.xml | 0 .../ccsdk-restapi-call-node/pom.xml | 0 .../ccsdk-restconf-client/pom.xml | 0 .../ccsdk-sshapi-call-node/pom.xml | 0 .../ccsdk-template-node/pom.xml | 0 features/features-sli-plugins/pom.xml | 39 +++++++++++ features/installer/pom.xml | 79 +++++++++++++++++++++- features/pom.xml | 6 ++ grToolkit/features/.gitignore | 2 - grToolkit/features/features-gr-toolkit/pom.xml | 29 -------- grToolkit/features/pom.xml | 21 ------ grToolkit/installer/pom.xml | 13 ---- grToolkit/pom.xml | 8 --- .../features/features-properties-node/pom.xml | 29 -------- properties-node/features/pom.xml | 22 ------ properties-node/installer/pom.xml | 14 ---- properties-node/pom.xml | 1 - .../features/features-restapi-call-node/pom.xml | 29 -------- restapi-call-node/features/pom.xml | 22 ------ restapi-call-node/installer/pom.xml | 15 ---- restapi-call-node/pom.xml | 1 - .../features/features-restconf-client/pom.xml | 29 -------- restconf-client/features/pom.xml | 22 ------ restconf-client/installer/pom.xml | 14 ---- restconf-client/pom.xml | 1 - .../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 - .../features/features-template-node/pom.xml | 27 -------- template-node/features/pom.xml | 20 ------ template-node/installer/pom.xml | 13 ---- template-node/pom.xml | 1 - 34 files changed, 123 insertions(+), 400 deletions(-) rename {grToolkit/features => features}/ccsdk-gr-toolkit/pom.xml (100%) rename {properties-node/features => features}/ccsdk-properties-node/pom.xml (100%) rename {restapi-call-node/features => features}/ccsdk-restapi-call-node/pom.xml (100%) rename {restconf-client/features => features}/ccsdk-restconf-client/pom.xml (100%) rename {sshapi-call-node/features => features}/ccsdk-sshapi-call-node/pom.xml (100%) rename {template-node/features => features}/ccsdk-template-node/pom.xml (100%) delete mode 100755 grToolkit/features/.gitignore delete mode 100755 grToolkit/features/features-gr-toolkit/pom.xml delete mode 100755 grToolkit/features/pom.xml delete mode 100644 properties-node/features/features-properties-node/pom.xml delete mode 100755 properties-node/features/pom.xml delete mode 100644 restapi-call-node/features/features-restapi-call-node/pom.xml delete mode 100755 restapi-call-node/features/pom.xml delete mode 100644 restconf-client/features/features-restconf-client/pom.xml delete mode 100755 restconf-client/features/pom.xml delete mode 100644 sshapi-call-node/features/features-sshapi-call-node/pom.xml delete mode 100755 sshapi-call-node/features/pom.xml delete mode 100644 template-node/features/features-template-node/pom.xml delete mode 100644 template-node/features/pom.xml 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 1e82332b..4f8cd5c1 100644 --- a/features/features-sli-plugins/pom.xml +++ b/features/features-sli-plugins/pom.xml @@ -17,6 +17,45 @@ ccsdk-sli-plugins :: features :: ${project.artifactId} + + org.onap.ccsdk.sli.plugins + ccsdk-gr-toolkit + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + ccsdk-properties-node + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + ${project.version} + xml + features + + + * + * + + + ${project.groupId} ccsdk-sli-plugins-all 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 @@ - + + org.onap.ccsdk.sli.plugins + ccsdk-gr-toolkit + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + ccsdk-properties-node + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + ccsdk-restconf-client + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + ccsdk-sshapi-call-node + ${project.version} + xml + features + + + * + * + + + + + org.onap.ccsdk.sli.plugins + ccsdk-template-node + ${project.version} + xml + features + + + * + * + + + org.onap.ccsdk.sli.plugins ${application.name} 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 @@ ccsdk-sli-plugins :: features + ccsdk-gr-toolkit + ccsdk-properties-node + ccsdk-restapi-call-node + ccsdk-restconf-client + ccsdk-sshapi-call-node + ccsdk-template-node ccsdk-sli-plugins-all features-sli-plugins installer 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - features-gr-toolkit - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-gr-toolkit - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} - gr-toolkit-features - org.onap.ccsdk.sli.plugins - 0.7.0-SNAPSHOT - pom - - - ccsdk-gr-toolkit - features-gr-toolkit - - 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 @@ -20,19 +20,6 @@ false - - org.onap.ccsdk.sli.plugins - ${application.name} - ${project.version} - xml - features - - - * - * - - - org.onap.ccsdk.sli.plugins gr-toolkit-provider diff --git a/grToolkit/pom.xml b/grToolkit/pom.xml index 770c40b3..4102c8ca 100755 --- a/grToolkit/pom.xml +++ b/grToolkit/pom.xml @@ -19,20 +19,12 @@ model - features installer provider - - org.onap.ccsdk.sli.plugins - gr-toolkit-features - features - xml - ${project.version} - org.onap.ccsdk.sli.plugins gr-toolkit-model 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - features-properties-node - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-properties-node - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.plugins - properties-node-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} - - - ccsdk-properties-node - features-properties-node - - 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 @@ -24,20 +24,6 @@ - - org.onap.ccsdk.sli.plugins - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.plugins properties-node-provider 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 @@ provider - features installer 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - features-restapi-call-node - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-restapi-call-node - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.plugins - restapi-call-node-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} - - - ccsdk-restapi-call-node - features-restapi-call-node - - 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 @@ - - - org.onap.ccsdk.sli.plugins - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.plugins restapi-call-node-provider 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 @@ provider - features installer 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - features-restconf-client - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-restconf-client - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.plugins - restconf-client-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} - - - ccsdk-restconf-client - features-restconf-client - - 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 @@ -25,20 +25,6 @@ - - org.onap.ccsdk.sli.plugins - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.plugins restconf-client-provider 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 @@ provider - features installer 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - features-sshapi-call-node - 0.7.0-SNAPSHOT - feature - - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-sshapi-call-node - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.plugins - sshapi-call-node-features - 0.7.0-SNAPSHOT - pom - - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - - - ccsdk-sshapi-call-node - features-sshapi-call-node - - 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 @@ - - org.onap.ccsdk.sli.plugins - ${application.name} - ${project.version} - xml - features - - - * - * - - - - org.onap.ccsdk.sli.plugins sshapi-call-node-provider 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 @@ provider - features installer 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - feature-repo-parent - 1.5.1-SNAPSHOT - - - - org.onap.ccsdk.sli.plugins - features-template-node - 0.7.0-SNAPSHOT - feature - - - - ${project.groupId} - ccsdk-template-node - ${project.version} - xml - features - - - - 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 @@ - - - 4.0.0 - - - org.onap.ccsdk.parent - odlparent-lite - 1.5.1-SNAPSHOT - - - org.onap.ccsdk.sli.plugins - template-node-features - 0.7.0-SNAPSHOT - pom - - - ccsdk-template-node - features-template-node - - 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 @@ -23,19 +23,6 @@ - - org.onap.ccsdk.sli.plugins - ${application.name} - ${project.version} - xml - features - - - * - * - - - org.onap.ccsdk.sli.plugins template-node-provider 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 @@ provider - features installer -- 2.16.6