X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=odlsli%2Fodlsli-alpine%2Fpom.xml;h=2bee08036207883682c370de6e01d29420750449;hb=9dc7bdbbd46f2e3016617b6d0a1ad394d5771439;hp=89207a966b81767a148381922f1c4dc7ee2eaaae;hpb=aa9d825d1d6be1b9bd9611b27607735f6ae1db88;p=ccsdk%2Fdistribution.git
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 89207a96..2bee0803 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -5,13 +5,13 @@
org.onap.ccsdk.parent
odlparent-lite
- 1.2.1-SNAPSHOT
+ 1.4.0-SNAPSHOT
org.onap.ccsdk.distribution
distribution-odlsli-alpine
- 0.4.1-SNAPSHOT
+ 0.6.0-SNAPSHOT
pom
ccsdk-distribution :: odlsli-alpine
@@ -21,21 +21,27 @@
- onap/ccsdk-odl-fluorine-alpine-image
+ onap/ccsdk-odl-neon-alpine-image
onap/ccsdk-odlsli-alpine-image
${project.version}
- ${project.version}
+ ${maven.build.timestamp}
+ 0.6.0-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-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.6.0-SNAPSHOT
+ 0.6.0-SNAPSHOT
+ 0.6.0-SNAPSHOT
+ 0.6.0-SNAPSHOT
-
+
${project.groupId}
@@ -108,6 +114,13 @@
repo
zip
+
+ org.onap.ccsdk.sli.adaptors
+ base-http-installer
+ ${ccsdk.sli.adaptors.version}
+ repo
+ zip
+
org.onap.ccsdk.sli.adaptors
mdsal-resource-installer
@@ -115,6 +128,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
@@ -150,6 +170,7 @@
repo
zip
+
org.onap.ccsdk.sli.northbound
asdcApi-installer
@@ -234,6 +255,35 @@
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
+
+
@@ -258,22 +308,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
@@ -398,6 +433,7 @@
../src/main/properties
*.properties
+ *.vt
false
@@ -502,7 +538,7 @@
io.fabric8
docker-maven-plugin
- 0.16.5
+ 0.28.0
false
@@ -511,11 +547,11 @@
try
${basedir}/target/docker-stage
- ${basedir}/target/docker-stage/Dockerfile
+ 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}