From f85fb6f24bf8b512c9fc2fa92f11cad08217931e Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 5 Mar 2020 16:14:55 -0500 Subject: [PATCH] Update to use released CCSDK artifacts Updated odlsli pom to use released versions of CCSDK artifacts to create docker image Change-Id: Ide7faabd8a931fa550a509d6d4f59f74153d0966 Issue-ID: CCSDK-2152 Signed-off-by: Dan Timoney --- odlsli/odlsli-alpine/pom.xml | 1145 +++++++++++++++++++++--------------------- 1 file changed, 571 insertions(+), 574 deletions(-) diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 076e537a..c3d0f0f6 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -1,596 +1,593 @@ - - 4.0.0 + + 4.0.0 - - org.onap.ccsdk.parent - odlparent-lite - 1.5.2 - - + + org.onap.ccsdk.parent + odlparent-lite + 1.5.2 + + - org.onap.ccsdk.distribution - distribution-odlsli-alpine - 0.7.1-SNAPSHOT - pom + org.onap.ccsdk.distribution + distribution-odlsli-alpine + 0.7.1-SNAPSHOT + pom - ccsdk-distribution :: odlsli-alpine - Creates Alpine-based ODLSLI Docker container - - openECOMP - + ccsdk-distribution :: odlsli-alpine + Creates Alpine-based ODLSLI Docker container + + openECOMP + - - onap/ccsdk-odl-neon-alpine-image - onap/ccsdk-odlsli-alpine-image - ${project.version} - ${maven.build.timestamp} - 0.7.1-SNAPSHOT - ${https_proxy} - yyyyMMdd'T'HHmmss'Z' - opt/opendaylight - deploy - true - 93C4A3FD7BB9C367 - 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 - ${odl.features.extra},${ccsdk.odl.features} + + onap/ccsdk-odl-neon-alpine-image + onap/ccsdk-odlsli-alpine-image + ${project.version} + ${maven.build.timestamp} + ${https_proxy} + yyyyMMdd'T'HHmmss'Z' + opt/opendaylight + deploy + true + 93C4A3FD7BB9C367 + 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 + + ${odl.features.extra},${ccsdk.odl.features} - 0.7.1-SNAPSHOT - 0.7.1-SNAPSHOT - 0.7.1-SNAPSHOT - 0.7.1-SNAPSHOT - + 0.7.1 + 0.7.1 + 0.7.1 + 0.7.1 + 0.7.1 + - - - ${project.groupId} - dependencies - ${project.version} - repo - zip - - - - org.onap.ccsdk.sli.core - dblib-installer - ${ccsdk.sli.core.version} - repo - zip - - - org.onap.ccsdk.sli.core - filters-installer - ${ccsdk.sli.core.version} - repo - zip - - - org.onap.ccsdk.sli.core - sli-installer - ${ccsdk.sli.core.version} - repo - zip - - - org.onap.ccsdk.sli.core - sliapi-installer - ${ccsdk.sli.core.version} - repo - zip - - - org.onap.ccsdk.sli.core - sliPluginUtils-installer - ${ccsdk.sli.core.version} - repo - zip - - - org.onap.ccsdk.sli.core - utils-installer - ${ccsdk.sli.core.version} - repo - zip - - - org.onap.ccsdk.sli.core - slicore-features-installer - ${ccsdk.sli.core.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - aai-service-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - ansible-adapter-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - base-http-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - mdsal-resource-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors.messagerouter - publisher.installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - netbox-client-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - resource-assignment-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - saltstack-adapter-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - sql-resource-installer - ${ccsdk.sli.adaptors.version} - repo - zip - - - org.onap.ccsdk.sli.adaptors - sliadaptors-features-installer - ${ccsdk.sli.adaptors.version} - repo - zip - + + + ${project.groupId} + dependencies + ${project.version} + repo + zip + - - org.onap.ccsdk.sli.northbound - asdcApi-installer - ${ccsdk.sli.northbound.version} - repo - zip - - - org.onap.ccsdk.sli.northbound - dataChange-installer - ${ccsdk.sli.northbound.version} - repo - zip - - - org.onap.ccsdk.sli.northbound - lcm-installer - ${ccsdk.sli.northbound.version} - repo - zip - - - org.onap.ccsdk.sli.northbound - slinorthbound-features-installer - ${ccsdk.sli.northbound.version} - repo - zip - - - org.onap.ccsdk.sli.plugins - properties-node-installer - ${ccsdk.sli.plugins.version} - repo - zip - - - org.onap.ccsdk.sli.plugins - restapi-call-node-installer - ${ccsdk.sli.plugins.version} - repo - zip - - - org.onap.ccsdk.sli.plugins - template-node-installer - ${ccsdk.sli.plugins.version} - repo - zip - - - org.onap.ccsdk.sli.plugins - restconf-client-installer - ${ccsdk.sli.plugins.version} - repo - zip - - - org.onap.ccsdk.sli.plugins - sshapi-call-node-installer - ${ccsdk.sli.plugins.version} - repo - zip - - - org.onap.ccsdk.sli.plugins - sliplugins-features-installer - ${ccsdk.sli.plugins.version} - repo - zip - - - org.onap.ccsdk.features - features-installer - ${ccsdk.features.version} - repo - zip - - - org.onap.ccsdk.features - blueprints-processor-installer - ${ccsdk.features.version} - repo - zip - - - org.onap.ccsdk.features.sdnr.wt - sdnr-wt-feature-aggregator-installer - ${ccsdk.features.version} - repo - zip - - - org.onap.ccsdk.features - aafshiro-installer - ${ccsdk.features.version} - repo - zip - - - org.onap.ccsdk.features.sdnr.northbound - sdnr-northbound-features-installer - ${ccsdk.features.version} - repo - zip - - - org.onap.ccsdk.features.sdnr.northbound - oofpcipoc-installer - ${ccsdk.features.version} - repo - zip - - - org.onap.ccsdk.features.sdnr.northbound - a1Adapter-installer - ${ccsdk.features.version} - repo - zip - - - org.onap.ccsdk.features.sdnr.northbound - CMNotify-installer - ${ccsdk.features.version} - repo - zip - - + + org.onap.ccsdk.sli.core + dblib-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.core + filters-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.core + sli-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.core + sliapi-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.core + sliPluginUtils-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.core + utils-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.core + slicore-features-installer + ${ccsdk.sli.core.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + aai-service-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + ansible-adapter-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + base-http-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + mdsal-resource-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors.messagerouter + publisher.installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + netbox-client-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + resource-assignment-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + saltstack-adapter-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + sql-resource-installer + ${ccsdk.sli.adaptors.version} + repo + zip + + + org.onap.ccsdk.sli.adaptors + sliadaptors-features-installer + ${ccsdk.sli.adaptors.version} + repo + zip + - - - - - org.apache.maven.wagon - wagon-http-lightweight - 2.2 - - - + + org.onap.ccsdk.sli.northbound + asdcApi-installer + ${ccsdk.sli.northbound.version} + repo + zip + + + org.onap.ccsdk.sli.northbound + dataChange-installer + ${ccsdk.sli.northbound.version} + repo + zip + + + org.onap.ccsdk.sli.northbound + lcm-installer + ${ccsdk.sli.northbound.version} + repo + zip + + + org.onap.ccsdk.sli.northbound + slinorthbound-features-installer + ${ccsdk.sli.northbound.version} + repo + zip + + + org.onap.ccsdk.sli.plugins + properties-node-installer + ${ccsdk.sli.plugins.version} + repo + zip + + + org.onap.ccsdk.sli.plugins + restapi-call-node-installer + ${ccsdk.sli.plugins.version} + repo + zip + + + org.onap.ccsdk.sli.plugins + template-node-installer + ${ccsdk.sli.plugins.version} + repo + zip + + + org.onap.ccsdk.sli.plugins + restconf-client-installer + ${ccsdk.sli.plugins.version} + repo + zip + + + org.onap.ccsdk.sli.plugins + sshapi-call-node-installer + ${ccsdk.sli.plugins.version} + repo + zip + + + org.onap.ccsdk.sli.plugins + sliplugins-features-installer + ${ccsdk.sli.plugins.version} + repo + zip + + + org.onap.ccsdk.features + features-installer + ${ccsdk.features.version} + repo + zip + + + org.onap.ccsdk.features.sdnr.wt + sdnr-wt-feature-aggregator-installer + ${ccsdk.features.version} + repo + zip + + + org.onap.ccsdk.features + aafshiro-installer + ${ccsdk.features.version} + repo + zip + + + org.onap.ccsdk.features.sdnr.northbound + sdnr-northbound-features-installer + ${ccsdk.features.version} + repo + zip + + + org.onap.ccsdk.features.sdnr.northbound + oofpcipoc-installer + ${ccsdk.features.version} + repo + zip + + + org.onap.ccsdk.features.sdnr.northbound + a1Adapter-installer + ${ccsdk.features.version} + repo + zip + + + org.onap.ccsdk.features.sdnr.northbound + CMNotify-installer + ${ccsdk.features.version} + repo + zip + + + + + + + org.apache.maven.wagon + wagon-http-lightweight + 2.2 + + + - - org.codehaus.groovy.maven - gmaven-plugin - - - 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/docker - - Dockerfile - - true - - - - + + maven-resources-plugin + 2.6 + + + copy-dockerfile + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + src/main/docker + + Dockerfile + + true + + + + - - copy-scripts - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/ccsdk/bin - - - ../src/main/scripts - - *.sh - - false - - - - + + copy-scripts + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/bin + + + ../src/main/scripts + + *.sh + + false + + + + - - copy-odl-resources - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - ../src/main/resources - - idmlight.db.mv.db - org.ops4j.pax.logging.cfg - install_ccsdk.yml - ansible-sources.list - - false - - - - - - copy-config - - copy-resources - - validate - - ${basedir}/target/docker-stage - - - ../src/main/resources - - org.ops4j.pax.logging.cfg - - false - - - - - - copy-data - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/ccsdk/data - - - ../src/main/resources - - *.dump - - false - - - - - - copy-properties - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties - - - ../src/main/properties - - *.properties - *.vt - - false - - - - - - copy-keystores - - copy-resources - - validate - - ${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores - - - ../src/main/stores - - *.jks - - false - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.0.2 - - - unpack features - generate-sources - - unpack-dependencies - - - ${basedir}/target/docker-stage - true - - - - unpack dgs - generate-sources - - unpack - - - ${basedir}/target/docker-stage/opt/onap/ccsdk - - - ${project.groupId} - platform-logic-installer - ${project.version} - zip - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - + + copy-odl-resources + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + ../src/main/resources + + idmlight.db.mv.db + org.ops4j.pax.logging.cfg + install_ccsdk.yml + ansible-sources.list + + false + + + + + + copy-config + + copy-resources + + validate + + ${basedir}/target/docker-stage + + + ../src/main/resources + + org.ops4j.pax.logging.cfg + + false + + + + + + copy-data + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/data + + + ../src/main/resources + + *.dump + + false + + + + + + copy-properties + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties + + + + ../src/main/properties + + *.properties + *.vt + + false + + + + + + copy-keystores + + copy-resources + + validate + + ${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores + + + ../src/main/stores + + *.jks + + false + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.0.2 + + + unpack features + generate-sources + + unpack-dependencies + + + ${basedir}/target/docker-stage + true + + + + unpack dgs + generate-sources + + unpack + + + ${basedir}/target/docker-stage/opt/onap/ccsdk + + + ${project.groupId} + platform-logic-installer + ${project.version} + zip + + + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.5.0 + - - 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.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - - - - - - - - generate-images - package - - build - - + + + 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 - - - - - - - - + + push-images + ${docker.push.phase} + + build + push + + + + + + + + -- 2.16.6