X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=blobdiff_plain;f=saltstack-server%2Fpom.xml;fp=saltstack-server%2Fpom.xml;h=16a29610276af3d38f490dde48aaf827dacd07bf;hp=f0a592353550f00bc30e847b5b4bdaca61554129;hb=b6e7d96acfa2459c7a8c8f9fbdefcfacaf62e9f2;hpb=110bb110a48b98a40dad33e80071e0a21386f11d;ds=sidebyside
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index f0a59235..16a29610 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -9,16 +9,13 @@
saltstack-server
- 1.1.1-SNAPSHOT
pom
- ccsdk-distribution :: saltstack-server
+ ccsdk-distribution :: ${project.artifactId}
Creates base saltstack-server Docker container
onap/ccsdk-saltstack-server-image
- ${project.version}
- ${maven.build.timestamp}
@@ -27,6 +24,7 @@
org.codehaus.groovy.maven
gmaven-plugin
+ 1.0
validate
@@ -34,7 +32,7 @@
execute
-
+
@@ -76,38 +74,30 @@
io.fabric8
docker-maven-plugin
- 0.26.0
+ 0.34.0
false
-
${image.name}
try
- ${basedir}/target/docker-stage
+ ${basedir}/target/docker-stage
Dockerfile
- ${project.docker.latestminortag.version}
- ${project.docker.latestfulltag.version}
- ${project.docker.latesttagtimestamp.version}
+ ${project.docker.latestminortag.version}
+ ${project.docker.latestfulltag.version}
+ ${project.docker.latesttagtimestamp.version}
+ ${docker.verbose}
+ ${docker.skip.push}
- generate-images
- generate-sources
-
- build
-
-
-
-
- push-images
- deploy
+ build-push-images
build
push
@@ -115,7 +105,6 @@
-