From b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2 Mon Sep 17 00:00:00 2001 From: "Singal, Kapil (ks220y)" Date: Thu, 17 Dec 2020 14:37:06 -0500 Subject: [PATCH] 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 --- alpine/java11/pom.xml | 29 +- alpine/pom.xml | 3 +- ansible-server/pom.xml | 318 ++++++++-------- dependencies/pom.xml | 2 +- dgbuilder-docker/pom.xml | 399 ++++++++++----------- dgbuilder/pom.xml | 249 +++++++------ odlsli/odlsli-alpine/pom.xml | 169 +++++---- odlsli/pom.xml | 3 +- opendaylight/aluminum/aluminum-alpine/pom.xml | 317 ++++++++-------- opendaylight/aluminum/pom.xml | 40 +-- .../onap-distribution/fluorine/karaf/pom.xml | 2 +- opendaylight/onap-distribution/fluorine/pom.xml | 3 +- opendaylight/onap-distribution/pom.xml | 3 +- opendaylight/pom.xml | 1 - opendaylight/sodium/pom.xml | 40 +-- opendaylight/sodium/sodium-alpine/pom.xml | 317 ++++++++-------- 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 +++-- pom.xml | 8 +- saltstack-server/pom.xml | 33 +- ubuntu/pom.xml | 25 +- 28 files changed, 1251 insertions(+), 1358 deletions(-) diff --git a/alpine/java11/pom.xml b/alpine/java11/pom.xml index 84a83dcf..75adb93b 100644 --- a/alpine/java11/pom.xml +++ b/alpine/java11/pom.xml @@ -9,7 +9,6 @@ distribution-j11-alpine - 1.1.1-SNAPSHOT pom ccsdk-distribution :: alpine :: java11 @@ -20,31 +19,28 @@ onap/ccsdk-alpine-j11-image - ${project.version} - ${maven.build.timestamp} onap/integration-java11 7.1.0 - org.codehaus.groovy.maven gmaven-plugin + 1.0 validate execute - + ${basedir}/../../src/main/scripts/TagVersion.groovy - maven-resources-plugin 2.6 @@ -81,38 +77,30 @@ io.fabric8 docker-maven-plugin - 0.28.0 + 0.34.0 false - ${image.name} try - ${basedir}/target/docker-stage + ${basedir}/target/docker-stage Dockerfile ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} + ${project.docker.latestfulltag.version} ${project.docker.latesttagtimestamp.version} + ${docker.verbose} + ${docker.skip.push} - generate-images - generate-sources - - build - - - - - push-images - deploy + build-push-images build push @@ -120,7 +108,6 @@ - diff --git a/alpine/pom.xml b/alpine/pom.xml index 5ff34161..089b0af4 100644 --- a/alpine/pom.xml +++ b/alpine/pom.xml @@ -9,10 +9,9 @@ distribution-alpine-root - 1.1.1-SNAPSHOT pom - ccsdk-distribution :: opendaylight + ccsdk-distribution :: alpine Creates OpenDaylight container diff --git a/ansible-server/pom.xml b/ansible-server/pom.xml index dd0d0103..a5fc4839 100644 --- a/ansible-server/pom.xml +++ b/ansible-server/pom.xml @@ -1,176 +1,170 @@ - + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + + org.onap.ccsdk.parent + odlparent-lite + 2.1.0 + - 4.0.0 - pom - org.onap.ccsdk.distribution - ansible-server - 1.1.1-SNAPSHOT + org.onap.ccsdk.distribution + ansible-server + 1.1.1-SNAPSHOT + pom - ccsdk :: distribution :: ${project.artifactId} - Creates ansible-server Docker container + ccsdk-distribution :: ${project.artifactId} + Creates ansible-server Docker container + + ONAP + - - onap/ccsdk-ansible-server-image + + onap/ccsdk-ansible-server-image ${project.version} ${maven.build.timestamp} ${project.version} yyyyMMdd'T'HHmmss'Z' - true - + true + false + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../src/main/scripts/TagVersion.groovy + + + + - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - ${basedir}/../src/main/scripts/TagVersion.groovy - - - - + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main + + **/* + + false + + + + + + - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main - - **/* - - false - - - - - - + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + change python permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/ansible-server + -name + *.py + -exec + chmod + +x + {} + ; + + + + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/ansible-server + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + - - exec-maven-plugin - org.codehaus.mojo - 1.5.0 - - - change python permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/ansible-server - -name - *.py - -exec - chmod - +x - {} - ; - - - - - change shell permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/ansible-server - -name - *.sh - -exec - chmod - +x - {} - ; - - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.28.0 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - Dockerfile - - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - - - - - - - - generate-images - package - - build - - - - - push-images - deploy - - build - push - - - - - - - - - - ONAP - + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.34.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + ${docker.verbose} + ${docker.skip.push} + + + + build-push-images + + build + push + + + + + + + + diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 7dc26789..d969c2bf 100755 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -14,7 +14,7 @@ 1.1.1-SNAPSHOT pom - ccsdk-distribution:: dependencies + ccsdk-distribution :: ${project.artifactId} false diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 6b88b557..3dfbc0e7 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -1,218 +1,209 @@ - 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 + - org.onap.ccsdk.distribution - distribution-dgbuilder-docker - 1.1.1-SNAPSHOT - pom + org.onap.ccsdk.distribution + distribution-dgbuilder-docker + pom - ccsdk-distribution :: dgbuilder-docker - Creates docker container for dgbuilder - - ONAP - + ccsdk-distribution :: dgbuilder-docker + Creates docker container for dgbuilder + + ONAP + - - onap/ccsdk-dgbuilder-image - ${project.version} - ${maven.build.timestamp} - ${env.UNIQUE_DOCKER_TAG} - + + onap/ccsdk-dgbuilder-image + ${env.UNIQUE_DOCKER_TAG} + - - + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../src/main/scripts/TagSnapshotVersion.groovy + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + + + - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - ${basedir}/../src/main/scripts/TagSnapshotVersion.groovy - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - - - - + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + + + Make-stage-dir + generate-sources + + exec + + + /bin/mkdir + + -p + ${basedir}/target/docker-stage/opt/onap/ccsdk + + + + + Unzip dgbuilder + generate-sources + + exec + + + /usr/bin/unzip + + -d + ${basedir}/target/docker-stage/opt/onap/ccsdk + ../dgbuilder/target/*.zip + + + + + Copy dgbuilder + generate-sources + + exec + + + /bin/cp + + -r + ../dgbuilder + ${basedir}/target/docker-stage/opt/onap/ccsdk + + + - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - - Make-stage-dir - generate-sources - - exec - - - /bin/mkdir - - -p - ${basedir}/target/docker-stage/opt/onap/ccsdk - - - - - Unzip dgbuilder - generate-sources - - exec - - - /usr/bin/unzip - - -d - ${basedir}/target/docker-stage/opt/onap/ccsdk - ../dgbuilder/target/*.zip - - - - - Copy dgbuilder - generate-sources - - exec - - - /bin/cp - - -r - ../dgbuilder - ${basedir}/target/docker-stage/opt/onap/ccsdk - - - + + dgbuilder createReleaseDir + generate-sources + + exec + + + /bin/bash + + ${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder/createReleaseDir.sh + 1702 + dguser + change_email_id@dgbuilder.com + + + - - dgbuilder createReleaseDir - generate-sources - - exec - - - /bin/bash - - ${basedir}/target/docker-stage/opt/onap/ccsdk/dgbuilder/createReleaseDir.sh - 1702 - dguser - change_email_id@dgbuilder.com - - - + + change shell permissions + process-sources + + exec + + + /usr/bin/find + + ${basedir}/target/docker-stage/opt/onap/ccsdk + -name + *.sh + -exec + chmod + +x + {} + ; + + + + + + + - - change shell permissions - process-sources - - exec - - - /usr/bin/find - - ${basedir}/target/docker-stage/opt/onap/ccsdk - -name - *.sh - -exec - chmod - +x - {} - ; - - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.28.0 - false - - - - - ${image.name} - - try - ${basedir}/target/docker-stage - Dockerfile - - ${project.docker.latestminortag.snapshot.version} - ${project.docker.latestfulltag.snapshot.version} - ${project.docker.latesttagtimestamp.snapshot.version} + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.34.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.snapshot.version} + ${project.docker.latestfulltag.snapshot.version} + ${project.docker.latesttagtimestamp.snapshot.version} ${project.docker.uniquedockertag.snapshot.version} - - - - - - - - generate-images - package - - build - - - - - push-images - deploy - - build - push - - - - - - - - + + + + + ${docker.verbose} + + + false + + + + build-push-images + + build + push + + + + + + + + diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index df58bd81..afd30c45 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -1,135 +1,132 @@ - 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 + - org.onap.ccsdk.distribution - distribution-dgbuilder - 1.1.1-SNAPSHOT - pom + org.onap.ccsdk.distribution + distribution-dgbuilder + pom - ccsdk-distribution :: dgbuilder - Directed Graph Builder - - ONAP - + ccsdk-distribution :: dgbuilder + Directed Graph Builder + + ONAP + - - dgbuilder - true - /opt/app/dgbuilder - yyyyMMdd'T'HHmmss'Z' - ${maven.build.timestamp} - ${project.version}-${build.number} - + + dgbuilder + true + /opt/app/dgbuilder + ${project.version}-${build.number} + - - - org.onap.ccsdk.sli.core - sli-common - ${sdnctl.sli.version} - - - org.mariadb.jdbc - mariadb-java-client - ${mariadb.connector.version} - - - org.antlr - antlr4 - ${antlr.version} - jar - compile - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.slf4j - slf4j-simple - 1.7.5 - compile - - - org.apache.commons - commons-lang3 - ${commons.lang3.version} - - + + + org.onap.ccsdk.sli.core + sli-common + ${sdnctl.sli.version} + + + org.mariadb.jdbc + mariadb-java-client + ${mariadb.connector.version} + + + org.antlr + antlr4 + ${antlr.version} + jar + compile + + + org.slf4j + slf4j-api + ${slf4j.version} + + + org.slf4j + slf4j-simple + 1.7.5 + compile + + + org.apache.commons + commons-lang3 + ${commons.lang3.version} + + - - - - maven-assembly-plugin - 2.6 - - - create-zip - - single - - package - - ${application.name}.${project.version} - true - - src/assembly/assemble_zip.xml - - false - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - copy-dependencies - - copy-dependencies - - prepare-package - - false - ${project.build.directory}/svclogic/lib - false - true - true - false - false - false - provided - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-sources - - - - - - - - - run - - - - - - + + + + maven-assembly-plugin + 2.6 + + + create-zip + + single + + package + + ${application.name}.${project.version} + true + + src/assembly/assemble_zip.xml + + false + + + + + + org.apache.maven.plugins + maven-dependency-plugin + + + copy-dependencies + + copy-dependencies + + prepare-package + + false + ${project.build.directory}/svclogic/lib + false + true + true + false + false + false + provided + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + generate-sources + + + + + + + + + run + + + + + + diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 847a4e69..7742d6b6 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -23,17 +23,19 @@ onap/ccsdk-odl-sodium-alpine-image onap/ccsdk-odlsli-alpine-image + ${project.version} - ${maven.build.timestamp} - ${env.UNIQUE_DOCKER_TAG} - ${https_proxy} yyyyMMdd'T'HHmmss'Z' - opt/opendaylight - deploy + ${maven.build.timestamp} + true + + ${env.UNIQUE_DOCKER_TAG} + ${https_proxy} + opt/opendaylight + 93C4A3FD7BB9C367 - odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040 - + odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all, odl-restconf-nb-rfc8040 ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all @@ -46,287 +48,277 @@ 1.1.0 1.1.0 true - + ${project.groupId} dependencies ${project.version} - repo zip + repo org.onap.ccsdk.sli.core dblib-installer ${ccsdk.sli.core.version} - repo zip + repo org.onap.ccsdk.sli.core filters-installer ${ccsdk.sli.core.version} - repo zip + repo org.onap.ccsdk.sli.core sli-installer ${ccsdk.sli.core.version} - repo zip + repo org.onap.ccsdk.sli.core sliapi-installer ${ccsdk.sli.core.version} - repo zip + repo org.onap.ccsdk.sli.core sliPluginUtils-installer ${ccsdk.sli.core.version} - repo zip + repo org.onap.ccsdk.sli.core utils-installer ${ccsdk.sli.core.version} - repo zip + repo org.onap.ccsdk.sli.core slicore-features-installer ${ccsdk.sli.core.version} - repo zip + repo org.onap.ccsdk.sli.adaptors aai-service-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors ansible-adapter-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors base-http-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors mdsal-resource-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors.messagerouter publisher.installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors netbox-client-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors resource-assignment-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors saltstack-adapter-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors sql-resource-installer ${ccsdk.sli.adaptors.version} - repo zip + repo org.onap.ccsdk.sli.adaptors sliadaptors-features-installer ${ccsdk.sli.adaptors.version} - repo zip + repo - org.onap.ccsdk.sli.northbound asdcApi-installer ${ccsdk.sli.northbound.version} - repo zip + repo org.onap.ccsdk.sli.northbound dataChange-installer ${ccsdk.sli.northbound.version} - repo zip + repo org.onap.ccsdk.sli.northbound lcm-installer ${ccsdk.sli.northbound.version} - repo zip + repo org.onap.ccsdk.sli.northbound slinorthbound-features-installer ${ccsdk.sli.northbound.version} - repo zip + repo org.onap.ccsdk.sli.plugins properties-node-installer ${ccsdk.sli.plugins.version} - repo zip + repo org.onap.ccsdk.sli.plugins restapi-call-node-installer ${ccsdk.sli.plugins.version} - repo zip + repo org.onap.ccsdk.sli.plugins template-node-installer ${ccsdk.sli.plugins.version} - repo zip + repo org.onap.ccsdk.sli.plugins restconf-client-installer ${ccsdk.sli.plugins.version} - repo zip + repo org.onap.ccsdk.sli.plugins sshapi-call-node-installer ${ccsdk.sli.plugins.version} - repo zip + repo org.onap.ccsdk.sli.plugins sliplugins-features-installer ${ccsdk.sli.plugins.version} - repo zip + repo org.onap.ccsdk.features features-installer ${ccsdk.features.version} - repo zip + repo org.onap.ccsdk.features.sdnr.wt sdnr-wt-feature-aggregator-installer ${ccsdk.features.version} - repo zip + repo org.onap.ccsdk.features aafshiro-installer ${ccsdk.features.version} - repo zip + repo org.onap.ccsdk.features.sdnr.northbound sdnr-northbound-features-installer ${ccsdk.features.version} - repo zip + repo org.onap.ccsdk.oran a1-adapter-northbound-installer ${ccsdk.oran.a1adapter.version} - repo zip + repo org.onap.ccsdk.features.sdnr.northbound oofpcipoc-installer ${ccsdk.features.version} - repo zip + repo org.onap.ccsdk.oran a1-adapter-installer ${ccsdk.oran.a1adapter.version} - repo zip + repo org.onap.ccsdk.features.sdnr.northbound CMNotify-installer ${ccsdk.features.version} - repo zip + repo org.onap.ccsdk.features.sdnr.northbound ranSlice-installer ${ccsdk.features.version} - repo zip + repo - - - - org.apache.maven.wagon - wagon-http-lightweight - 2.2 - - - - org.codehaus.groovy.maven gmaven-plugin + 1.0 validate @@ -339,8 +331,6 @@ - - maven-resources-plugin 2.6 @@ -364,7 +354,6 @@ - copy-scripts @@ -384,7 +373,6 @@ - copy-odl-resources @@ -528,7 +516,6 @@ exec-maven-plugin 1.5.0 - change shell permissions process-sources @@ -555,18 +542,25 @@ org.apache.maven.plugins maven-failsafe-plugin - - - integration-test - verify - - + + + integration-test + verify + + - true + true - + + + + org.apache.maven.wagon + wagon-http-lightweight + 2.2 + + @@ -578,24 +572,24 @@ org.apache.maven.plugins maven-failsafe-plugin - - - integration-test - verify - - + + + integration-test + verify + + - false - - ${odlsli.port} - + false + + ${odlsli.port} + - + io.fabric8 docker-maven-plugin - 0.28.0 + 0.34.0 false @@ -603,21 +597,25 @@ ${image.name} try - ${basedir}/target/docker-stage + ${basedir}/target/docker-stage Dockerfile ${project.docker.latestminortag.snapshot.version} ${project.docker.latestfulltag.snapshot.version} ${project.docker.latesttagtimestamp.snapshot.version} ${project.docker.uniquedockertag.snapshot.version} - + + ${docker.verbose} + + + false - generate-images + build-images package build @@ -700,9 +698,8 @@ push-images - ${docker.push.phase} - build + push diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 5c85d929..762b3ba7 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -9,13 +9,12 @@ distribution-odlsli - 1.1.1-SNAPSHOT pom ccsdk-distribution :: odlsli Creates ODLSLI containers - odlsli-alpine + odlsli-alpine diff --git a/opendaylight/aluminum/aluminum-alpine/pom.xml b/opendaylight/aluminum/aluminum-alpine/pom.xml index 61a559dd..84d9f307 100644 --- a/opendaylight/aluminum/aluminum-alpine/pom.xml +++ b/opendaylight/aluminum/aluminum-alpine/pom.xml @@ -1,168 +1,155 @@ - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-odl-aluminum - 1.1.1-SNAPSHOT - - - distribution-odl-aluminum-docker - 1.1.1-SNAPSHOT - pom - - ccsdk-distribution :: opendaylight :: aluminum :: docker - Creates OpenDaylight container - - ONAP - - - - onap/ccsdk-odl-aluminum-alpine-image - onap-karaf - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - ${basedir}/../../../src/main/scripts/TagVersion.groovy - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - get-odl-distribution - validate - - copy - - - - - org.opendaylight.integration - ${odl.karaf.artifactId} - ${ccsdk.opendaylight.version} - tar.gz - - true - ${basedir}/target/docker-stage - - - false - true - true - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - src/main/odlscripts - - * - - false - - - - - - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.28.0 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - Dockerfile - - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - - - - - - - - generate-images - package - - build - - - - - push-images - ${docker.push.phase} - - build - push - - - - - - - - - - + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-odl-aluminum + 1.1.1-SNAPSHOT + + + distribution-odl-aluminum-docker + pom + + ccsdk-distribution :: opendaylight :: aluminum :: docker + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-aluminum-alpine-image + onap-karaf + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../../../src/main/scripts/TagVersion.groovy + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + ${odl.karaf.artifactId} + ${ccsdk.opendaylight.version} + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + src/main/odlscripts + + * + + false + + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.34.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + ${docker.verbose} + ${docker.skip.push} + + + + build-push-images + + build + push + + + + + + + + diff --git a/opendaylight/aluminum/pom.xml b/opendaylight/aluminum/pom.xml index 5123355c..91f93706 100644 --- a/opendaylight/aluminum/pom.xml +++ b/opendaylight/aluminum/pom.xml @@ -9,33 +9,27 @@ distribution-odl-aluminum - 1.1.1-SNAPSHOT pom - ccsdk-distribution :: opendaylight + ccsdk-distribution :: opendaylight :: aluminum Creates OpenDaylight container - - - ${project.version} - ${maven.build.timestamp} - 0.13.1 - deploy - - - - - - org.opendaylight.integration - onap-karaf - ${ccsdk.opendaylight.version} - tar.gz - - - - - - aluminum-alpine + aluminum-alpine + + + 0.13.1 + + + + + + org.opendaylight.integration + onap-karaf + ${ccsdk.opendaylight.version} + tar.gz + + + diff --git a/opendaylight/onap-distribution/fluorine/karaf/pom.xml b/opendaylight/onap-distribution/fluorine/karaf/pom.xml index ef718f5d..aca9b90d 100644 --- a/opendaylight/onap-distribution/fluorine/karaf/pom.xml +++ b/opendaylight/onap-distribution/fluorine/karaf/pom.xml @@ -11,7 +11,7 @@ org.onap.ccsdk.distribution distribution-opendaylight-onap-fluorine-karaf 0.4.1-SNAPSHOT - ccsdk-distribution :: onap :: opendaylight :: fluorine :: karaf + ccsdk-distribution :: opendaylight :: onap :: fluorine :: karaf 4.0.0 diff --git a/opendaylight/onap-distribution/fluorine/pom.xml b/opendaylight/onap-distribution/fluorine/pom.xml index 44f8269d..4d76a88d 100644 --- a/opendaylight/onap-distribution/fluorine/pom.xml +++ b/opendaylight/onap-distribution/fluorine/pom.xml @@ -9,9 +9,8 @@ distribution-opendaylight-onap-fluorine-parent - 0.4.1-SNAPSHOT pom - ccsdk-distribution :: onap :: opendaylight :: fluorine :: parent + ccsdk-distribution :: opendaylight :: onap :: fluorine Creates ONAP's OpenDaylight Fluorine container diff --git a/opendaylight/onap-distribution/pom.xml b/opendaylight/onap-distribution/pom.xml index dbc5a5b0..b6a4d464 100644 --- a/opendaylight/onap-distribution/pom.xml +++ b/opendaylight/onap-distribution/pom.xml @@ -9,10 +9,9 @@ distribution-opendaylight-onap - 0.7.0-SNAPSHOT pom - ccsdk-distribution :: onap :: opendaylight :: parent + ccsdk-distribution :: opendaylight :: onap Creates ONAP's OpenDaylight distribution diff --git a/opendaylight/pom.xml b/opendaylight/pom.xml index a5a61063..fd4cebc3 100644 --- a/opendaylight/pom.xml +++ b/opendaylight/pom.xml @@ -9,7 +9,6 @@ distribution-opendaylight - 1.1.1-SNAPSHOT pom ccsdk-distribution :: opendaylight diff --git a/opendaylight/sodium/pom.xml b/opendaylight/sodium/pom.xml index 6310fea9..fe63f6db 100644 --- a/opendaylight/sodium/pom.xml +++ b/opendaylight/sodium/pom.xml @@ -9,33 +9,27 @@ distribution-odl-sodium - 1.1.1-SNAPSHOT pom - ccsdk-distribution :: opendaylight + ccsdk-distribution :: opendaylight :: sodium Creates OpenDaylight container - - - ${project.version} - ${maven.build.timestamp} - 0.11.4 - deploy - - - - - - org.opendaylight.integration - onap-karaf - ${ccsdk.opendaylight.version} - tar.gz - - - - - - sodium-alpine + sodium-alpine + + + 0.11.4 + + + + + + org.opendaylight.integration + onap-karaf + ${ccsdk.opendaylight.version} + tar.gz + + + diff --git a/opendaylight/sodium/sodium-alpine/pom.xml b/opendaylight/sodium/sodium-alpine/pom.xml index 05e1f2eb..7e3ea9a2 100644 --- a/opendaylight/sodium/sodium-alpine/pom.xml +++ b/opendaylight/sodium/sodium-alpine/pom.xml @@ -1,168 +1,155 @@ - 4.0.0 - - - org.onap.ccsdk.distribution - distribution-odl-sodium - 1.1.1-SNAPSHOT - - - distribution-odl-sodium-docker - 1.1.1-SNAPSHOT - pom - - ccsdk-distribution :: opendaylight :: sodium :: docker - Creates OpenDaylight container - - ONAP - - - - onap/ccsdk-odl-sodium-alpine-image - onap-karaf - - - - - - - org.codehaus.groovy.maven - gmaven-plugin - - - validate - - execute - - - ${basedir}/../../../src/main/scripts/TagVersion.groovy - - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.0 - - - get-odl-distribution - validate - - copy - - - - - org.opendaylight.integration - ${odl.karaf.artifactId} - ${ccsdk.opendaylight.version} - tar.gz - - true - ${basedir}/target/docker-stage - - - false - true - true - - - - - - - maven-resources-plugin - 2.6 - - - copy-dockerfile - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - src/main/docker - - Dockerfile - - true - - - src/main/odlscripts - - * - - false - - - - - - - - - - - - - - - docker - - - - io.fabric8 - docker-maven-plugin - 0.28.0 - false - - - - ${image.name} - - try - ${basedir}/target/docker-stage - Dockerfile - - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - - - - - - - - generate-images - package - - build - - - - - push-images - ${docker.push.phase} - - build - push - - - - - - - - - - + 4.0.0 + + + org.onap.ccsdk.distribution + distribution-odl-sodium + 1.1.1-SNAPSHOT + + + distribution-odl-sodium-docker + pom + + ccsdk-distribution :: opendaylight :: sodium :: docker + Creates OpenDaylight container + + ONAP + + + + onap/ccsdk-odl-sodium-alpine-image + onap-karaf + + + + + + + org.codehaus.groovy.maven + gmaven-plugin + 1.0 + + + validate + + execute + + + ${basedir}/../../../src/main/scripts/TagVersion.groovy + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.0 + + + get-odl-distribution + validate + + copy + + + + + org.opendaylight.integration + ${odl.karaf.artifactId} + ${ccsdk.opendaylight.version} + tar.gz + + true + ${basedir}/target/docker-stage + + + false + true + true + + + + + + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + src/main/odlscripts + + * + + false + + + + + + + + + + + + + docker + + + + io.fabric8 + docker-maven-plugin + 0.34.0 + false + + + + ${image.name} + + try + ${basedir}/target/docker-stage + Dockerfile + + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + + + + + ${docker.verbose} + ${docker.skip.push} + + + + build-push-images + + build + push + + + + + + + + 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 + + + + + + + + diff --git a/pom.xml b/pom.xml index cafbad02..65d7ba92 100644 --- a/pom.xml +++ b/pom.xml @@ -31,9 +31,16 @@ distribution + ${project.version} + ${project.version} yyyyMMdd'T'HHmmss'Z' + ${maven.build.timestamp} ${maven.build.timestamp} + + false + true + UTF-8 UTF-8 @@ -83,5 +90,4 @@ - diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml index f0a59235..16a29610 100644 --- a/saltstack-server/pom.xml +++ b/saltstack-server/pom.xml @@ -9,16 +9,13 @@ saltstack-server - 1.1.1-SNAPSHOT pom - ccsdk-distribution :: saltstack-server + ccsdk-distribution :: ${project.artifactId} Creates base saltstack-server Docker container onap/ccsdk-saltstack-server-image - ${project.version} - ${maven.build.timestamp} @@ -27,6 +24,7 @@ org.codehaus.groovy.maven gmaven-plugin + 1.0 validate @@ -34,7 +32,7 @@ execute - ${basedir}/../src/main/scripts/TagVersion.groovy + ${basedir}/../src/main/scripts/TagVersion.groovy @@ -76,38 +74,30 @@ io.fabric8 docker-maven-plugin - 0.26.0 + 0.34.0 false - ${image.name} try - ${basedir}/target/docker-stage + ${basedir}/target/docker-stage Dockerfile - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} + ${project.docker.latestminortag.version} + ${project.docker.latestfulltag.version} + ${project.docker.latesttagtimestamp.version} + ${docker.verbose} + ${docker.skip.push} - generate-images - generate-sources - - build - - - - - push-images - deploy + build-push-images build push @@ -115,7 +105,6 @@ - diff --git a/ubuntu/pom.xml b/ubuntu/pom.xml index 22ee2eee..63f64335 100644 --- a/ubuntu/pom.xml +++ b/ubuntu/pom.xml @@ -9,7 +9,6 @@ distribution-ubuntu - 1.1.1-SNAPSHOT pom ccsdk-distribution :: ubuntu @@ -20,17 +19,14 @@ onap/ccsdk-ubuntu-image - ${project.version} - ${maven.build.timestamp} - ${project.version} - org.codehaus.groovy.maven gmaven-plugin + 1.0 validate @@ -80,16 +76,15 @@ io.fabric8 docker-maven-plugin - 0.28.0 + 0.34.0 false - ${image.name} try - ${basedir}/target/docker-stage + ${basedir}/target/docker-stage Dockerfile ${project.docker.latestminortag.version} @@ -99,19 +94,12 @@ + ${docker.verbose} + ${docker.skip.push} - generate-images - generate-sources - - build - - - - - push-images - deploy + build-push-images build push @@ -119,7 +107,6 @@ - -- 2.16.6