From 7d397bd49ffc2c61d70aa65353f2188bc1264abb Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Mon, 21 Sep 2020 09:53:32 -0400 Subject: Fixing docker image tag Moving related properties to parent most pom and using same across Removing unnecessary version tag from poms Issue-ID: CCSDK-2794 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I37d16d3f7a467bb579f70235f69a8bff0fe4ba8e --- README.md | 44 +++++++++++----------- cds-ui/application/pom.xml | 1 - cds-ui/client/pom.xml | 1 - cds-ui/designer-client/pom.xml | 1 - cds-ui/pom.xml | 19 ++-------- cds-ui/server/pom.xml | 1 - components/model-catalog/blueprint-model/pom.xml | 1 - .../test-blueprint-kotlin-parent/pom.xml | 1 - .../blueprint-model/test-blueprint/pom.xml | 1 - components/pom.xml | 1 - .../functions/ansible-awx-executor/pom.xml | 1 - .../functions/cli-executor/pom.xml | 1 - .../functions/config-snapshots/pom.xml | 1 - .../functions/k8s-profile-upload/pom.xml | 1 - .../functions/netconf-executor/pom.xml | 1 - .../functions/resource-resolution/pom.xml | 1 - .../functions/restconf-executor/pom.xml | 1 - .../modules/blueprints/blueprint-core/pom.xml | 1 - .../modules/inbounds/configs-api/pom.xml | 1 - ms/blueprintsprocessor/parent/pom.xml | 1 - ms/pom.xml | 1 - ms/sdclistener/application/pom.xml | 1 - pom.xml | 2 + 23 files changed, 29 insertions(+), 56 deletions(-) diff --git a/README.md b/README.md index ba9c29357..3c7dee7d1 100644 --- a/README.md +++ b/README.md @@ -1,50 +1,52 @@ -##### Format code with ktlint checkstyle tool use the following command - +### Format code with ktlint checkstyle tool use the following command `mvn process-sources -P format` - -## Reference +#### Reference https://github.com/pinterest/ktlint -## Getting started - +## Basic Architecture ![Basic_Architecture](./docs/media/CDS.png) ## Basic Requirements Before you can build this project, you must install and configure the following dependencies on your machine: - 1- Java 8 SDK - + 1- Java 11 SDK 2- Node and npm installed - 3- Angular CLI & Angular v8 - 4- MySQL Database - - 5- maven + 5- Maven 3.6.X ## Running in Development Mode -* In the main project folder run `mvn clean install` command to install all libraries and dependencies for maven and npm. +Running `mvn clean install` command to install all libraries and dependencies for the maven and npm. +Running `mvn clean install -Pdocker` command to install all libraries and create below docker images + * ccsdk-blueprintsprocessor + * ccsdk-commandexecutor + * ccsdk-py-executor + * ccsdk-sdclistener + * ccsdk-cds-ui-server + * ccsdk-cds-ui - 1- Back-end MS - - * create `sdnctl` table in MySQL +**Note:** run `mvn clean install -Pdocker -Ddocker.skip.push=true` to skip pushing built docker image + +1) Back-end MS + * Create `sdnctl` table in MySQL * (Optional) You could run the project in a specific profile(dev, local) by adding `-Dspring.profiles.active=profile-name` -2- Loop-back server: that allow your request to reach the backend from cds-ui +2) Loop-back server: that allow your request to reach the backend from cds-ui * move to `./cds-ui/server/` folder and run the command `npm start` - 3- cds-ui +3) cds-ui - * move to `./cds-ui/designer-client/` folder and run the command `npm start`, This command will make sure all the files follow the linting rules and then connect to the loopback server. + * Move to `./cds-ui/designer-client/` folder and run the command `npm start`. + * This command will make sure all the files follow the linting rules and then connect to the loopback server. ## Using an IDE **Front-end** you could use `vscode` or `webstorm`. -**Back-end** `Intellij` with kotlin plugin or any other editor +**Back-end** `IntelliJ` with kotlin plugin or any other editor --- -For more information check the `docs` folder. \ No newline at end of file +For more information check: https://docs.onap.org/projects/onap-ccsdk-cds/en/latest/index.html \ No newline at end of file diff --git a/cds-ui/application/pom.xml b/cds-ui/application/pom.xml index 22d5cabc8..cf4813701 100644 --- a/cds-ui/application/pom.xml +++ b/cds-ui/application/pom.xml @@ -30,7 +30,6 @@ limitations under the License. cds-ui-application - 1.0.0-SNAPSHOT pom UI Application diff --git a/cds-ui/client/pom.xml b/cds-ui/client/pom.xml index ec0326a7e..63ff9fbbc 100644 --- a/cds-ui/client/pom.xml +++ b/cds-ui/client/pom.xml @@ -30,7 +30,6 @@ limitations under the License. cds-ui-client - 1.0.0-SNAPSHOT pom UI Client diff --git a/cds-ui/designer-client/pom.xml b/cds-ui/designer-client/pom.xml index 34f56e1f7..01504fb35 100644 --- a/cds-ui/designer-client/pom.xml +++ b/cds-ui/designer-client/pom.xml @@ -30,7 +30,6 @@ limitations under the License. cds-ui-designer-client - 1.0.0-SNAPSHOT pom UI designer Client diff --git a/cds-ui/pom.xml b/cds-ui/pom.xml index 6d547326c..285e63ef9 100644 --- a/cds-ui/pom.xml +++ b/cds-ui/pom.xml @@ -23,15 +23,13 @@ limitations under the License. 4.0.0 - org.onap.ccsdk.parent - spring-boot-starter-parent - 2.0.1 - + org.onap.ccsdk.cds + cds-aggregator + 1.0.0-SNAPSHOT + .. - org.onap.ccsdk.cds cds-ui - 1.0.0-SNAPSHOT pom UI Parent @@ -46,14 +44,5 @@ limitations under the License. npm - onap/ccsdk-cds-ui - ${project.version} - ${maven.build.timestamp} - yyyyMMdd'T'HHmmss'Z' - - - true - false - deploy diff --git a/cds-ui/server/pom.xml b/cds-ui/server/pom.xml index 6444385ee..6d9bc1420 100644 --- a/cds-ui/server/pom.xml +++ b/cds-ui/server/pom.xml @@ -30,7 +30,6 @@ limitations under the License. cds-ui-server - 1.0.0-SNAPSHOT pom UI Server diff --git a/components/model-catalog/blueprint-model/pom.xml b/components/model-catalog/blueprint-model/pom.xml index db63478cd..65b8ce18b 100644 --- a/components/model-catalog/blueprint-model/pom.xml +++ b/components/model-catalog/blueprint-model/pom.xml @@ -27,7 +27,6 @@ org.onap.ccsdk.cds.components.cba blueprint-model - 1.0.0-SNAPSHOT pom Components Model Catalog - Blueprints Model diff --git a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml index 626ca9e17..f39ded7e5 100644 --- a/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml +++ b/components/model-catalog/blueprint-model/test-blueprint-kotlin-parent/pom.xml @@ -25,7 +25,6 @@ test-blueprint-kotlin-parent - 1.0.0-SNAPSHOT pom Components Model Catalog - Blueprints Model - Test Kotlin Parent diff --git a/components/model-catalog/blueprint-model/test-blueprint/pom.xml b/components/model-catalog/blueprint-model/test-blueprint/pom.xml index 70b3bfc1d..fb372ed07 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/pom.xml +++ b/components/model-catalog/blueprint-model/test-blueprint/pom.xml @@ -25,7 +25,6 @@ test-blueprint-model - 1.0.0-SNAPSHOT pom Components Model Catalog - Blueprints Model - Test Blueprints diff --git a/components/pom.xml b/components/pom.xml index 64bc46edd..0ea3e5886 100644 --- a/components/pom.xml +++ b/components/pom.xml @@ -26,7 +26,6 @@ cds-components - 1.0.0-SNAPSHOT pom Components (Root) diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml index 43f4598b5..40c93b17d 100644 --- a/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions ansible-awx-executor - 1.0.0-SNAPSHOT MS Blueprints Processor Functions - Ansible AWX Executor Blueprints Processor Function - Ansible Executor diff --git a/ms/blueprintsprocessor/functions/cli-executor/pom.xml b/ms/blueprintsprocessor/functions/cli-executor/pom.xml index 04c78d8e0..37f4bfc72 100644 --- a/ms/blueprintsprocessor/functions/cli-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/cli-executor/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions cli-executor - 1.0.0-SNAPSHOT MS Blueprints Processor Functions - CLI Executor Blueprints Processor Function - CLI Executor diff --git a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml index 35c2113a3..35f838e19 100644 --- a/ms/blueprintsprocessor/functions/config-snapshots/pom.xml +++ b/ms/blueprintsprocessor/functions/config-snapshots/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions config-snapshots - 1.0.0-SNAPSHOT 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 eb36fe528..9fd427482 100644 --- a/ms/blueprintsprocessor/functions/k8s-profile-upload/pom.xml +++ b/ms/blueprintsprocessor/functions/k8s-profile-upload/pom.xml @@ -28,7 +28,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions k8s-profile-upload - 1.0.0-SNAPSHOT MS Blueprints Processor Functions - K8s Profile Upload Blueprints Processor Function - K8s Profile Upload diff --git a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml index ce497548b..ac56a1a71 100644 --- a/ms/blueprintsprocessor/functions/netconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/netconf-executor/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions netconf-executor - 1.0.0-SNAPSHOT MS Blueprints Processor Functions - Netconf Executor Blueprints Processor Function - Netconf Executor diff --git a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml index a95535168..c1357f8cc 100644 --- a/ms/blueprintsprocessor/functions/resource-resolution/pom.xml +++ b/ms/blueprintsprocessor/functions/resource-resolution/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions resource-resolution - 1.0.0-SNAPSHOT jar MS Blueprints Processor Functions - Resource Resolution diff --git a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml index 73502b22c..de135173c 100644 --- a/ms/blueprintsprocessor/functions/restconf-executor/pom.xml +++ b/ms/blueprintsprocessor/functions/restconf-executor/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.functions restconf-executor - 1.0.0-SNAPSHOT MS Blueprints Processor Functions - Restconf Executor Blueprints Processor Function - Restconf Executor diff --git a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml index 8673211a2..7960ca3a1 100644 --- a/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml +++ b/ms/blueprintsprocessor/modules/blueprints/blueprint-core/pom.xml @@ -27,7 +27,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.modules blueprint-core - 1.0.0-SNAPSHOT MS Blueprints Processor Modules - Blueprints - Blueprints Core diff --git a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml index 39f2df5b3..bdf0513cb 100644 --- a/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml +++ b/ms/blueprintsprocessor/modules/inbounds/configs-api/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor.modules configs-api - 1.0.0-SNAPSHOT jar MS Blueprints Processor Modules - Inbound - Configurations API diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index eb4f4ded5..a74132b38 100755 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -26,7 +26,6 @@ org.onap.ccsdk.cds.blueprintsprocessor blueprintsprocessor-parent - 1.0.0-SNAPSHOT pom MS Blueprints Processor Parent diff --git a/ms/pom.xml b/ms/pom.xml index bc0131eb6..7d98e37ae 100644 --- a/ms/pom.xml +++ b/ms/pom.xml @@ -26,7 +26,6 @@ cds-ms - 1.0.0-SNAPSHOT pom MS (Root) diff --git a/ms/sdclistener/application/pom.xml b/ms/sdclistener/application/pom.xml index a1ea90c84..34fb6f911 100644 --- a/ms/sdclistener/application/pom.xml +++ b/ms/sdclistener/application/pom.xml @@ -26,7 +26,6 @@ sdclistener-application - 1.0.0-SNAPSHOT jar MS SDC Listener - Application diff --git a/pom.xml b/pom.xml index c1216b85c..c2aecb3dd 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,8 @@ limitations under the License. true false deploy + ${maven.build.timestamp} + yyyyMMdd'T'HHmmss'Z' ${project.version} -- cgit 1.2.3-korg