From 94f4b9bf8661ad75628163b46518e902b6abc834 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Tue, 2 Mar 2021 20:00:49 -0500 Subject: Refactoring pom's name tag Indenting pom's and running mvn tidy:pom to rearrange items Issue-ID: CCSDK-3198 Signed-off-by: Singal, Kapil (ks220y) Change-Id: Ic9c7cfd76bd98e6a101ec7788841d96316508735 --- plugins/features/ccsdk-gr-toolkit/pom.xml | 2 +- plugins/features/ccsdk-properties-node/pom.xml | 3 +- plugins/features/ccsdk-restapi-call-node/pom.xml | 54 +-- plugins/features/ccsdk-restconf-client/pom.xml | 59 ++-- plugins/features/ccsdk-sli-plugins-all/pom.xml | 114 +++---- plugins/features/ccsdk-sshapi-call-node/pom.xml | 4 +- plugins/features/ccsdk-template-node/pom.xml | 40 +-- plugins/features/installer/pom.xml | 401 +++++++++++------------ plugins/features/pom.xml | 38 +-- 9 files changed, 356 insertions(+), 359 deletions(-) (limited to 'plugins/features') diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index 072755d4b..c6afe244a 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: gr-toolkit :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index db737aca7..c11500f57 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -14,11 +14,10 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: properties-node :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - ${project.groupId} properties-node-provider diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index af44fb223..2b8898a74 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -1,38 +1,38 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.plugins - ccsdk-restapi-call-node - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.plugins + ccsdk-restapi-call-node + 1.2.1-SNAPSHOT + feature - ccsdk-sli-plugins :: restapi-call-node :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - + javax.ws.rs javax.ws.rs-api - - - ${project.groupId} - restapi-call-node-provider - ${project.version} - - - - org.onap.logging-analytics - logging-filter-base - - - - + + + ${project.groupId} + restapi-call-node-provider + ${project.version} + + + + org.onap.logging-analytics + logging-filter-base + + + + diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index edea3ee5d..30b2e503b 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -1,39 +1,38 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + - org.onap.ccsdk.sli.plugins - ccsdk-restconf-client - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.plugins + ccsdk-restconf-client + 1.2.1-SNAPSHOT + feature - ccsdk-sli-plugins :: restconf-client :: ${project.artifactId} + ccsdk-sli-plugins :: features :: ${project.artifactId} - - true - + + true + - + - - - ${project.groupId} - restconf-client-provider - ${project.version} - - - - org.onap.logging-analytics - logging-filter-base - - - - + + ${project.groupId} + restconf-client-provider + ${project.version} + + + + org.onap.logging-analytics + logging-filter-base + + + + diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index 0ac957f0e..17d66c34a 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -1,60 +1,60 @@ - 4.0.0 - - - org.onap.ccsdk.parent - single-feature-parent - 2.1.1 - - - - org.onap.ccsdk.sli.plugins - ccsdk-sli-plugins-all - 1.2.1-SNAPSHOT - feature - - ccsdk-sli-plugins :: features :: ${project.artifactId} - - - - ${project.groupId} - ccsdk-properties-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-restapi-call-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-restconf-client - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-template-node - ${project.version} - xml - features - - - - ${project.groupId} - ccsdk-sshapi-call-node - ${project.version} - xml - features - - + 4.0.0 + + + org.onap.ccsdk.parent + single-feature-parent + 2.1.1 + + + + org.onap.ccsdk.sli.plugins + ccsdk-sli-plugins-all + 1.2.1-SNAPSHOT + feature + + ccsdk-sli-plugins :: features :: ${project.artifactId} + + + + ${project.groupId} + ccsdk-properties-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-restapi-call-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-restconf-client + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-template-node + ${project.version} + xml + features + + + + ${project.groupId} + ccsdk-sshapi-call-node + ${project.version} + xml + features + + diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index c9a1d213b..79b2e286e 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -14,9 +14,9 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-plugins :: sshapi-call-node :: ${project.artifactId} - + validate + + ${basedir}/target/stage + + + src/main/resources/scripts + + install-feature.sh + + true + + + + - - - - maven-assembly-plugin - - - maven-repo-zip - - single - - package - - true - stage/${application.name}-${project.version} - - src/assembly/assemble_mvnrepo_zip.xml - - true - - - - installer-zip - - single - - package - - true - ${application.name}-${project.version}-installer - - src/assembly/assemble_installer_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/assembly/system - false - true - true - true - false - false - org.onap.ccsdk.sli.plugins - provided - - - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ${basedir}/target/stage - - - src/main/resources/scripts - - install-feature.sh - - true - - - - + + - - - - - + + diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index 4c26161e2..1b8b15af1 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -1,28 +1,28 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.1 - - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.1 + + - org.onap.ccsdk.sli.plugins - sliplugins-feature-aggregator - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.plugins + sliplugins-feature-aggregator + 1.2.1-SNAPSHOT + pom - ccsdk-sli-plugins :: features + 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-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 -- cgit 1.2.3-korg