X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-sim%2Fpackages%2Fmodels-simulator-docker%2Fpom.xml;h=361a1fd5f5b6b38b70e03cb29910254df665ed48;hb=6709a8b05bcb543b6871baf35d52e7a156dde13d;hp=f6ccfd1628c65c4536b4f6d0420693f6e7722ef1;hpb=9df1bb8cdebacb47875ddd798ccbd8decccef078;p=policy%2Fmodels.git
diff --git a/models-sim/packages/models-simulator-docker/pom.xml b/models-sim/packages/models-simulator-docker/pom.xml
index f6ccfd162..361a1fd5f 100644
--- a/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@ -1,6 +1,8 @@
true
@@ -51,9 +54,8 @@
${project.artifactId}-${project.version}
- org.codehaus.groovy.maven
- gmaven-plugin
- 1.0
+ org.codehaus.gmaven
+ groovy-maven-plugin
validate
@@ -61,26 +63,17 @@
execute
-
- println 'Project version: ' + project.properties['dist.project.version']
- if (project.properties['dist.project.version'] != null) {
- def versionArray = project.properties['dist.project.version'].split('-')
- def minMaxVersionArray = versionArray[0].tokenize('.')
- if (project.properties['dist.project.version'].endsWith("-SNAPSHOT")) {
- project.properties['project.docker.latest.minmax.tag.version'] =
- minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-SNAPSHOT-latest"
- } else {
- project.properties['project.docker.latest.minmax.tag.version'] =
- minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-STAGING-latest"
- }
- println 'New tag for docker: ' + project.properties['project.docker.latest.minmax.tag.version']
- }
-
+ https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy
+
+ io.github.git-commit-id
+ git-commit-id-maven-plugin
+
+
io.fabric8
docker-maven-plugin
@@ -96,7 +89,8 @@
onap/policy-models-simulator
try
- Dockerfile
+ ${dockerFile}
+ ${docker.contextDir}
${project.version}
${project.version}-${maven.build.timestamp}
@@ -147,9 +141,6 @@
build
push
-
- onap/policy-models-simulator
-
@@ -168,7 +159,7 @@
org.onap.policy.models.sim
models-simulator-tarball
- 2.3.2-SNAPSHOT
+ ${project.version}
tarball
tar.gz