X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=saltstack-server%2Fpom.xml;h=a228da700af3a13e9a6bd8f9bfeba28ed68017cd;hb=7d9d0d41b467505399dc51820f555e3ae6484e0b;hp=f0a592353550f00bc30e847b5b4bdaca61554129;hpb=692718d5aca13ede537d44a89aafcb33bc80257a;p=ccsdk%2Fdistribution.git
diff --git a/saltstack-server/pom.xml b/saltstack-server/pom.xml
index f0a59235..a228da70 100644
--- a/saltstack-server/pom.xml
+++ b/saltstack-server/pom.xml
@@ -5,20 +5,17 @@
org.onap.ccsdk.distribution
distribution-root
- 1.1.1-SNAPSHOT
+ 1.2.1-SNAPSHOT
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,31 @@
io.fabric8
docker-maven-plugin
- 0.26.0
+ 0.34.0
false
-
${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.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 +106,6 @@
-