X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=41ef7b734d4216f8be72b998403ca338f088b210;hb=643e032e9078ab47e1abb1f088aaec58a3361c7c;hp=69a5b92029c25035fdef054f1e21bc58e5d1cb19;hpb=a79c328f0fdf4ec9b2125a4b3df8192da3247f32;p=ccsdk%2Fdistribution.git diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 69a5b920..41ef7b73 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -3,15 +3,14 @@ 4.0.0 - org.onap.ccsdk.parent - odlparent-lite - 2.1.0 - + org.onap.ccsdk.distribution + distribution-odlsli + 1.2.0-SNAPSHOT org.onap.ccsdk.distribution distribution-odlsli-alpine - 1.1.1-SNAPSHOT + 1.2.0-SNAPSHOT pom ccsdk-distribution :: odlsli-alpine @@ -21,312 +20,302 @@ - onap/ccsdk-odl-sodium-alpine-image + onap/ccsdk-odl-aluminum-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 + + ${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 ${odl.features.extra},${ccsdk.odl.features} - - 1.1.0 - 1.1.0 - 1.1.0 - 1.1.0 - 1.1.0 - 1.1.0 + 1.1.1 + 1.2.0 + 1.2.0 + 1.2.0 + 1.2.0 + 1.1.1 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 +328,6 @@ - - maven-resources-plugin 2.6 @@ -364,7 +351,6 @@ - copy-scripts @@ -384,7 +370,6 @@ - copy-odl-resources @@ -523,12 +508,31 @@ + + org.apache.maven.plugins + maven-antrun-plugin + 1.8 + + + change shell permissions + process-sources + + + + + + + run + + + + + 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 +590,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 +615,24 @@ ${image.name} try - ${basedir}/target/docker-stage + true + ${basedir}/target/docker-stage Dockerfile - ${project.docker.latestminortag.version} - ${project.docker.latestfulltag.version} - ${project.docker.latesttagtimestamp.version} - ${project.docker.uniquedockertag.version} - + ${project.docker.latestminortag.snapshot.version} + ${project.docker.latestfulltag.snapshot.version} + ${project.docker.latesttagtimestamp.snapshot.version} + + ${docker.verbose} + ${docker.skip.run} + ${docker.skip.push} - generate-images + build-images package build @@ -637,9 +652,12 @@ itsASecret + + custom @@ -657,14 +675,14 @@ - ${image.name}:${project.docker.latesttagtimestamp.version} + ${image.name}:${project.docker.latesttagtimestamp.snapshot.version} odlsli-container itsASecret - sdnctl - gamma - sdnctl + sdnctl + gamma + sdnctl /opt/onap/ccsdk/data/properties INFO @@ -675,13 +693,13 @@ custom onap odlsli - > + odlsli.port:8181 all warp coils are now operating at peak efficiency - + true @@ -700,9 +718,8 @@ push-images - ${docker.push.phase} - build + push