From 8de37f9d3035b4a41e696b967f2222806c250925 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Fri, 11 Sep 2020 13:58:42 -0400 Subject: Refactoring poms groupId artifactId Issue-ID: CCSDK-2787 Signed-off-by: Singal, Kapil (ks220y) Change-Id: Ica64f0c793beabb47950c7bf1eede63a0dbf3cea --- ms/blueprintsprocessor/application/pom.xml | 28 ++++---- ms/blueprintsprocessor/cba-parent/pom.xml | 74 ---------------------- .../functions/ansible-awx-executor/pom.xml | 12 ++-- .../functions/cli-executor/pom.xml | 6 +- .../functions/config-snapshots/pom.xml | 4 +- .../functions/k8s-profile-upload/pom.xml | 6 +- .../functions/message-prioritizaion/pom.xml | 6 +- .../functions/netconf-executor/pom.xml | 4 +- ms/blueprintsprocessor/functions/pom.xml | 9 ++- .../functions/python-executor/pom.xml | 4 +- .../functions/resource-resolution/pom.xml | 6 +- .../functions/restconf-executor/pom.xml | 4 +- .../functions/restful-executor/pom.xml | 8 +-- .../modules/blueprints/blueprint-core/pom.xml | 11 ++-- .../modules/blueprints/blueprint-proto/pom.xml | 10 +-- .../blueprints/blueprint-validation/pom.xml | 17 ++--- ms/blueprintsprocessor/modules/blueprints/pom.xml | 7 +- .../modules/blueprints/resource-dict/pom.xml | 13 ++-- .../modules/commons/db-lib/pom.xml | 16 ++--- .../modules/commons/dmaap-lib/pom.xml | 9 ++- .../modules/commons/grpc-lib/pom.xml | 12 ++-- .../modules/commons/message-lib/pom.xml | 12 ++-- .../modules/commons/nats-lib/pom.xml | 11 ++-- ms/blueprintsprocessor/modules/commons/pom.xml | 11 ++-- .../modules/commons/processor-core/pom.xml | 14 ++-- .../modules/commons/rest-lib/pom.xml | 12 ++-- .../modules/commons/ssh-lib/pom.xml | 12 ++-- .../modules/inbounds/configs-api/pom.xml | 10 +-- .../modules/inbounds/designer-api/pom.xml | 6 +- .../modules/inbounds/health-api-common/pom.xml | 9 ++- .../modules/inbounds/health-api/pom.xml | 11 ++-- ms/blueprintsprocessor/modules/inbounds/pom.xml | 10 ++- .../modules/inbounds/resource-api/pom.xml | 10 +-- .../modules/inbounds/selfservice-api/pom.xml | 16 ++--- ms/blueprintsprocessor/modules/outbounds/pom.xml | 7 +- ms/blueprintsprocessor/modules/pom.xml | 7 +- .../modules/services/execution-service/pom.xml | 26 ++++---- ms/blueprintsprocessor/modules/services/pom.xml | 7 +- .../modules/services/workflow-service/pom.xml | 12 ++-- ms/blueprintsprocessor/parent/pom.xml | 55 ++++++++-------- ms/blueprintsprocessor/pom.xml | 8 +-- ms/command-executor/pom.xml | 5 +- ms/error-catalog/application/pom.xml | 2 +- ms/error-catalog/core/pom.xml | 2 +- ms/error-catalog/pom.xml | 4 +- ms/error-catalog/services/pom.xml | 2 +- ms/pom.xml | 8 +-- ms/py-executor/pom.xml | 5 +- ms/sdclistener/application/pom.xml | 27 ++++---- ms/sdclistener/distribution/pom.xml | 9 ++- ms/sdclistener/parent/pom.xml | 13 ++-- ms/sdclistener/pom.xml | 7 +- 52 files changed, 258 insertions(+), 358 deletions(-) delete mode 100644 ms/blueprintsprocessor/cba-parent/pom.xml (limited to 'ms') diff --git a/ms/blueprintsprocessor/application/pom.xml b/ms/blueprintsprocessor/application/pom.xml index 35bb6be31..fdfd7d157 100755 --- a/ms/blueprintsprocessor/application/pom.xml +++ b/ms/blueprintsprocessor/application/pom.xml @@ -23,16 +23,15 @@ org.onap.ccsdk.cds.blueprintsprocessor - parent + blueprintsprocessor-parent 1.0.0-SNAPSHOT ../parent - application + blueprintsprocessor-application jar - Blueprints Processor Application - Blueprints Processor Application + MS Blueprints Processor Application maven @@ -41,13 +40,12 @@ onap/ccsdk-blueprintsprocessor deploy true - ${project.version} ${maven.build.timestamp} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-core @@ -73,29 +71,29 @@ error-catalog-services - + - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules designer-api - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules resource-api - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules selfservice-api - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules configs-api - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api-common @@ -132,6 +130,8 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions k8s-profile-upload + + com.h2database h2 @@ -156,6 +156,7 @@ reactor-test test + org.skyscreamer @@ -197,7 +198,6 @@ ch.qos.logback logback-classic - diff --git a/ms/blueprintsprocessor/cba-parent/pom.xml b/ms/blueprintsprocessor/cba-parent/pom.xml deleted file mode 100644 index 5e6996822..000000000 --- a/ms/blueprintsprocessor/cba-parent/pom.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - 4.0.0 - - - org.onap.ccsdk.cds.blueprintsprocessor - parent - 1.0.0-SNAPSHOT - ../parent - - - cba-parent - pom - - CBA Parent - - - ${project.basedir}/Scripts/kotlin - ${project.basedir}/Tests/kotlin - - - ${project.basedir}/Environments - - - - - org.jetbrains.kotlin - kotlin-maven-plugin - - - compile - compile - - compile - - - - ${project.basedir}/Scripts/kotlin - - - - - test-compile - test-compile - - test-compile - - - - ${project.basedir}/Tests/kotlin - - - - - - - - diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml index 7be13dece..43f4598b5 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT @@ -28,7 +28,7 @@ ansible-awx-executor 1.0.0-SNAPSHOT - Blueprints Processor Function - Ansible AWX Executor + MS Blueprints Processor Functions - Ansible AWX Executor Blueprints Processor Function - Ansible Executor @@ -37,15 +37,15 @@ jython-standalone - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules rest-lib - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/functions/cli-executor/pom.xml b/ms/blueprintsprocessor/functions/cli-executor/pom.xml index 867809479..04c78d8e0 100644 --- a/ms/blueprintsprocessor/functions/cli-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/cli-executor/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT @@ -28,7 +28,7 @@ cli-executor 1.0.0-SNAPSHOT - Blueprints Processor Function - CLI Executor + MS Blueprints Processor Functions - CLI Executor Blueprints Processor Function - CLI Executor @@ -37,7 +37,7 @@ resource-resolution - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules ssh-lib diff --git a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml index 4aa3ebbb1..35c2113a3 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml +++ b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT @@ -28,7 +28,7 @@ config-snapshots 1.0.0-SNAPSHOT - Blueprints Processor Function - Config Snapshots + MS Blueprints Processor Functions - Config Snapshots Blueprints Processor Function - Config Snapshots diff --git a/ms/blueprintsprocessor/functions/k8s-profile-upload/pom.xml b/ms/blueprintsprocessor/functions/k8s-profile-upload/pom.xml index 674882bd2..eb36fe528 100644 --- a/ms/blueprintsprocessor/functions/k8s-profile-upload/pom.xml +++ b/ms/blueprintsprocessor/functions/k8s-profile-upload/pom.xml @@ -22,7 +22,7 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT @@ -30,7 +30,7 @@ k8s-profile-upload 1.0.0-SNAPSHOT - Blueprints Processor Function - K8s Profile Upload + MS Blueprints Processor Functions - K8s Profile Upload Blueprints Processor Function - K8s Profile Upload @@ -39,7 +39,7 @@ resource-resolution - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules ssh-lib diff --git a/ms/blueprintsprocessor/functions/message-prioritizaion/pom.xml b/ms/blueprintsprocessor/functions/message-prioritizaion/pom.xml index 4c38c53d2..26981c020 100644 --- a/ms/blueprintsprocessor/functions/message-prioritizaion/pom.xml +++ b/ms/blueprintsprocessor/functions/message-prioritizaion/pom.xml @@ -20,19 +20,19 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT org.onap.ccsdk.cds.blueprintsprocessor.functions message-prioritizaion - Blueprints Processor Function - Message Prioritization + MS Blueprints Processor Functions - Message Prioritization Blueprints Processor Function - Message Prioritization - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules message-lib diff --git a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml index 69b42e016..ce497548b 100644 --- a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT @@ -28,7 +28,7 @@ netconf-executor 1.0.0-SNAPSHOT - Blueprints Processor Function - Netconf Executor + MS Blueprints Processor Functions - Netconf Executor Blueprints Processor Function - Netconf Executor diff --git a/ms/blueprintsprocessor/functions/pom.xml b/ms/blueprintsprocessor/functions/pom.xml index 4d886de39..5438fed62 100755 --- a/ms/blueprintsprocessor/functions/pom.xml +++ b/ms/blueprintsprocessor/functions/pom.xml @@ -21,16 +21,15 @@ org.onap.ccsdk.cds.blueprintsprocessor - parent + blueprintsprocessor-parent 1.0.0-SNAPSHOT ../parent - functions + blueprintsprocessor-functions pom - Blueprints Processor Functions - Blueprints Processor Functions + MS Blueprints Processor Functions (Root) resource-resolution @@ -47,7 +46,7 @@ - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules execution-service diff --git a/ms/blueprintsprocessor/functions/python-executor/pom.xml b/ms/blueprintsprocessor/functions/python-executor/pom.xml index c6480fade..cbf989b2c 100644 --- a/ms/blueprintsprocessor/functions/python-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/python-executor/pom.xml @@ -20,14 +20,14 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT org.onap.ccsdk.cds.blueprintsprocessor.functions python-executor - Blueprints Processor Function - Python Executor + MS Blueprints Processor Functions - Python Executor Blueprints Processor Function - Python Executor diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml index 8b0b7e798..a95535168 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml +++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT @@ -29,12 +29,12 @@ 1.0.0-SNAPSHOT jar - Blueprints Processor Function - Resource Resolution + MS Blueprints Processor Functions - Resource Resolution Blueprints Processor Function - Resource Resolution - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules db-lib diff --git a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml index fdc72b2bd..73502b22c 100644 --- a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT @@ -28,7 +28,7 @@ restconf-executor 1.0.0-SNAPSHOT - Blueprints Processor Function - Restconf Executor + MS Blueprints Processor Functions - Restconf Executor Blueprints Processor Function - Restconf Executor diff --git a/ms/blueprintsprocessor/functions/restful-executor/pom.xml b/ms/blueprintsprocessor/functions/restful-executor/pom.xml index f5dce168e..d8ef94ae9 100644 --- a/ms/blueprintsprocessor/functions/restful-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/restful-executor/pom.xml @@ -20,20 +20,20 @@ org.onap.ccsdk.cds.blueprintsprocessor - functions + blueprintsprocessor-functions 1.0.0-SNAPSHOT org.onap.ccsdk.cds.blueprintsprocessor.functions restful-executor - Blueprints Processor Function - NRM Restful executor + MS Blueprints Processor Functions - NRM Restful executor Blueprints Processor Function - NRM Restful executor - org.onap.ccsdk.cds.blueprintsprocessor - processor-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + processor-core org.apache.httpcomponents diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml index 6f0791c4e..8673211a2 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml @@ -20,14 +20,16 @@ 4.0.0 - org.onap.ccsdk.cds.blueprintsprocessor - blueprints - 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor + modules-blueprints + 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-core + 1.0.0-SNAPSHOT - Controller Blueprints Core + MS Blueprints Processor Modules - Blueprints - Blueprints Core @@ -53,7 +55,6 @@ org.jetbrains.kotlin kotlin-script-runtime - com.fasterxml.jackson.dataformat jackson-dataformat-xml diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml index f930a6bc6..063f8585f 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-proto/pom.xml @@ -19,15 +19,15 @@ 4.0.0 - org.onap.ccsdk.cds.blueprintsprocessor - blueprints - 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor + modules-blueprints + 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-proto - Controller Blueprints Proto - Controller Blueprints Proto + MS Blueprints Processor Modules - Blueprints - Blueprints Proto true diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml index d87f25a3c..0fc9cf194 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-validation/pom.xml @@ -21,14 +21,15 @@ 4.0.0 - org.onap.ccsdk.cds.blueprintsprocessor - blueprints - 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor + modules-blueprints + 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-validation - Controller Blueprints Validation Service + MS Blueprints Processor Modules - Blueprints - Blueprints Validation Service @@ -40,12 +41,12 @@ spring-context - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor - resource-dict + org.onap.ccsdk.cds.blueprintsprocessor.modules + resource-dict diff --git a/ms/blueprintsprocessor/modules/blueprints/pom.xml b/ms/blueprintsprocessor/modules/blueprints/pom.xml index a2b19ccec..ed7942cde 100644 --- a/ms/blueprintsprocessor/modules/blueprints/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/pom.xml @@ -20,15 +20,14 @@ org.onap.ccsdk.cds.blueprintsprocessor - modules + blueprintsprocessor-modules 1.0.0-SNAPSHOT - blueprints + modules-blueprints pom - Blueprints POM - Blueprints POM + MS Blueprints Processor Modules - Blueprints blueprint-core diff --git a/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml b/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml index 6fa99c0fb..99a9e1e91 100644 --- a/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/resource-dict/pom.xml @@ -21,19 +21,20 @@ 4.0.0 - org.onap.ccsdk.cds.blueprintsprocessor - blueprints - 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor + modules-blueprints + 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules resource-dict - Controller Blueprints Resource Dictionary + MS Blueprints Processor Modules - Blueprints - Resource Dictionary - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core org.jetbrains.kotlin diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml index 71ef22062..2e2d40a10 100644 --- a/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/db-lib/pom.xml @@ -21,27 +21,27 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules db-lib jar - Blueprints Processor DB Lib - Blueprints Processor DB Lib + MS Blueprints Processor Modules - Commons - DB Lib - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-validation + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-validation - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml index 2e54d3c51..ecbf5348f 100644 --- a/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/dmaap-lib/pom.xml @@ -24,15 +24,15 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules dmaap-lib jar - Blueprints Processor Dmaap Lib - Blueprints Processor Dmaap Lib + MS Blueprints Processor Modules - Commons - Dmaap Lib @@ -46,7 +46,6 @@ - org.springframework.boot spring-boot-starter-webflux @@ -77,7 +76,7 @@ test - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml index af20c5d08..e388a8709 100644 --- a/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/grpc-lib/pom.xml @@ -21,23 +21,23 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules grpc-lib jar - Blueprints Processor GRPC Lib - Blueprints Processor GRPC Lib + MS Blueprints Processor Modules - Commons - GRPC Lib - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml index cf287e280..b266225ee 100644 --- a/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/message-lib/pom.xml @@ -20,22 +20,22 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules message-lib - Blueprints Processor Messaging Lib - Blueprints Processor Messaging Lib + MS Blueprints Processor Modules - Commons - Messaging Lib - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml index 1865b4358..c37c9c7f9 100644 --- a/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/nats-lib/pom.xml @@ -20,15 +20,15 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules nats-lib jar - Blueprints Processor NATS Lib - Blueprints Processor NATS Lib + MS Blueprints Processor Modules - Commons - NATS Lib @@ -39,13 +39,12 @@ io.nats java-nats-streaming - - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/modules/commons/pom.xml b/ms/blueprintsprocessor/modules/commons/pom.xml index 7f3043820..5e4a52d95 100755 --- a/ms/blueprintsprocessor/modules/commons/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/pom.xml @@ -23,15 +23,14 @@ org.onap.ccsdk.cds.blueprintsprocessor - modules + blueprintsprocessor-modules 1.0.0-SNAPSHOT - commons + modules-commons pom - Blueprints Processor Commons POM - Blueprints Processor Commons + MS Blueprints Processor Modules - Commons processor-core @@ -46,8 +45,8 @@ - org.onap.ccsdk.cds.blueprintsprocessor - resource-dict + org.onap.ccsdk.cds.blueprintsprocessor.modules + resource-dict diff --git a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml index 121214d06..3604fa3e0 100644 --- a/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/processor-core/pom.xml @@ -22,24 +22,24 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core jar - Blueprints Processor Core - Blueprints Processor Core + MS Blueprints Processor Modules - Commons - Processor Core - + com.hazelcast hazelcast-all - + - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-proto + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-proto org.springframework.boot diff --git a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml index e56742d26..47bbec7fc 100644 --- a/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/rest-lib/pom.xml @@ -22,23 +22,23 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules rest-lib jar - Blueprints Processor Rest Lib - Blueprints Processor Rest Lib + MS Blueprints Processor Modules - Commons - Rest Lib - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml index a1f096bf2..fa78ab98e 100644 --- a/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml +++ b/ms/blueprintsprocessor/modules/commons/ssh-lib/pom.xml @@ -20,23 +20,23 @@ org.onap.ccsdk.cds.blueprintsprocessor - commons + modules-commons 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules ssh-lib jar - Blueprints Processor SSH Lib - Blueprints Processor SSH Lib + MS Blueprints Processor Modules - Commons - SSH Lib - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml index 6bef263da..39f2df5b3 100644 --- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml @@ -20,16 +20,16 @@ org.onap.ccsdk.cds.blueprintsprocessor - inbounds + modules-inbounds 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules configs-api 1.0.0-SNAPSHOT jar - Blueprints Processor Resource Configurations API - Blueprints Processor Resource Configurations API + MS Blueprints Processor Modules - Inbound - Configurations API @@ -41,8 +41,8 @@ spring-security-core - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core org.onap.ccsdk.cds.error.catalog diff --git a/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml index 419db8671..00f4c76ca 100644 --- a/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/designer-api/pom.xml @@ -20,15 +20,15 @@ org.onap.ccsdk.cds.blueprintsprocessor - inbounds + modules-inbounds 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules designer-api jar - Blueprints Processor Designer API - Blueprints Processor Designer API + MS Blueprints Processor Modules - Inbound - Designer API diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api-common/pom.xml b/ms/blueprintsprocessor/modules/inbounds/health-api-common/pom.xml index 9ee9e98c0..7acabaff8 100644 --- a/ms/blueprintsprocessor/modules/inbounds/health-api-common/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/health-api-common/pom.xml @@ -21,22 +21,21 @@ org.onap.ccsdk.cds.blueprintsprocessor - inbounds + modules-inbounds 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api-common jar - Blueprints Processor Health API common - checking system check health endpoints + MS Blueprints Processor Modules - Inbound - Health API common - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules rest-lib - org.springframework.boot spring-boot-starter-actuator diff --git a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml index f27b20da1..5ebbaea93 100644 --- a/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/health-api/pom.xml @@ -21,22 +21,21 @@ org.onap.ccsdk.cds.blueprintsprocessor - inbounds + modules-inbounds 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api jar - Blueprints Processor Health API - checking system check health endpoints + MS Blueprints Processor Modules - Inbound - Health API - - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api-common - 1.0.0-SNAPSHOT + ${ccsdk.cds.version} diff --git a/ms/blueprintsprocessor/modules/inbounds/pom.xml b/ms/blueprintsprocessor/modules/inbounds/pom.xml index 18b6fd00d..c2187763a 100644 --- a/ms/blueprintsprocessor/modules/inbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/pom.xml @@ -21,15 +21,14 @@ org.onap.ccsdk.cds.blueprintsprocessor - modules + blueprintsprocessor-modules 1.0.0-SNAPSHOT - inbounds + modules-inbounds pom - Blueprints Processor Inbounds POM - Blueprints Processor Inbounds + MS Blueprints Processor Modules - Inbounds configs-api @@ -46,7 +45,7 @@ spring-security-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules workflow-service @@ -90,7 +89,6 @@ reactor-test test - com.h2database h2 diff --git a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml index 42d8f087c..76f6fe9a9 100644 --- a/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/resource-api/pom.xml @@ -20,15 +20,15 @@ org.onap.ccsdk.cds.blueprintsprocessor - inbounds + modules-inbounds 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules resource-api jar - Blueprints Processor Resource API - Blueprints Processor Resource API + MS Blueprints Processor Modules - Inbound - Resource API @@ -36,8 +36,8 @@ spring-security-core - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core org.onap.ccsdk.cds.error.catalog diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml index 73e838146..55c28bc50 100755 --- a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/pom.xml @@ -23,24 +23,24 @@ org.onap.ccsdk.cds.blueprintsprocessor - inbounds + modules-inbounds 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules selfservice-api jar - Blueprints Processor Selfservice API - Blueprints Processor Selfservice API + MS Blueprints Processor Modules - Inbound - Self Service API - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-validation + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-validation org.onap.ccsdk.cds.error.catalog @@ -49,7 +49,7 @@ - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules message-lib diff --git a/ms/blueprintsprocessor/modules/outbounds/pom.xml b/ms/blueprintsprocessor/modules/outbounds/pom.xml index 49279c926..924d53e4e 100644 --- a/ms/blueprintsprocessor/modules/outbounds/pom.xml +++ b/ms/blueprintsprocessor/modules/outbounds/pom.xml @@ -20,13 +20,12 @@ org.onap.ccsdk.cds.blueprintsprocessor - modules + blueprintsprocessor-modules 1.0.0-SNAPSHOT - outbounds + modules-outbounds pom - Blueprints Processor Outbounds POM - Blueprints Processor Outbounds + MS Blueprints Processor Modules - Outbounds diff --git a/ms/blueprintsprocessor/modules/pom.xml b/ms/blueprintsprocessor/modules/pom.xml index bc65aae88..09251dcc0 100644 --- a/ms/blueprintsprocessor/modules/pom.xml +++ b/ms/blueprintsprocessor/modules/pom.xml @@ -22,16 +22,15 @@ org.onap.ccsdk.cds.blueprintsprocessor - parent + blueprintsprocessor-parent 1.0.0-SNAPSHOT ../parent - modules + blueprintsprocessor-modules pom - Blueprints Processor Modules - Blueprints Processor Modules + MS Blueprints Processor Modules (Root) blueprints diff --git a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml index a81723663..b6affc338 100644 --- a/ms/blueprintsprocessor/modules/services/execution-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/execution-service/pom.xml @@ -21,51 +21,49 @@ org.onap.ccsdk.cds.blueprintsprocessor - services + modules-services 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules execution-service jar - Blueprints Processor Execution Service - Blueprints Processor Execution Service + MS Blueprints Processor Modules - Services - Execution Service - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules db-lib - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules rest-lib - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules grpc-lib - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules nats-lib - org.onap.ccsdk.cds.blueprintsprocessor - resource-dict + org.onap.ccsdk.cds.blueprintsprocessor.modules + resource-dict - org.onap.ccsdk.sli.core sli-provider - io.grpc grpc-testing diff --git a/ms/blueprintsprocessor/modules/services/pom.xml b/ms/blueprintsprocessor/modules/services/pom.xml index da4581fd5..498c0feaa 100755 --- a/ms/blueprintsprocessor/modules/services/pom.xml +++ b/ms/blueprintsprocessor/modules/services/pom.xml @@ -23,15 +23,14 @@ org.onap.ccsdk.cds.blueprintsprocessor - modules + blueprintsprocessor-modules 1.0.0-SNAPSHOT - services + modules-services pom - Blueprints Processor Service POM - Blueprints Processor Service + MS Blueprints Processor Modules - Services execution-service diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml index 41bdacf96..f7f6b6035 100644 --- a/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml +++ b/ms/blueprintsprocessor/modules/services/workflow-service/pom.xml @@ -21,22 +21,22 @@ org.onap.ccsdk.cds.blueprintsprocessor - services + modules-services 1.0.0-SNAPSHOT + org.onap.ccsdk.cds.blueprintsprocessor.modules workflow-service - Blueprints Processor Workflow Service - Blueprints Processor Workflow Service + MS Blueprints Processor Modules - Services - Workflow Service - org.onap.ccsdk.cds.blueprintsprocessor - blueprint-core + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprint-core - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules execution-service diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index f5f663051..eb4f4ded5 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -25,17 +25,14 @@ org.onap.ccsdk.cds.blueprintsprocessor - parent + blueprintsprocessor-parent 1.0.0-SNAPSHOT pom - Blueprints Processor Parent - Blueprints Processor Parent + MS Blueprints Processor Parent - ${ccsdk.sli.core.version} - ${project.version} ${project.version} 1.1.5 @@ -76,7 +73,6 @@ pom import - org.springframework.kafka spring-kafka @@ -270,7 +266,6 @@ jsch ${jsch.version} - org.apache.kafka kafka-clients @@ -310,7 +305,7 @@ org.onap.ccsdk.sli.core sli-provider - ${sli.version} + ${ccsdk.sli.core.version} commons-lang @@ -353,82 +348,82 @@ - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules processor-core ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules db-lib ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules rest-lib ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules nats-lib ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules ssh-lib ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules message-lib ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules dmaap-lib ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules grpc-lib ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules execution-service ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules workflow-service ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules configs-api ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules designer-api ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules resource-api ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules selfservice-api ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor - application + org.onap.ccsdk.cds.blueprintsprocessor.modules + blueprintsprocessor-application ${ccsdk.cds.version} @@ -484,12 +479,12 @@ ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api-common ${ccsdk.cds.version} @@ -507,22 +502,22 @@ - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules resource-dict ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-core ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-proto ${ccsdk.cds.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-validation ${ccsdk.cds.version} diff --git a/ms/blueprintsprocessor/pom.xml b/ms/blueprintsprocessor/pom.xml index 44eac6955..f87ff14db 100755 --- a/ms/blueprintsprocessor/pom.xml +++ b/ms/blueprintsprocessor/pom.xml @@ -21,7 +21,7 @@ org.onap.ccsdk.cds - ms + cds-ms 1.0.0-SNAPSHOT .. @@ -29,12 +29,10 @@ blueprintsprocessor pom - Blueprints Processor Root - Blueprints Processor Root + MS Blueprints Processor (Root) parent - cba-parent modules functions application @@ -46,6 +44,6 @@ UTF-8 yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} - ${project.version} + ${project.version} diff --git a/ms/command-executor/pom.xml b/ms/command-executor/pom.xml index ceb4147e0..eb5337973 100755 --- a/ms/command-executor/pom.xml +++ b/ms/command-executor/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds - ms + cds-ms 1.0.0-SNAPSHOT .. @@ -28,7 +28,7 @@ command-executor pom - Command Executor + MS Command Executor Micro-service providing python environment with gRPC binding for command execution @@ -36,7 +36,6 @@ onap/ccsdk-commandexecutor deploy true - ${project.version} ${maven.build.timestamp} yyyyMMdd'T'HHmmss'Z' diff --git a/ms/error-catalog/application/pom.xml b/ms/error-catalog/application/pom.xml index e775585ae..21f3ecd9a 100644 --- a/ms/error-catalog/application/pom.xml +++ b/ms/error-catalog/application/pom.xml @@ -26,7 +26,7 @@ error-catalog-application - Error Catalog Application + MS Error Catalog Application Error Catalog Application diff --git a/ms/error-catalog/core/pom.xml b/ms/error-catalog/core/pom.xml index 81ad38f00..af9047b62 100644 --- a/ms/error-catalog/core/pom.xml +++ b/ms/error-catalog/core/pom.xml @@ -26,7 +26,7 @@ error-catalog-core - Error Catalog Core + MS Error Catalog Core Error Catalog Core diff --git a/ms/error-catalog/pom.xml b/ms/error-catalog/pom.xml index 328523d5f..034eaaaa1 100644 --- a/ms/error-catalog/pom.xml +++ b/ms/error-catalog/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds - ms + cds-ms 1.0.0-SNAPSHOT .. @@ -29,7 +29,7 @@ error-catalog pom - Error Catalog Lib + MS Error Catalog Lib Error Catalog Lib for ONAP Components diff --git a/ms/error-catalog/services/pom.xml b/ms/error-catalog/services/pom.xml index c5e6cb216..21434c803 100644 --- a/ms/error-catalog/services/pom.xml +++ b/ms/error-catalog/services/pom.xml @@ -26,7 +26,7 @@ error-catalog-services - Error Catalog Service + MS Error Catalog Service Error Catalog Service diff --git a/ms/pom.xml b/ms/pom.xml index 92ffa546b..552750ab3 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -20,17 +20,17 @@ org.onap.ccsdk.cds - parent + cds-aggregator 1.0.0-SNAPSHOT .. - ms + cds-ms 1.0.0-SNAPSHOT pom - Micro-services Root - Micro-services + MS (Root) + CDS Micro-services error-catalog diff --git a/ms/py-executor/pom.xml b/ms/py-executor/pom.xml index e678ea9dc..9839c7185 100644 --- a/ms/py-executor/pom.xml +++ b/ms/py-executor/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.cds - ms + cds-ms 1.0.0-SNAPSHOT py-executor - Python Script Executor + MS Python Script Executor Micro-service providing python environment with gRPC binding for python script execution @@ -34,7 +34,6 @@ onap/ccsdk-py-executor deploy true - ${project.version} ${maven.build.timestamp} yyyyMMdd'T'HHmmss'Z' true diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index 6f5fac107..a1ea90c84 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -20,16 +20,16 @@ org.onap.ccsdk.cds.sdclistener - parent + sdclistener-parent 1.0.0-SNAPSHOT ../parent - application + sdclistener-application 1.0.0-SNAPSHOT jar - SDC Listener Application + MS SDC Listener - Application 3.6.1 @@ -53,11 +53,10 @@ spring-boot-starter-test test - - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules health-api-common - 1.0.0-SNAPSHOT + ${ccsdk.cds.version} org.springframework.boot @@ -71,19 +70,18 @@ org.onap.sdc.sdc-distribution-client sdc-distribution-client - org.jmockit jmockit ${jmockit.version} test - - org.jacorb - jacorb-omgapi - 3.8 - test - + + org.jacorb + jacorb-omgapi + 3.8 + test + io.grpc @@ -119,10 +117,9 @@ test - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-proto - ch.qos.logback logback-classic diff --git a/ms/sdclistener/distribution/pom.xml b/ms/sdclistener/distribution/pom.xml index ec02cfb5c..ac241230b 100755 --- a/ms/sdclistener/distribution/pom.xml +++ b/ms/sdclistener/distribution/pom.xml @@ -20,15 +20,15 @@ org.onap.ccsdk.cds.sdclistener - parent + sdclistener-parent 1.0.0-SNAPSHOT ../parent - distribution + sdclistener-distribution pom - SDC Listener Distribution + MS SDC Listener - Distribution maven @@ -39,14 +39,13 @@ deploy true - ${project.version} ${maven.build.timestamp} org.onap.ccsdk.cds.sdclistener - application + sdclistener-application diff --git a/ms/sdclistener/parent/pom.xml b/ms/sdclistener/parent/pom.xml index d6aed85a6..93b694cde 100755 --- a/ms/sdclistener/parent/pom.xml +++ b/ms/sdclistener/parent/pom.xml @@ -27,11 +27,10 @@ org.onap.ccsdk.cds.sdclistener - parent + sdclistener-parent pom - SDC Listener Parent - SDC Listener Parent + MS SDC Listener - Parent 1.0.0 @@ -44,6 +43,7 @@ 1.4.0 1.49 3.2.6.RELEASE + ${project.version} @@ -78,8 +78,7 @@ commons-compress 1.15 - - + com.google.guava guava ${guava.version} @@ -127,7 +126,7 @@ ${protobuff.java.utils.version} - org.onap.ccsdk.cds.blueprintsprocessor + org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-proto ${project.version} @@ -155,7 +154,7 @@ org.onap.ccsdk.cds.sdclistener - application + sdclistener-application ${project.version} diff --git a/ms/sdclistener/pom.xml b/ms/sdclistener/pom.xml index bed1056ab..b46a68940 100644 --- a/ms/sdclistener/pom.xml +++ b/ms/sdclistener/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.cds - ms + cds-ms 1.0.0-SNAPSHOT .. @@ -28,8 +28,7 @@ sdclistener pom - SDC Listener Root - SDC Listener Root + MS SDC Listener (Root) parent @@ -43,6 +42,6 @@ UTF-8 yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} - ${project.version} + ${project.version} -- cgit 1.2.3-korg