X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-sim%2Fpackages%2Fmodels-simulator-docker%2Fpom.xml;h=c2d6df587baf1f7cec473bb0962026f5e0e2d1b4;hb=4e9c78dc19b2168b9f4781ad0b3da993b7489d48;hp=f0534d609fe47fd0e39b9a4843f4e5d108cb5e7c;hpb=ee142f53056dc67886cbf71ffc9759ef1ad4a203;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 f0534d609..c2d6df587 100644
--- a/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@ -2,6 +2,7 @@
============LICENSE_START=======================================================
Copyright (C) 2020 Bell Canada.
Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
+ Modifications Copyright (C) 2022 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -25,7 +26,7 @@
org.onap.policy.models.sim
models-sim-packages
- 2.4.0-SNAPSHOT
+ 2.7.0-SNAPSHOT
models-simulator-docker
@@ -52,9 +53,9 @@
${project.artifactId}-${project.version}
- org.codehaus.groovy.maven
- gmaven-plugin
- 1.0
+ org.codehaus.gmaven
+ groovy-maven-plugin
+ 2.1.1
validate
@@ -62,21 +63,7 @@
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
@@ -97,7 +84,7 @@
onap/policy-models-simulator
try
- Dockerfile
+ ${dockerFile}
${project.version}
${project.version}-${maven.build.timestamp}