From 0190b382e4b37854c4461bfcfce594c20f5dd8a8 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 --- adaptors/features/ccsdk-aai-service/pom.xml | 3 +- adaptors/features/ccsdk-ansible-adapter/pom.xml | 5 +- adaptors/features/ccsdk-base-http/pom.xml | 38 +- adaptors/features/ccsdk-mdsal-resource/pom.xml | 2 +- .../features/ccsdk-messagerouter-consumer/pom.xml | 46 +- .../features/ccsdk-messagerouter-publisher/pom.xml | 46 +- adaptors/features/ccsdk-netbox-client/pom.xml | 2 +- .../features/ccsdk-resource-assignment/pom.xml | 3 +- adaptors/features/ccsdk-saltstack-adapter/pom.xml | 5 +- adaptors/features/ccsdk-sli-adaptors-all/pom.xml | 4 +- adaptors/features/ccsdk-sql-resource/pom.xml | 3 +- adaptors/features/installer/pom.xml | 505 ++++++++++----------- adaptors/features/pom.xml | 46 +- 13 files changed, 353 insertions(+), 355 deletions(-) (limited to 'adaptors/features') diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index 6f0f48e78..4f4266b3b 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -33,6 +33,5 @@ ${project.version} - diff --git a/adaptors/features/ccsdk-ansible-adapter/pom.xml b/adaptors/features/ccsdk-ansible-adapter/pom.xml index 8ee2bf432..4bc368f9e 100644 --- a/adaptors/features/ccsdk-ansible-adapter/pom.xml +++ b/adaptors/features/ccsdk-ansible-adapter/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -33,12 +33,11 @@ ${project.version} - powermock-api-mockito org.powermock + powermock-api-mockito - diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 9c94a38d5..0a656829c 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -1,26 +1,26 @@ - 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.adaptors - ccsdk-base-http - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.adaptors + ccsdk-base-http + 1.2.1-SNAPSHOT + feature - ccsdk-sli-adaptors :: base-http :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} - - - ${project.groupId} - base-http-provider - ${project.version} - - + + + ${project.groupId} + base-http-provider + ${project.version} + + diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index 55ec57081..123f1b755 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index 30bdcaa9b..d066340e8 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -1,28 +1,30 @@ - 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.adaptors.messagerouter - ccsdk-messagerouter-consumer - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.adaptors.messagerouter + ccsdk-messagerouter-consumer + 1.2.1-SNAPSHOT + feature - - - ${project.groupId} - consumer.api - ${project.version} - - - ${project.groupId} - consumer.provider - ${project.version} - - + ccsdk-sli-adaptors :: features :: ${project.artifactId} + + + + ${project.groupId} + consumer.api + ${project.version} + + + ${project.groupId} + consumer.provider + ${project.version} + + diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index 0a0d5aec5..fff3ae3c5 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -1,28 +1,30 @@ - 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.adaptors.messagerouter - ccsdk-messagerouter-publisher - 1.2.1-SNAPSHOT - feature + org.onap.ccsdk.sli.adaptors.messagerouter + ccsdk-messagerouter-publisher + 1.2.1-SNAPSHOT + feature - - - ${project.groupId} - publisher.api - ${project.version} - - - ${project.groupId} - publisher.provider - ${project.version} - - + ccsdk-sli-adaptors :: features :: ${project.artifactId} + + + + ${project.groupId} + publisher.api + ${project.version} + + + ${project.groupId} + publisher.provider + ${project.version} + + diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index cd489761a..5258b53f5 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -30,7 +30,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index c5de29079..5b80354a8 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -42,6 +42,5 @@ ${project.version} - diff --git a/adaptors/features/ccsdk-saltstack-adapter/pom.xml b/adaptors/features/ccsdk-saltstack-adapter/pom.xml index c83577f8c..ae97470a9 100644 --- a/adaptors/features/ccsdk-saltstack-adapter/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adapter/pom.xml @@ -14,7 +14,7 @@ 1.2.1-SNAPSHOT feature - ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId} + ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -28,11 +28,10 @@ ${project.groupId} saltstack-adapter-provider ${project.version} - - powermock-api-mockito org.powermock + powermock-api-mockito diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 3fc7de1ae..7bf434323 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -31,7 +31,7 @@ xml features - + 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.adaptors - 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/adaptors/features/pom.xml b/adaptors/features/pom.xml index 4ffc35be9..a09179d9d 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -1,32 +1,32 @@ - 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.adaptors - sliadaptors-feature-aggregator - 1.2.1-SNAPSHOT - pom + org.onap.ccsdk.sli.adaptors + sliadaptors-feature-aggregator + 1.2.1-SNAPSHOT + pom - ccsdk-sli-adaptors :: features + ccsdk-sli-adaptors :: features - - ccsdk-aai-service - ccsdk-ansible-adapter - ccsdk-base-http - ccsdk-mdsal-resource - ccsdk-messagerouter-consumer - ccsdk-messagerouter-publisher - ccsdk-netbox-client - ccsdk-resource-assignment - ccsdk-saltstack-adapter - ccsdk-sql-resource + + ccsdk-aai-service + ccsdk-ansible-adapter + ccsdk-base-http + ccsdk-mdsal-resource + ccsdk-messagerouter-consumer + ccsdk-messagerouter-publisher + ccsdk-netbox-client + ccsdk-resource-assignment + ccsdk-saltstack-adapter + ccsdk-sql-resource ccsdk-sli-adaptors-all features-sli-adaptors installer -- cgit 1.2.3-korg