diff options
Diffstat (limited to 'ms')
52 files changed, 258 insertions, 358 deletions
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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>parent</artifactId> + <artifactId>blueprintsprocessor-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <artifactId>application</artifactId> + <artifactId>blueprintsprocessor-application</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Application</name> - <description>Blueprints Processor Application</description> + <name>MS Blueprints Processor Application</name> <properties> <assembly.id>maven</assembly.id> @@ -41,13 +40,12 @@ <image.name>onap/ccsdk-blueprintsprocessor</image.name> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> - <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-core</artifactId> <exclusions> <exclusion> @@ -73,29 +71,29 @@ <artifactId>error-catalog-services</artifactId> </dependency> - <!-- North Bound --> + <!-- North Bound - Modules --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>designer-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>selfservice-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>configs-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api-common</artifactId> </dependency> @@ -132,6 +130,8 @@ <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>k8s-profile-upload</artifactId> </dependency> + + <!-- Test Dependencies --> <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> @@ -156,6 +156,7 @@ <artifactId>reactor-test</artifactId> <scope>test</scope> </dependency> + <!-- BEGIN UAT --> <dependency> <groupId>org.skyscreamer</groupId> @@ -197,7 +198,6 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </dependency> - </dependencies> <build> 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 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - ~ Copyright © 2019 IBM. - ~ - ~ Licensed under the Apache License, Version 2.0 (the "License"); - ~ you may not use this file except in compliance with the License. - ~ You may obtain a copy of the License at - ~ - ~ http://www.apache.org/licenses/LICENSE-2.0 - ~ - ~ Unless required by applicable law or agreed to in writing, software - ~ distributed under the License is distributed on an "AS IS" BASIS, - ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - ~ See the License for the specific language governing permissions and - ~ limitations under the License. - --> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>parent</artifactId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../parent</relativePath> - </parent> - - <artifactId>cba-parent</artifactId> - <packaging>pom</packaging> - - <name>CBA Parent</name> - - <build> - <sourceDirectory>${project.basedir}/Scripts/kotlin</sourceDirectory> - <testSourceDirectory>${project.basedir}/Tests/kotlin</testSourceDirectory> - <resources> - <resource> - <directory>${project.basedir}/Environments</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.jetbrains.kotlin</groupId> - <artifactId>kotlin-maven-plugin</artifactId> - <executions> - <execution> - <id>compile</id> - <phase>compile</phase> - <goals> - <goal>compile</goal> - </goals> - <configuration> - <sourceDirs> - <sourceDir>${project.basedir}/Scripts/kotlin</sourceDir> - </sourceDirs> - </configuration> - </execution> - <execution> - <id>test-compile</id> - <phase>test-compile</phase> - <goals> - <goal>test-compile</goal> - </goals> - <configuration> - <sourceDirs> - <sourceDir>${project.basedir}/Tests/kotlin</sourceDir> - </sourceDirs> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -28,7 +28,7 @@ <artifactId>ansible-awx-executor</artifactId> <version>1.0.0-SNAPSHOT</version> - <name>Blueprints Processor Function - Ansible AWX Executor</name> + <name>MS Blueprints Processor Functions - Ansible AWX Executor</name> <description>Blueprints Processor Function - Ansible Executor</description> <dependencies> @@ -37,15 +37,15 @@ <artifactId>jython-standalone</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>rest-lib</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -28,7 +28,7 @@ <artifactId>cli-executor</artifactId> <version>1.0.0-SNAPSHOT</version> - <name>Blueprints Processor Function - CLI Executor</name> + <name>MS Blueprints Processor Functions - CLI Executor</name> <description>Blueprints Processor Function - CLI Executor</description> <dependencies> @@ -37,7 +37,7 @@ <artifactId>resource-resolution</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>ssh-lib</artifactId> </dependency> </dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -28,7 +28,7 @@ <artifactId>config-snapshots</artifactId> <version>1.0.0-SNAPSHOT</version> - <name>Blueprints Processor Function - Config Snapshots</name> + <name>MS Blueprints Processor Functions - Config Snapshots</name> <description>Blueprints Processor Function - Config Snapshots</description> <dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -30,7 +30,7 @@ <artifactId>k8s-profile-upload</artifactId> <version>1.0.0-SNAPSHOT</version> - <name>Blueprints Processor Function - K8s Profile Upload</name> + <name>MS Blueprints Processor Functions - K8s Profile Upload</name> <description>Blueprints Processor Function - K8s Profile Upload</description> <dependencies> @@ -39,7 +39,7 @@ <artifactId>resource-resolution</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>ssh-lib</artifactId> </dependency> </dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>message-prioritizaion</artifactId> - <name>Blueprints Processor Function - Message Prioritization</name> + <name>MS Blueprints Processor Functions - Message Prioritization</name> <description>Blueprints Processor Function - Message Prioritization</description> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>message-lib</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -28,7 +28,7 @@ <artifactId>netconf-executor</artifactId> <version>1.0.0-SNAPSHOT</version> - <name>Blueprints Processor Function - Netconf Executor</name> + <name>MS Blueprints Processor Functions - Netconf Executor</name> <description>Blueprints Processor Function - Netconf Executor</description> <dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>parent</artifactId> + <artifactId>blueprintsprocessor-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Functions</name> - <description>Blueprints Processor Functions</description> + <name>MS Blueprints Processor Functions (Root)</name> <modules> <module>resource-resolution</module> @@ -47,7 +46,7 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>execution-service</artifactId> </dependency> <!-- Test Dependencies --> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>python-executor</artifactId> - <name>Blueprints Processor Function - Python Executor</name> + <name>MS Blueprints Processor Functions - Python Executor</name> <description>Blueprints Processor Function - Python Executor</description> <dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -29,12 +29,12 @@ <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Blueprints Processor Function - Resource Resolution</name> + <name>MS Blueprints Processor Functions - Resource Resolution</name> <description>Blueprints Processor Function - Resource Resolution</description> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>db-lib</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> @@ -28,7 +28,7 @@ <artifactId>restconf-executor</artifactId> <version>1.0.0-SNAPSHOT</version> - <name>Blueprints Processor Function - Restconf Executor</name> + <name>MS Blueprints Processor Functions - Restconf Executor</name> <description>Blueprints Processor Function - Restconf Executor</description> <dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>functions</artifactId> + <artifactId>blueprintsprocessor-functions</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor.functions</groupId> <artifactId>restful-executor</artifactId> - <name>Blueprints Processor Function - NRM Restful executor</name> + <name>MS Blueprints Processor Functions - NRM Restful executor</name> <description>Blueprints Processor Function - NRM Restful executor</description> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>processor-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>processor-core</artifactId> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprints</artifactId> - <version>1.0.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>modules-blueprints</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-core</artifactId> + <version>1.0.0-SNAPSHOT</version> - <name>Controller Blueprints Core</name> + <name>MS Blueprints Processor Modules - Blueprints - Blueprints Core</name> <dependencies> <!-- Compiler Service --> @@ -53,7 +55,6 @@ <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-script-runtime</artifactId> </dependency> - <dependency> <groupId>com.fasterxml.jackson.dataformat</groupId> <artifactId>jackson-dataformat-xml</artifactId> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprints</artifactId> - <version>1.0.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>modules-blueprints</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-proto</artifactId> - <name>Controller Blueprints Proto</name> - <description>Controller Blueprints Proto</description> + <name>MS Blueprints Processor Modules - Blueprints - Blueprints Proto</name> <properties> <sonar.skip>true</sonar.skip> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprints</artifactId> - <version>1.0.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>modules-blueprints</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-validation</artifactId> - <name>Controller Blueprints Validation Service</name> + <name>MS Blueprints Processor Modules - Blueprints - Blueprints Validation Service</name> <dependencies> <dependency> @@ -40,12 +41,12 @@ <artifactId>spring-context</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>resource-dict</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>resource-dict</artifactId> </dependency> <!--Testing dependencies--> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>modules</artifactId> + <artifactId>blueprintsprocessor-modules</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>blueprints</artifactId> + <artifactId>modules-blueprints</artifactId> <packaging>pom</packaging> - <name>Blueprints POM</name> - <description>Blueprints POM</description> + <name>MS Blueprints Processor Modules - Blueprints</name> <modules> <module>blueprint-core</module> 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 @@ <modelVersion>4.0.0</modelVersion> <parent> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprints</artifactId> - <version>1.0.0-SNAPSHOT</version> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <artifactId>modules-blueprints</artifactId> + <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-dict</artifactId> - <name>Controller Blueprints Resource Dictionary</name> + <name>MS Blueprints Processor Modules - Blueprints - Resource Dictionary</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>db-lib</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor DB Lib</name> - <description>Blueprints Processor DB Lib</description> + <name>MS Blueprints Processor Modules - Commons - DB Lib</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-validation</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-validation</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>dmaap-lib</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Dmaap Lib</name> - <description>Blueprints Processor Dmaap Lib</description> + <name>MS Blueprints Processor Modules - Commons - Dmaap Lib</name> <dependencies> <dependency> @@ -46,7 +46,6 @@ </exclusion> </exclusions> </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-webflux</artifactId> @@ -77,7 +76,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> </dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>grpc-lib</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor GRPC Lib</name> - <description>Blueprints Processor GRPC Lib</description> + <name>MS Blueprints Processor Modules - Commons - GRPC Lib</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>message-lib</artifactId> - <name>Blueprints Processor Messaging Lib</name> - <description>Blueprints Processor Messaging Lib</description> + <name>MS Blueprints Processor Modules - Commons - Messaging Lib</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>nats-lib</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor NATS Lib</name> - <description>Blueprints Processor NATS Lib</description> + <name>MS Blueprints Processor Modules - Commons - NATS Lib</name> <dependencies> <dependency> @@ -39,13 +39,12 @@ <groupId>io.nats</groupId> <artifactId>java-nats-streaming</artifactId> </dependency> - <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> </dependencies> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>modules</artifactId> + <artifactId>blueprintsprocessor-modules</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Commons POM</name> - <description>Blueprints Processor Commons</description> + <name>MS Blueprints Processor Modules - Commons</name> <modules> <module>processor-core</module> @@ -46,8 +45,8 @@ <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>resource-dict</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>resource-dict</artifactId> </dependency> <!-- Test Dependencies --> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Core</name> - <description>Blueprints Processor Core</description> + <name>MS Blueprints Processor Modules - Commons - Processor Core</name> <dependencies> - <dependency> + <dependency> <groupId>com.hazelcast</groupId> <artifactId>hazelcast-all</artifactId> - </dependency> + </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-proto</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-proto</artifactId> </dependency> <dependency> <groupId>org.springframework.boot</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>rest-lib</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Rest Lib</name> - <description>Blueprints Processor Rest Lib</description> + <name>MS Blueprints Processor Modules - Commons - Rest Lib</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>commons</artifactId> + <artifactId>modules-commons</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>ssh-lib</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor SSH Lib</name> - <description>Blueprints Processor SSH Lib</description> + <name>MS Blueprints Processor Modules - Commons - SSH Lib</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>inbounds</artifactId> + <artifactId>modules-inbounds</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>configs-api</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>Blueprints Processor Resource Configurations API</name> - <description>Blueprints Processor Resource Configurations API</description> + <name>MS Blueprints Processor Modules - Inbound - Configurations API</name> <dependencies> <dependency> @@ -41,8 +41,8 @@ <artifactId>spring-security-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> <groupId>org.onap.ccsdk.cds.error.catalog</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>inbounds</artifactId> + <artifactId>modules-inbounds</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>designer-api</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Designer API</name> - <description>Blueprints Processor Designer API</description> + <name>MS Blueprints Processor Modules - Inbound - Designer API</name> <dependencies> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>inbounds</artifactId> + <artifactId>modules-inbounds</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api-common</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Health API common</name> - <description>checking system check health endpoints</description> + <name>MS Blueprints Processor Modules - Inbound - Health API common</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>rest-lib</artifactId> </dependency> - <dependency> <groupId>org.springframework.boot</groupId> <artifactId>spring-boot-starter-actuator</artifactId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>inbounds</artifactId> + <artifactId>modules-inbounds</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Health API</name> - <description>checking system check health endpoints</description> + <name>MS Blueprints Processor Modules - Inbound - Health API</name> <dependencies> - <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api-common</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${ccsdk.cds.version}</version> </dependency> </dependencies> </project> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>modules</artifactId> + <artifactId>blueprintsprocessor-modules</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>inbounds</artifactId> + <artifactId>modules-inbounds</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Inbounds POM</name> - <description>Blueprints Processor Inbounds</description> + <name>MS Blueprints Processor Modules - Inbounds</name> <modules> <module>configs-api</module> @@ -46,7 +45,7 @@ <artifactId>spring-security-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>workflow-service</artifactId> </dependency> <dependency> @@ -90,7 +89,6 @@ <artifactId>reactor-test</artifactId> <scope>test</scope> </dependency> - <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>inbounds</artifactId> + <artifactId>modules-inbounds</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-api</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Resource API</name> - <description>Blueprints Processor Resource API</description> + <name>MS Blueprints Processor Modules - Inbound - Resource API</name> <dependencies> <dependency> @@ -36,8 +36,8 @@ <artifactId>spring-security-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> <groupId>org.onap.ccsdk.cds.error.catalog</groupId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>inbounds</artifactId> + <artifactId>modules-inbounds</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>selfservice-api</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Selfservice API</name> - <description>Blueprints Processor Selfservice API</description> + <name>MS Blueprints Processor Modules - Inbound - Self Service API</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-validation</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-validation</artifactId> </dependency> <dependency> <groupId>org.onap.ccsdk.cds.error.catalog</groupId> @@ -49,7 +49,7 @@ <!-- For Message libraries --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>message-lib</artifactId> </dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>modules</artifactId> + <artifactId>blueprintsprocessor-modules</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>outbounds</artifactId> + <artifactId>modules-outbounds</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Outbounds POM</name> - <description>Blueprints Processor Outbounds</description> + <name>MS Blueprints Processor Modules - Outbounds</name> </project> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>parent</artifactId> + <artifactId>blueprintsprocessor-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <artifactId>modules</artifactId> + <artifactId>blueprintsprocessor-modules</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Modules</name> - <description>Blueprints Processor Modules</description> + <name>MS Blueprints Processor Modules (Root)</name> <modules> <module>blueprints</module> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>services</artifactId> + <artifactId>modules-services</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>execution-service</artifactId> <packaging>jar</packaging> - <name>Blueprints Processor Execution Service</name> - <description>Blueprints Processor Execution Service</description> + <name>MS Blueprints Processor Modules - Services - Execution Service</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>db-lib</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>rest-lib</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>grpc-lib</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>nats-lib</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>resource-dict</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>resource-dict</artifactId> </dependency> - <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> </dependency> - <dependency> <groupId>io.grpc</groupId> <artifactId>grpc-testing</artifactId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>modules</artifactId> + <artifactId>blueprintsprocessor-modules</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> - <artifactId>services</artifactId> + <artifactId>modules-services</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Service POM</name> - <description>Blueprints Processor Service</description> + <name>MS Blueprints Processor Modules - Services</name> <modules> <module>execution-service</module> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>services</artifactId> + <artifactId>modules-services</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>workflow-service</artifactId> - <name>Blueprints Processor Workflow Service</name> - <description>Blueprints Processor Workflow Service</description> + <name>MS Blueprints Processor Modules - Services - Workflow Service</name> <dependencies> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>blueprint-core</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprint-core</artifactId> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>execution-service</artifactId> </dependency> <dependency> 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 @@ </parent> <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>parent</artifactId> + <artifactId>blueprintsprocessor-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Blueprints Processor Parent</name> - <description>Blueprints Processor Parent</description> + <name>MS Blueprints Processor Parent</name> <properties> - <sli.version>${ccsdk.sli.core.version}</sli.version> <!-- Override CDS version from parent to be project.version --> - <ccsdk.cds.version>${project.version}</ccsdk.cds.version> <error.catalog.version>${project.version}</error.catalog.version> <dmaap.client.version>1.1.5</dmaap.client.version> <!-- Should be using released artifact as soon as available: --> @@ -76,7 +73,6 @@ <type>pom</type> <scope>import</scope> </dependency> - <dependency> <groupId>org.springframework.kafka</groupId> <artifactId>spring-kafka</artifactId> @@ -270,7 +266,6 @@ <artifactId>jsch</artifactId> <version>${jsch.version}</version> </dependency> - <dependency> <groupId>org.apache.kafka</groupId> <artifactId>kafka-clients</artifactId> @@ -310,7 +305,7 @@ <dependency> <groupId>org.onap.ccsdk.sli.core</groupId> <artifactId>sli-provider</artifactId> - <version>${sli.version}</version> + <version>${ccsdk.sli.core.version}</version> <exclusions> <exclusion> <groupId>commons-lang</groupId> @@ -353,82 +348,82 @@ <!-- Blueprint Processor Application Module Dependencies --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>processor-core</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>db-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>rest-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>nats-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>ssh-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <!-- message-lib dependency --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>message-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>dmaap-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>grpc-lib</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>execution-service</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>workflow-service</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <!-- North Bound --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>configs-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>designer-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>selfservice-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> - <artifactId>application</artifactId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> + <artifactId>blueprintsprocessor-application</artifactId> <version>${ccsdk.cds.version}</version> </dependency> @@ -484,12 +479,12 @@ <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api-common</artifactId> <version>${ccsdk.cds.version}</version> </dependency> @@ -507,22 +502,22 @@ <!-- Controller Blueprints Application Dependency --> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>resource-dict</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-core</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-proto</artifactId> <version>${ccsdk.cds.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-validation</artifactId> <version>${ccsdk.cds.version}</version> </dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds</groupId> - <artifactId>ms</artifactId> + <artifactId>cds-ms</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -29,12 +29,10 @@ <artifactId>blueprintsprocessor</artifactId> <packaging>pom</packaging> - <name>Blueprints Processor Root</name> - <description>Blueprints Processor Root</description> + <name>MS Blueprints Processor (Root)</name> <modules> <module>parent</module> - <module>cba-parent</module> <module>modules</module> <module>functions</module> <module>application</module> @@ -46,6 +44,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> - <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.cds.version>${project.version}</ccsdk.cds.version> </properties> </project> 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 @@ <parent> <groupId>org.onap.ccsdk.cds</groupId> - <artifactId>ms</artifactId> + <artifactId>cds-ms</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -28,7 +28,7 @@ <artifactId>command-executor</artifactId> <packaging>pom</packaging> - <name>Command Executor</name> + <name>MS Command Executor</name> <description>Micro-service providing python environment with gRPC binding for command execution</description> <properties> @@ -36,7 +36,6 @@ <image.name>onap/ccsdk-commandexecutor</image.name> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> - <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> </properties> 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 @@ <artifactId>error-catalog-application</artifactId> - <name>Error Catalog Application</name> + <name>MS Error Catalog Application</name> <description>Error Catalog Application</description> <properties> 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 @@ <artifactId>error-catalog-core</artifactId> - <name>Error Catalog Core</name> + <name>MS Error Catalog Core</name> <description>Error Catalog Core</description> <properties> 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 @@ <parent> <groupId>org.onap.ccsdk.cds</groupId> - <artifactId>ms</artifactId> + <artifactId>cds-ms</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -29,7 +29,7 @@ <artifactId>error-catalog</artifactId> <packaging>pom</packaging> - <name>Error Catalog Lib</name> + <name>MS Error Catalog Lib</name> <description>Error Catalog Lib for ONAP Components</description> <modules> 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 @@ <artifactId>error-catalog-services</artifactId> - <name>Error Catalog Service</name> + <name>MS Error Catalog Service</name> <description>Error Catalog Service</description> <properties> 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 @@ <parent> <groupId>org.onap.ccsdk.cds</groupId> - <artifactId>parent</artifactId> + <artifactId>cds-aggregator</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> - <artifactId>ms</artifactId> + <artifactId>cds-ms</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - <name>Micro-services Root</name> - <description>Micro-services</description> + <name>MS (Root)</name> + <description>CDS Micro-services</description> <modules> <module>error-catalog</module> 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 @@ <parent> <groupId>org.onap.ccsdk.cds</groupId> - <artifactId>ms</artifactId> + <artifactId>cds-ms</artifactId> <version>1.0.0-SNAPSHOT</version> </parent> <artifactId>py-executor</artifactId> - <name>Python Script Executor</name> + <name>MS Python Script Executor</name> <description>Micro-service providing python environment with gRPC binding for python script execution</description> <properties> @@ -34,7 +34,6 @@ <image.name>onap/ccsdk-py-executor</image.name> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> - <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <sonar.skip>true</sonar.skip> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.sdclistener</groupId> - <artifactId>parent</artifactId> + <artifactId>sdclistener-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <artifactId>application</artifactId> + <artifactId>sdclistener-application</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>jar</packaging> - <name>SDC Listener Application</name> + <name>MS SDC Listener - Application</name> <properties> <protobuf.version>3.6.1</protobuf.version> @@ -53,11 +53,10 @@ <artifactId>spring-boot-starter-test</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>health-api-common</artifactId> - <version>1.0.0-SNAPSHOT</version> + <version>${ccsdk.cds.version}</version> <exclusions> <exclusion> <groupId>org.springframework.boot</groupId> @@ -71,19 +70,18 @@ <groupId>org.onap.sdc.sdc-distribution-client</groupId> <artifactId>sdc-distribution-client</artifactId> </dependency> - <dependency> <groupId>org.jmockit</groupId> <artifactId>jmockit</artifactId> <version>${jmockit.version}</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jacorb</groupId> - <artifactId>jacorb-omgapi</artifactId> - <version>3.8</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.jacorb</groupId> + <artifactId>jacorb-omgapi</artifactId> + <version>3.8</version> + <scope>test</scope> + </dependency> <!-- GRPC Dependencies --> <dependency> <groupId>io.grpc</groupId> @@ -119,10 +117,9 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-proto</artifactId> </dependency> - <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> 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 @@ <parent> <groupId>org.onap.ccsdk.cds.sdclistener</groupId> - <artifactId>parent</artifactId> + <artifactId>sdclistener-parent</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> - <artifactId>distribution</artifactId> + <artifactId>sdclistener-distribution</artifactId> <packaging>pom</packaging> - <name>SDC Listener Distribution</name> + <name>MS SDC Listener - Distribution</name> <properties> <assembly.id>maven</assembly.id> @@ -39,14 +39,13 @@ <!--<docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy>--> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> - <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> </properties> <dependencies> <dependency> <groupId>org.onap.ccsdk.cds.sdclistener</groupId> - <artifactId>application</artifactId> + <artifactId>sdclistener-application</artifactId> </dependency> </dependencies> 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 @@ </parent> <groupId>org.onap.ccsdk.cds.sdclistener</groupId> - <artifactId>parent</artifactId> + <artifactId>sdclistener-parent</artifactId> <packaging>pom</packaging> - <name>SDC Listener Parent</name> - <description>SDC Listener Parent</description> + <name>MS SDC Listener - Parent</name> <properties> <eelf.version>1.0.0</eelf.version> @@ -44,6 +43,7 @@ <sdc-distribution-client.version>1.4.0</sdc-distribution-client.version> <jmockit.version>1.49</jmockit.version> <reactorcore.version>3.2.6.RELEASE</reactorcore.version> + <ccsdk.cds.version>${project.version}</ccsdk.cds.version> </properties> <dependencyManagement> @@ -78,8 +78,7 @@ <artifactId>commons-compress</artifactId> <version>1.15</version> </dependency> - - <dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>${guava.version}</version> @@ -127,7 +126,7 @@ <version>${protobuff.java.utils.version}</version> </dependency> <dependency> - <groupId>org.onap.ccsdk.cds.blueprintsprocessor</groupId> + <groupId>org.onap.ccsdk.cds.blueprintsprocessor.modules</groupId> <artifactId>blueprint-proto</artifactId> <version>${project.version}</version> <exclusions> @@ -155,7 +154,7 @@ <!-- SDC Distribution client dependency --> <dependency> <groupId>org.onap.ccsdk.cds.sdclistener</groupId> - <artifactId>application</artifactId> + <artifactId>sdclistener-application</artifactId> <version>${project.version}</version> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.ccsdk.cds</groupId> - <artifactId>ms</artifactId> + <artifactId>cds-ms</artifactId> <version>1.0.0-SNAPSHOT</version> <relativePath>..</relativePath> </parent> @@ -28,8 +28,7 @@ <artifactId>sdclistener</artifactId> <packaging>pom</packaging> - <name>SDC Listener Root</name> - <description>SDC Listener Root</description> + <name>MS SDC Listener (Root)</name> <modules> <module>parent</module> @@ -43,6 +42,6 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> - <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.cds.version>${project.version}</ccsdk.cds.version> </properties> </project> |