From 24f39fda67bec6f622c25effcd2a1626efae772a Mon Sep 17 00:00:00 2001 From: "SINGAL, KAPIL (ks220y)" Date: Tue, 17 Sep 2019 16:36:59 +0000 Subject: [PATCH] Plugin to format/validate POM Adding tidy-maven-plugin and related profile to format/vaidate pom files To format POM Files just run mvn process-sources -P format Issue-ID: CCSDK-1739 Signed-off-by: SINGAL, KAPIL (ks220y) Change-Id: I58dc261ac7b3179a91a0ab5a06237990707543f5 --- cds-ui/application/pom.xml | 1 - cds-ui/client/pom.xml | 1 - cds-ui/pom.xml | 13 +++-- cds-ui/server/pom.xml | 5 +- ms/blueprintsprocessor/application/pom.xml | 4 ++ ms/blueprintsprocessor/cba-parent/pom.xml | 5 +- ms/blueprintsprocessor/distribution/pom.xml | 8 +++- .../functions/ansible-awx-executor/pom.xml | 7 +-- .../functions/cli-executor/pom.xml | 9 ++-- .../functions/config-snapshots/pom.xml | 7 +-- .../functions/netconf-executor/pom.xml | 5 +- ms/blueprintsprocessor/functions/pom.xml | 8 +++- .../functions/python-executor/pom.xml | 8 ++-- .../functions/resource-resolution/pom.xml | 4 +- .../functions/restconf-executor/pom.xml | 9 ++-- .../modules/commons/db-lib/pom.xml | 3 +- .../modules/commons/dmaap-lib/pom.xml | 4 +- .../modules/commons/grpc-lib/pom.xml | 7 +-- .../modules/commons/message-lib/pom.xml | 7 ++- ms/blueprintsprocessor/modules/commons/pom.xml | 4 +- .../modules/commons/processor-core/pom.xml | 3 ++ .../modules/commons/rest-lib/pom.xml | 4 +- .../modules/commons/ssh-lib/pom.xml | 7 ++- .../modules/inbounds/configs-api/pom.xml | 3 ++ .../modules/inbounds/designer-api/pom.xml | 8 ++-- .../modules/inbounds/health-api/pom.xml | 9 ++-- ms/blueprintsprocessor/modules/inbounds/pom.xml | 3 ++ .../modules/inbounds/resource-api/pom.xml | 2 + .../modules/inbounds/selfservice-api/pom.xml | 2 + ms/blueprintsprocessor/modules/outbounds/pom.xml | 3 +- ms/blueprintsprocessor/modules/pom.xml | 5 +- .../modules/services/execution-service/pom.xml | 2 + ms/blueprintsprocessor/modules/services/pom.xml | 4 +- .../modules/services/workflow-service/pom.xml | 6 +-- ms/blueprintsprocessor/parent/pom.xml | 6 ++- ms/blueprintsprocessor/pom.xml | 22 +++++---- ms/command-executor/pom.xml | 3 ++ .../modules/blueprint-core/pom.xml | 4 +- .../modules/blueprint-proto/pom.xml | 24 +++++----- .../modules/blueprint-validation/pom.xml | 3 ++ ms/controllerblueprints/modules/pom.xml | 6 ++- .../modules/resource-dict/pom.xml | 5 +- ms/controllerblueprints/parent/pom.xml | 10 ++-- ms/controllerblueprints/pom.xml | 21 +++++---- ms/sdclistener/application/pom.xml | 4 +- ms/sdclistener/distribution/pom.xml | 8 +++- ms/sdclistener/parent/pom.xml | 8 +++- ms/sdclistener/pom.xml | 17 +++---- pom.xml | 55 ++++++++++++++++++---- 49 files changed, 253 insertions(+), 123 deletions(-) diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index 87cb4f282..de8827f4a 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -111,5 +111,4 @@ limitations under the License. - diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index f25e78228..4217ac5c9 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -40,7 +40,6 @@ limitations under the License. https://nexus.onap.org - diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml index de2be3542..34a72bdf5 100644 --- a/cds-ui/pom.xml +++ b/cds-ui/pom.xml @@ -36,6 +36,12 @@ limitations under the License. cds-ui-parent Creates Controller Design Studio UI Docker container + + client + server + application + + onap/ccsdk-cds-ui ${project.version} @@ -44,11 +50,4 @@ limitations under the License. yyyyMMdd'T'HHmmss'Z' true - - - client - server - application - - diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index 2d6d6465b..dedf129ab 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -42,7 +42,6 @@ limitations under the License. deploy - @@ -139,8 +138,8 @@ limitations under the License. - - + + docker diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index a67b10d4a..90e9f501b 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -19,14 +19,17 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor parent 0.7.0-SNAPSHOT ../parent + application jar + Blueprints Processor Application Blueprints Processor Application @@ -147,6 +150,7 @@ logback-classic + diff --git a/ms/blueprintsprocessor/cba-parent/pom.xml b/ms/blueprintsprocessor/cba-parent/pom.xml index a1b6beff4..5bdf59579 100644 --- a/ms/blueprintsprocessor/cba-parent/pom.xml +++ b/ms/blueprintsprocessor/cba-parent/pom.xml @@ -16,16 +16,19 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor parent 0.7.0-SNAPSHOT ../parent + cba-parent - CBA Parent pom + CBA Parent + ${project.basedir}/Scripts/kotlin ${project.basedir}/Tests/kotlin diff --git a/ms/blueprintsprocessor/distribution/pom.xml b/ms/blueprintsprocessor/distribution/pom.xml index 4037c98e6..884d76a66 100755 --- a/ms/blueprintsprocessor/distribution/pom.xml +++ b/ms/blueprintsprocessor/distribution/pom.xml @@ -16,15 +16,19 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor parent 0.7.0-SNAPSHOT ../parent + distribution pom + Blueprints Processor Distribution + maven org.onap.ccsdk.cds @@ -43,6 +47,7 @@ application + @@ -88,8 +93,7 @@ - - + maven-assembly-plugin 3.1.0 diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml index 9613030cd..d40ae210f 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml @@ -15,16 +15,18 @@ ~ limitations under the License. --> + 4.0.0 + - functions org.onap.ccsdk.cds.blueprintsprocessor + functions 0.7.0-SNAPSHOT - 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor.functions ansible-awx-executor 0.7.0-SNAPSHOT + Blueprints Processor Function - Ansible AWX Executor Blueprints Processor Function - Ansible Executor @@ -51,5 +53,4 @@ ${apache.httpcomponents.client.version} - diff --git a/ms/blueprintsprocessor/functions/cli-executor/pom.xml b/ms/blueprintsprocessor/functions/cli-executor/pom.xml index b45fdb3f8..07efd551c 100644 --- a/ms/blueprintsprocessor/functions/cli-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/cli-executor/pom.xml @@ -15,15 +15,18 @@ ~ limitations under the License. --> + 4.0.0 + - functions org.onap.ccsdk.cds.blueprintsprocessor + functions 0.7.0-SNAPSHOT - 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor.functions cli-executor 0.7.0-SNAPSHOT + Blueprints Processor Function - CLI Executor Blueprints Processor Function - CLI Executor @@ -37,6 +40,4 @@ ssh-lib - - diff --git a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml index 0ad979683..0801e6d7f 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml +++ b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml @@ -15,16 +15,18 @@ ~ limitations under the License. --> + 4.0.0 + - functions org.onap.ccsdk.cds.blueprintsprocessor + functions 0.7.0-SNAPSHOT - 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor.functions config-snapshots 0.7.0-SNAPSHOT + Blueprints Processor Function - Config Snapshots Blueprints Processor Function - Config Snapshots @@ -55,5 +57,4 @@ test - diff --git a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml index a10dfba38..07415c37d 100644 --- a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml @@ -15,15 +15,18 @@ ~ limitations under the License. --> + 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor functions 0.7.0-SNAPSHOT - 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor.functions netconf-executor 0.7.0-SNAPSHOT + Blueprints Processor Function - Netconf Executor Blueprints Processor Function - Netconf Executor diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml index 73daf22a5..3ee6737ef 100755 --- a/ms/blueprintsprocessor/functions/pom.xml +++ b/ms/blueprintsprocessor/functions/pom.xml @@ -16,17 +16,21 @@ ~ limitations under the License. --> + 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor parent 0.7.0-SNAPSHOT ../parent - 4.0.0 - pom + functions + pom + Blueprints Processor Functions Blueprints Processor Functions + resource-resolution ansible-awx-executor diff --git a/ms/blueprintsprocessor/functions/python-executor/pom.xml b/ms/blueprintsprocessor/functions/python-executor/pom.xml index 872e5a61c..5601922a7 100644 --- a/ms/blueprintsprocessor/functions/python-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/python-executor/pom.xml @@ -15,15 +15,17 @@ ~ limitations under the License. --> + 4.0.0 + - functions org.onap.ccsdk.cds.blueprintsprocessor + functions 0.7.0-SNAPSHOT - 4.0.0 org.onap.ccsdk.cds.blueprintsprocessor.functions python-executor + Blueprints Processor Function - Python Executor Blueprints Processor Function - Python Executor @@ -33,6 +35,4 @@ jython-standalone - - diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml index 66210f258..e8116b1e5 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml +++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml @@ -16,15 +16,18 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor functions 0.7.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.functions resource-resolution 0.7.0-SNAPSHOT jar + Blueprints Processor Function - Resource Resolution Blueprints Processor Function - Resource Resolution @@ -61,5 +64,4 @@ test - diff --git a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml index 2872a5a8f..8e75597c2 100644 --- a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml @@ -15,15 +15,18 @@ ~ limitations under the License. --> + 4.0.0 + - functions org.onap.ccsdk.cds.blueprintsprocessor + functions 0.7.0-SNAPSHOT - 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor.functions restconf-executor 0.7.0-SNAPSHOT + Blueprints Processor Function - Restconf Executor Blueprints Processor Function - Restconf Executor @@ -38,6 +41,4 @@ test - - diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml index 67b84240c..f444fde66 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml @@ -17,6 +17,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor commons @@ -25,6 +26,7 @@ db-lib jar + Blueprints Processor DB Lib Blueprints Processor DB Lib @@ -69,5 +71,4 @@ test - diff --git a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml index 3ed0424ee..454962091 100644 --- a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml @@ -20,6 +20,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor commons @@ -28,10 +29,10 @@ dmaap-lib jar + Blueprints Processor Dmaap Lib Blueprints Processor Dmaap Lib - org.onap.dmaap.messagerouter.dmaapclient @@ -79,5 +80,4 @@ processor-core - diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml index 5cc29a65e..5945e29fd 100644 --- a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml @@ -15,15 +15,17 @@ ~ limitations under the License. --> + 4.0.0 + - commons org.onap.ccsdk.cds.blueprintsprocessor + commons 0.7.0-SNAPSHOT - 4.0.0 grpc-lib jar + Blueprints Processor GRPC Lib Blueprints Processor GRPC Lib @@ -41,5 +43,4 @@ processor-core - diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml index b5b8c46a3..f92a8f45a 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml @@ -15,16 +15,19 @@ ~ limitations under the License. --> + 4.0.0 + - commons org.onap.ccsdk.cds.blueprintsprocessor + commons 0.7.0-SNAPSHOT - 4.0.0 message-lib + Blueprints Processor Messaging Lib Blueprints Processor Messaging Lib + org.onap.ccsdk.cds.controllerblueprints diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml index 37dd5d77e..33255ac46 100755 --- a/ms/blueprintsprocessor/modules/commons/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/pom.xml @@ -19,6 +19,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor modules @@ -27,6 +28,7 @@ commons pom + Blueprints Processor Commons POM Blueprints Processor Commons @@ -39,6 +41,7 @@ message-lib ssh-lib + org.onap.ccsdk.cds.controllerblueprints @@ -76,5 +79,4 @@ test - diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml index 673d1277c..0bc88449f 100644 --- a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml @@ -18,6 +18,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor commons @@ -26,8 +27,10 @@ processor-core jar + Blueprints Processor Core Blueprints Processor Core + org.springframework.boot diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml index 7c6cceb23..a7d49c5ed 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml @@ -18,6 +18,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor commons @@ -26,8 +27,10 @@ rest-lib jar + Blueprints Processor Rest Lib Blueprints Processor Rest Lib + org.onap.ccsdk.cds.controllerblueprints @@ -61,5 +64,4 @@ test - diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml index ff09b83f3..0e6a0bf1f 100644 --- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml @@ -15,17 +15,20 @@ ~ limitations under the License. --> + 4.0.0 + - commons org.onap.ccsdk.cds.blueprintsprocessor + commons 0.7.0-SNAPSHOT - 4.0.0 ssh-lib jar + Blueprints Processor SSH Lib Blueprints Processor SSH Lib + org.onap.ccsdk.cds.controllerblueprints diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml index d4d030772..2cf5f5f57 100644 --- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml @@ -16,14 +16,17 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor inbounds 0.7.0-SNAPSHOT + configs-api 0.7.0-SNAPSHOT jar + Blueprints Processor Resource Configurations API Blueprints Processor Resource Configurations API diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml index 12cb8ae71..303168d74 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml @@ -15,15 +15,17 @@ ~ limitations under the License. --> + 4.0.0 + - inbounds org.onap.ccsdk.cds.blueprintsprocessor + inbounds 0.7.0-SNAPSHOT - 4.0.0 + designer-api jar + Blueprints Processor Designer API Blueprints Processor Designer API - diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml index 6037804af..9d50e13d4 100644 --- a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml @@ -15,17 +15,18 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 + - inbounds org.onap.ccsdk.cds.blueprintsprocessor + inbounds 0.7.0-SNAPSHOT - health-api + health-api jar + Blueprints Processor Health API checking system check health endpoints diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml index a1d716110..1729f2ff1 100644 --- a/ms/blueprintsprocessor/modules/inbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml @@ -17,6 +17,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor modules @@ -25,6 +26,7 @@ inbounds pom + Blueprints Processor Inbounds POM Blueprints Processor Inbounds @@ -35,6 +37,7 @@ selfservice-api health-api + org.springframework.security diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml index da233b882..32324bf6d 100644 --- a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml @@ -16,6 +16,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor inbounds @@ -24,6 +25,7 @@ resource-api jar + Blueprints Processor Resource API Blueprints Processor Resource API diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml index b5cac581a..1a9b5fc80 100755 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml @@ -19,6 +19,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor inbounds @@ -27,6 +28,7 @@ selfservice-api jar + Blueprints Processor Selfservice API Blueprints Processor Selfservice API diff --git a/ms/blueprintsprocessor/modules/outbounds/pom.xml b/ms/blueprintsprocessor/modules/outbounds/pom.xml index 34eba8366..81a5a3eb1 100644 --- a/ms/blueprintsprocessor/modules/outbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/outbounds/pom.xml @@ -16,6 +16,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor modules @@ -24,7 +25,7 @@ outbounds pom + Blueprints Processor Outbounds POM Blueprints Processor Outbounds - diff --git a/ms/blueprintsprocessor/modules/pom.xml b/ms/blueprintsprocessor/modules/pom.xml index ea39e2aa9..87dfb5652 100644 --- a/ms/blueprintsprocessor/modules/pom.xml +++ b/ms/blueprintsprocessor/modules/pom.xml @@ -18,6 +18,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor parent @@ -27,6 +28,7 @@ modules pom + Blueprints Processor Modules Blueprints Processor Modules @@ -36,6 +38,7 @@ services inbounds + @@ -64,6 +67,4 @@ - - diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml index 784906b4e..8bee7c91c 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml @@ -17,6 +17,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor services @@ -25,6 +26,7 @@ execution-service jar + Blueprints Processor Execution Service Blueprints Processor Execution Service diff --git a/ms/blueprintsprocessor/modules/services/pom.xml b/ms/blueprintsprocessor/modules/services/pom.xml index 0a5f9b63f..8976701c4 100755 --- a/ms/blueprintsprocessor/modules/services/pom.xml +++ b/ms/blueprintsprocessor/modules/services/pom.xml @@ -19,6 +19,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor modules @@ -26,9 +27,10 @@ services + pom + Blueprints Processor Service POM Blueprints Processor Service - pom execution-service diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml index c3effa5d3..fe7dde994 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml @@ -16,14 +16,16 @@ ~ limitations under the License. --> + 4.0.0 + org.onap.ccsdk.cds.blueprintsprocessor services 0.7.0-SNAPSHOT - 4.0.0 workflow-service + Blueprints Processor Workflow Service Blueprints Processor Workflow Service @@ -41,6 +43,4 @@ sli-provider - - diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index cd4056485..726ba55c5 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -16,16 +16,20 @@ --> 4.0.0 + org.onap.ccsdk.cds blueprintsprocessor 0.7.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor parent pom + Blueprints Processor Parent Blueprints Processor Parent + 2.2.0 0.1.55 @@ -50,6 +54,7 @@ 2.6.3 1.9 + @@ -534,7 +539,6 @@ - org.apache.commons diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml index 7714d856e..888f2a11c 100755 --- a/ms/blueprintsprocessor/pom.xml +++ b/ms/blueprintsprocessor/pom.xml @@ -17,17 +17,29 @@ --> 4.0.0 + org.onap.ccsdk.cds ms 0.7.0-SNAPSHOT .. + blueprintsprocessor pom + Blueprints Processor Root Blueprints Processor Root + + parent + cba-parent + modules + functions + application + distribution + + BlueprintsProcessor UTF-8 @@ -39,14 +51,4 @@ 1.8 ${project.version} - - - parent - cba-parent - modules - functions - application - distribution - - diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml index 5861912ca..0db7af92b 100755 --- a/ms/command-executor/pom.xml +++ b/ms/command-executor/pom.xml @@ -16,14 +16,17 @@ --> 4.0.0 + org.onap.ccsdk.cds ms 0.7.0-SNAPSHOT .. + command-executor pom + Command Executor Micro-service providing python environment with gRPC binding for command execution diff --git a/ms/controllerblueprints/modules/blueprint-core/pom.xml b/ms/controllerblueprints/modules/blueprint-core/pom.xml index 1cb912c1b..5dd5f1bb2 100644 --- a/ms/controllerblueprints/modules/blueprint-core/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-core/pom.xml @@ -17,12 +17,15 @@ --> 4.0.0 + org.onap.ccsdk.cds.controllerblueprints modules 0.7.0-SNAPSHOT + blueprint-core + Controller Blueprints Core @@ -95,5 +98,4 @@ test - diff --git a/ms/controllerblueprints/modules/blueprint-proto/pom.xml b/ms/controllerblueprints/modules/blueprint-proto/pom.xml index 7d4d60028..eb4dd9f78 100644 --- a/ms/controllerblueprints/modules/blueprint-proto/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-proto/pom.xml @@ -15,17 +15,17 @@ ~ limitations under the License. --> - + + 4.0.0 + org.onap.ccsdk.cds.controllerblueprints modules 0.7.0-SNAPSHOT - 4.0.0 blueprint-proto + Controller Blueprints Proto Controller Blueprints Proto @@ -37,13 +37,6 @@ - - - kr.motd.maven - os-maven-plugin - 1.6.2 - - org.xolstice.maven.plugins @@ -89,8 +82,8 @@ - kotlin-maven-plugin org.jetbrains.kotlin + kotlin-maven-plugin ${kotlin.maven.version} @@ -109,5 +102,12 @@ + + + kr.motd.maven + os-maven-plugin + 1.6.2 + + diff --git a/ms/controllerblueprints/modules/blueprint-validation/pom.xml b/ms/controllerblueprints/modules/blueprint-validation/pom.xml index 04c751127..40fff14d4 100644 --- a/ms/controllerblueprints/modules/blueprint-validation/pom.xml +++ b/ms/controllerblueprints/modules/blueprint-validation/pom.xml @@ -18,12 +18,15 @@ --> 4.0.0 + org.onap.ccsdk.cds.controllerblueprints modules 0.7.0-SNAPSHOT + blueprint-validation + Controller Blueprints Validation Service diff --git a/ms/controllerblueprints/modules/pom.xml b/ms/controllerblueprints/modules/pom.xml index 6cb4ea80a..028e28bf0 100644 --- a/ms/controllerblueprints/modules/pom.xml +++ b/ms/controllerblueprints/modules/pom.xml @@ -17,16 +17,19 @@ --> 4.0.0 + org.onap.ccsdk.cds.controllerblueprints parent 0.7.0-SNAPSHOT ../parent + modules - Controller Blueprints Modules pom + Controller Blueprints Modules + blueprint-core resource-dict @@ -85,5 +88,4 @@ - diff --git a/ms/controllerblueprints/modules/resource-dict/pom.xml b/ms/controllerblueprints/modules/resource-dict/pom.xml index 4ee4f91a0..b6803d4be 100644 --- a/ms/controllerblueprints/modules/resource-dict/pom.xml +++ b/ms/controllerblueprints/modules/resource-dict/pom.xml @@ -18,12 +18,15 @@ --> 4.0.0 + org.onap.ccsdk.cds.controllerblueprints modules 0.7.0-SNAPSHOT + resource-dict + Controller Blueprints Resource Dictionary @@ -37,6 +40,4 @@ test - - diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml index 86a721149..62f300c0a 100644 --- a/ms/controllerblueprints/parent/pom.xml +++ b/ms/controllerblueprints/parent/pom.xml @@ -18,15 +18,19 @@ --> 4.0.0 + org.onap.ccsdk.cds controllerblueprints 0.7.0-SNAPSHOT + org.onap.ccsdk.cds.controllerblueprints parent - Controller Blueprints Parent pom + + Controller Blueprints Parent + 1.0.0 27.0.1-jre @@ -38,6 +42,7 @@ 2.5.1 1.7 + @@ -265,7 +270,6 @@ - org.apache.commons @@ -367,8 +371,8 @@ - kotlin-maven-plugin org.jetbrains.kotlin + kotlin-maven-plugin ${kotlin.maven.version} diff --git a/ms/controllerblueprints/pom.xml b/ms/controllerblueprints/pom.xml index 8abb36e67..611741a88 100644 --- a/ms/controllerblueprints/pom.xml +++ b/ms/controllerblueprints/pom.xml @@ -14,17 +14,27 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + + 4.0.0 + org.onap.ccsdk.cds ms 0.7.0-SNAPSHOT .. - 4.0.0 + controllerblueprints - Controller Blueprints Root 0.7.0-SNAPSHOT + pom + + Controller Blueprints Root + + + parent + modules + + ControllerBlueprints UTF-8 @@ -36,9 +46,4 @@ 1.8 ${project.version} - pom - - parent - modules - diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index 7b12e14ea..d1048acfd 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -16,6 +16,7 @@ --> 4.0.0 + org.onap.ccsdk.cds.sdclistener parent @@ -24,8 +25,9 @@ application - jar 0.7.0-SNAPSHOT + jar + SDC Listener Application diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index 8f0120fa5..ca6947841 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -16,15 +16,19 @@ --> 4.0.0 + org.onap.ccsdk.cds.sdclistener parent 0.7.0-SNAPSHOT ../parent + distribution pom + SDC Listener Distribution + maven org.onap.ccsdk.cds @@ -44,6 +48,7 @@ application + @@ -89,8 +94,7 @@ - - + maven-assembly-plugin 3.1.0 diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index 05bfdeff4..850dfa43f 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -16,19 +16,22 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - + 4.0.0 + org.onap.ccsdk.cds sdclistener 0.7.0-SNAPSHOT + org.onap.ccsdk.cds.sdclistener parent pom + SDC Listener Parent SDC Listener Parent + 2.1.3.RELEASE 5.1.5.RELEASE @@ -45,6 +48,7 @@ 1.19 3.2.6.RELEASE + diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml index 42c6a1acd..6439e31ab 100644 --- a/ms/sdclistener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -16,6 +16,7 @@ --> 4.0.0 + org.onap.ccsdk.cds ms @@ -24,9 +25,16 @@ sdclistener + pom + SDC Listener Root SDC Listener Root - pom + + + parent + application + distribution + sdclistener @@ -39,11 +47,4 @@ 1.8 ${project.version} - - - parent - application - distribution - - diff --git a/pom.xml b/pom.xml index 5d58742ec..8350e1e5a 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ See the License for the specific language governing permissions and limitations under the License. --> + 4.0.0 org.onap.ccsdk.parent @@ -24,8 +25,6 @@ limitations under the License. - 4.0.0 - org.onap.ccsdk.cds parent 0.7.0-SNAPSHOT @@ -33,17 +32,16 @@ limitations under the License. cds-parent CCSDK Controller Design Studio + https://wiki.onap.org + + ONAP + cds-ui ms - https://wiki.onap.org - - ONAP - - @@ -57,6 +55,10 @@ limitations under the License. ${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml 0.8.3 + + + false + true @@ -66,6 +68,35 @@ limitations under the License. jacoco-maven-plugin ${jacoco.version} + + + + org.codehaus.mojo + tidy-maven-plugin + 1.1.0 + + + format-pom + process-sources + + pom + + + ${format.skipExecute} + + + + validate-pom + validate + + check + + + ${format.skipValidate} + + + + @@ -101,6 +132,14 @@ limitations under the License. - + + + format + + true + false + + + -- 2.16.6