X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-ubuntu%2Fpom.xml;h=6cae49cee9a63e6a56f9f4860f4c780635900d73;hb=4b054f9fab21f76992441e92069694d9f0cba0aa;hp=e525be2f1cb777e2c9e10484d3a95dec8f718faf;hpb=c3c7475fe76a269dff62347fedcba796a283528b;p=ccsdk%2Fdistribution.git
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index e525be2f..6cae49ce 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -5,13 +5,13 @@
org.onap.ccsdk.parent
odlparent-lite
- 1.2.1-SNAPSHOT
+ 1.2.2-SNAPSHOT
org.onap.ccsdk.distribution
distribution-odlsli-ubuntu
- 0.4.1-SNAPSHOT
+ 0.4.2-SNAPSHOT
pom
ccsdk-distribution :: odlsli-ubuntu
@@ -24,13 +24,17 @@
onap/ccsdk-odl-fluorine-ubuntu-image
onap/ccsdk-odlsli-image
${project.version}
- ${project.version}
+ ${maven.build.timestamp}
+ 0.4.2-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}
@@ -105,6 +109,13 @@
repo
zip
+
+ org.onap.ccsdk.sli.adaptors
+ grpc-client-installer
+ ${ccsdk.sli.adaptors.version}
+ repo
+ zip
+
org.onap.ccsdk.sli.adaptors
mdsal-resource-installer
@@ -112,6 +123,13 @@
repo
zip
+
+ org.onap.ccsdk.sli.adaptors.messagerouter
+ publisher.installer
+ ${ccsdk.sli.adaptors.version}
+ repo
+ zip
+
org.onap.ccsdk.sli.adaptors
netbox-client-installer
@@ -231,6 +249,20 @@
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
+
@@ -255,22 +287,7 @@
execute
-
- println project.properties['ccsdk.project.version'];
- def versionArray;
- if (project.properties['ccsdk.project.version'] != null ) {
- versionArray = project.properties['ccsdk.project.version'].split('\\.');
- }
-
- if (project.properties['ccsdk.project.version'].endsWith("-SNAPSHOT"))
- {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- } else {
- project.properties['project.docker.latesttag.version']=versionArray[0] + '.' + versionArray[1] + "-STAGING-latest";
- }
-
- println 'New Tag for docker:' + project.properties['project.docker.latesttag.version'];
-
+ ${basedir}/../../src/main/scripts/TagVersion.groovy
@@ -510,9 +527,9 @@
${basedir}/target/docker-stage
${basedir}/target/docker-stage/Dockerfile
- ${project.version}
- ${project.version}-STAGING-${maven.build.timestamp}
- ${project.docker.latesttag.version}
+ ${project.docker.latestminortag.version}
+ ${project.docker.latestfulltag.version}
+ ${project.docker.latesttagtimestamp.version}