X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=models-sim%2Fpackages%2Fmodels-simulator-docker%2Fpom.xml;h=d8eda200c59573b42c8f04fc0916f063c907e16c;hb=7998671c0a54a7ecfa36352c95e183f0bb9aa7e7;hp=4919a7f2c47a85ca4a59240956e2d56cd08194b9;hpb=61c7e7795d2aa1ed321bd55e4637aa705e6e98ae;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 4919a7f2c..d8eda200c 100644
--- a/models-sim/packages/models-simulator-docker/pom.xml
+++ b/models-sim/packages/models-simulator-docker/pom.xml
@@ -2,7 +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.
+ Modifications Copyright (C) 2022-2023 Nordix Foundation.
================================================================================
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
org.onap.policy.models.sim
models-sim-packages
- 2.7.0-SNAPSHOT
+ 2.8.3-SNAPSHOT
models-simulator-docker
@@ -44,6 +44,7 @@
false
nexus3.onap.org:10001
nexus3.onap.org:10003
+ ${project.basedir}/src/main/docker
yyyyMMdd'T'HHmm
true
@@ -53,9 +54,8 @@
${project.artifactId}-${project.version}
- org.codehaus.groovy.maven
- gmaven-plugin
- 1.0
+ org.codehaus.gmaven
+ groovy-maven-plugin
validate
@@ -63,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
@@ -86,25 +72,6 @@
io.github.git-commit-id
git-commit-id-maven-plugin
- 5.0.0
-
-
- get-the-git-infos
-
- revision
-
- initialize
-
-
-
- false
- true
-
- ^git.build.(time|version)$
- ^git.commit.id.abbrev$
-
- full
-
@@ -123,6 +90,7 @@
try
${dockerFile}
+ ${docker.contextDir}
${project.version}
${project.version}-${maven.build.timestamp}
@@ -173,9 +141,6 @@
build
push
-
- onap/policy-models-simulator
-
@@ -194,7 +159,7 @@
org.onap.policy.models.sim
models-simulator-tarball
- ${project.version}
+ ${project.version}
tarball
tar.gz