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 --- 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 ++++++++++----------- 8 files changed, 341 insertions(+), 382 deletions(-) (limited to 'opendaylight') 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 + + + + + + + + -- cgit 1.2.3-korg