X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=inline;f=odlsli%2Fodlsli-ubuntu%2Fpom.xml;h=0c019619a1a44cf043558a04fc4b3d43103a7a8a;hb=4d1e965d02b4e0c9609625795d9b2f8c533495fa;hp=b6c5d1423c34e69a1084b52f909441bdfea8d01c;hpb=df56c579a469fbf81efd164b8b77bcef46618aaa;p=ccsdk%2Fdistribution.git
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml
index b6c5d142..0c019619 100644
--- a/odlsli/odlsli-ubuntu/pom.xml
+++ b/odlsli/odlsli-ubuntu/pom.xml
@@ -5,24 +5,26 @@
org.onap.ccsdk.parent
odlparent-lite
- 1.2.0
+ 1.2.1
org.onap.ccsdk.distribution
distribution-odlsli-ubuntu
- 0.4.0-SNAPSHOT
+ 0.4.1-SNAPSHOT
pom
- ccsdk-distribution :: odlsli
- Creates SDN Controller Docker container
+ ccsdk-distribution :: odlsli-ubuntu
+ Creates Ubuntu-based ODLSLI Docker container
openECOMP
+ onap/ccsdk-odl-fluorine-ubuntu-image
onap/ccsdk-odlsli-image
${project.version}
+ ${maven.build.timestamp}
${project.version}
${https_proxy}
yyyyMMdd'T'HHmmss'Z'
@@ -30,6 +32,9 @@
deploy
true
93C4A3FD7BB9C367
+ odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all
+ 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}
@@ -104,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
@@ -111,6 +123,13 @@
repo
zip
+
+ org.onap.ccsdk.sli.adaptors
+ netbox-client-installer
+ ${ccsdk.sli.adaptors.version}
+ repo
+ zip
+
org.onap.ccsdk.sli.adaptors
resource-assignment-installer
@@ -120,7 +139,7 @@
org.onap.ccsdk.sli.adaptors
- netbox-client-installer
+ saltstack-adapter-installer
${ccsdk.sli.adaptors.version}
repo
zip
@@ -223,6 +242,13 @@
repo
zip
+
+ org.onap.ccsdk.features.sdnr.wt
+ sdnr-wt-feature-aggregator-installer
+ ${ccsdk.features.version}
+ repo
+ zip
+
@@ -247,22 +273,7 @@
execute
-
+
@@ -502,9 +513,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}