From b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Thu, 17 Dec 2020 14:37:06 -0500 Subject: 1) Adding docker.skip.push tag so that it can be used to skip docker push during verify job 2) Upgrading docker-maven-plugin to 0.34.0 and replacing dockerFileDir to contextDir 3) Refactoring execution section of docker-maven-plugin 4) Refactoring POM Names 5) Running mvn tidy:pom Issue-ID: CCSDK-3057 Signed-off-by: Singal, Kapil (ks220y) Change-Id: I19b9e231e5288e1372a9b3ac89d263bbb2209186 --- platform-logic/a1Adapter-api/pom.xml | 93 ++++++++++++++++---------------- platform-logic/asdc-api/pom.xml | 93 ++++++++++++++++---------------- platform-logic/cMNotify-api/pom.xml | 93 ++++++++++++++++---------------- platform-logic/installer/pom.xml | 21 ++++---- platform-logic/oofpcipoc-api/pom.xml | 93 ++++++++++++++++---------------- platform-logic/pom.xml | 56 +++++++++---------- platform-logic/ran-slice-api/pom.xml | 93 ++++++++++++++++---------------- platform-logic/restapi-templates/pom.xml | 13 +++-- platform-logic/sliapi/pom.xml | 93 ++++++++++++++++---------------- 9 files changed, 318 insertions(+), 330 deletions(-) (limited to 'platform-logic') diff --git a/platform-logic/a1Adapter-api/pom.xml b/platform-logic/a1Adapter-api/pom.xml index 3eb953b2..547e8985 100644 --- a/platform-logic/a1Adapter-api/pom.xml +++ b/platform-logic/a1Adapter-api/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.distribution - distribution-platform-logic - 1.1.1-SNAPSHOT - + + org.onap.ccsdk.distribution + distribution-platform-logic + 1.1.1-SNAPSHOT + - platform-logic-a1Adapterapi - 1.1.1-SNAPSHOT - pom + platform-logic-a1Adapterapi + pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} - Contains platform-level service logic for a1Adapter to interface with A1 Mediator + ccsdk-distribution :: ${project.artifactId} + Contains platform-level service logic for a1Adapter to interface with A1 Mediator - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/graphs/a1Adapterapi - - - src/main/xml - - *.xml - - true - - - src/main/resources - - graph.versions - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/a1Adapterapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + diff --git a/platform-logic/asdc-api/pom.xml b/platform-logic/asdc-api/pom.xml index a84bede7..2f52fbd5 100644 --- a/platform-logic/asdc-api/pom.xml +++ b/platform-logic/asdc-api/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.distribution - distribution-platform-logic - 1.1.1-SNAPSHOT - + + org.onap.ccsdk.distribution + distribution-platform-logic + 1.1.1-SNAPSHOT + - platform-logic-asdcapi - 1.1.1-SNAPSHOT - pom + platform-logic-asdcapi + pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} - Contains platform-level service logic for the ASDC-API + ccsdk-distribution :: ${project.artifactId} + Contains platform-level service logic for the ASDC-API - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/graphs/asdcapi - - - src/main/xml - - *.xml - - true - - - src/main/resources - - graph.versions - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/asdcapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + diff --git a/platform-logic/cMNotify-api/pom.xml b/platform-logic/cMNotify-api/pom.xml index 2556ee77..2cd54dae 100644 --- a/platform-logic/cMNotify-api/pom.xml +++ b/platform-logic/cMNotify-api/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.distribution - distribution-platform-logic - 1.1.1-SNAPSHOT - + + org.onap.ccsdk.distribution + distribution-platform-logic + 1.1.1-SNAPSHOT + - platform-logic-cMNotifyai - 1.1.1-SNAPSHOT - pom + platform-logic-cMNotifyai + pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} - Contains platform-level service logic for responding to ORAN VES events + ccsdk-distribution :: ${project.artifactId} + Contains platform-level service logic for responding to ORAN VES events - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/graphs/cMNotifyapi - - - src/main/xml - - *.xml - - true - - - src/main/resources - - graph.versions - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/cMNotifyapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 74843651..c2686d8a 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -9,22 +9,21 @@ platform-logic-installer - 1.1.1-SNAPSHOT pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} + ccsdk-distribution :: ${project.artifactId} Contains platform-level service logic installer - - - org.onap.ccsdk.sli.core - sli-core-artifacts - ${ccsdk.sli.core.version} - pom - import - - + + + org.onap.ccsdk.sli.core + sli-core-artifacts + ${ccsdk.sli.core.version} + pom + import + + diff --git a/platform-logic/oofpcipoc-api/pom.xml b/platform-logic/oofpcipoc-api/pom.xml index 5a044846..fc59a9cf 100644 --- a/platform-logic/oofpcipoc-api/pom.xml +++ b/platform-logic/oofpcipoc-api/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.distribution - distribution-platform-logic - 1.1.1-SNAPSHOT - + + org.onap.ccsdk.distribution + distribution-platform-logic + 1.1.1-SNAPSHOT + - platform-logic-oofpcipocapi - 1.1.1-SNAPSHOT - pom + platform-logic-oofpcipocapi + pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} - Contains platform-level service logic for the oofpcipoc-api + ccsdk-distribution :: ${project.artifactId} + Contains platform-level service logic for the oofpcipoc-api - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/graphs/oofpcipocapi - - - src/main/xml - - *.xml - - true - - - src/main/resources - - graph.versions - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/oofpcipocapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 2487b8d4..3f2721f9 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -1,38 +1,34 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.distribution - distribution-root - 1.1.1-SNAPSHOT - + + org.onap.ccsdk.distribution + distribution-root + 1.1.1-SNAPSHOT + - distribution-platform-logic - 1.1.1-SNAPSHOT - pom + distribution-platform-logic + pom - ccsdk-distribution :: platform-logic - Contains platform-level service logic - - openECOMP - + ccsdk-distribution :: platform-logic + Contains platform-level service logic + + openECOMP + - - asdc-api - sliapi - oofpcipoc-api - a1Adapter-api - cMNotify-api - ran-slice-api - restapi-templates - installer - + + asdc-api + sliapi + oofpcipoc-api + a1Adapter-api + cMNotify-api + ran-slice-api + restapi-templates + installer + - - platform-logic - - yyyyMMdd'T'HHmmss'Z' - ${maven.build.timestamp} - + + platform-logic + diff --git a/platform-logic/ran-slice-api/pom.xml b/platform-logic/ran-slice-api/pom.xml index 15b6f007..fc117ea8 100644 --- a/platform-logic/ran-slice-api/pom.xml +++ b/platform-logic/ran-slice-api/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.distribution - distribution-platform-logic - 1.1.1-SNAPSHOT - + + org.onap.ccsdk.distribution + distribution-platform-logic + 1.1.1-SNAPSHOT + - platform-logic-ranSlice - 1.1.1-SNAPSHOT - pom + platform-logic-ranSlice + pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} - Contains platform-level service logic for responding to ORAN VES events + ccsdk-distribution :: ${project.artifactId} + Contains platform-level service logic for responding to ORAN VES events - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/graphs/ranSliceapi - - - src/main/xml - - *.xml - - true - - - src/main/resources - - graph.versions - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/ranSliceapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index 0981dd62..5947c453 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -3,16 +3,15 @@ 4.0.0 - org.onap.ccsdk.distribution - distribution-platform-logic - 1.1.1-SNAPSHOT - + org.onap.ccsdk.distribution + distribution-platform-logic + 1.1.1-SNAPSHOT + platform-logic-restapi-templates - 1.1.1-SNAPSHOT - pom + pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} + ccsdk-distribution :: ${project.artifactId} Contains platform-level platform logic for REST API templates diff --git a/platform-logic/sliapi/pom.xml b/platform-logic/sliapi/pom.xml index e0d2d260..df4ff002 100644 --- a/platform-logic/sliapi/pom.xml +++ b/platform-logic/sliapi/pom.xml @@ -1,54 +1,53 @@ - 4.0.0 + 4.0.0 - - org.onap.ccsdk.distribution - distribution-platform-logic - 1.1.1-SNAPSHOT - + + org.onap.ccsdk.distribution + distribution-platform-logic + 1.1.1-SNAPSHOT + - platform-logic-sliapi - 1.1.1-SNAPSHOT - pom + platform-logic-sliapi + pom - ccsdk-distribution :: platform-logic :: ${project.artifactId} - Contains platform-level service logic for the SLI-API + ccsdk-distribution :: ${project.artifactId} + Contains platform-level service logic for the SLI-API - - - - maven-resources-plugin - 2.6 - - - copy-version - - copy-resources - - validate - - ../target/graphs/sliapi - - - src/main/xml - - *.xml - - true - - - src/main/resources - - graph.versions - - true - - - - - - - - + + + + maven-resources-plugin + 2.6 + + + copy-version + + copy-resources + + validate + + ../target/graphs/sliapi + + + src/main/xml + + *.xml + + true + + + src/main/resources + + graph.versions + + true + + + + + + + + -- cgit 1.2.3-korg