From 8fa79afbb76fd6050141ff5bd5e0c17d6d077426 Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Mon, 9 Aug 2021 14:55:15 -0400 Subject: use url resource for docker-tag -- pap use groovy url resource from docker repo to identify the tag for docker Issue-ID: POLICY-3378 Change-Id: I1abd43ae0cd6f0ddc1060ccb525d2ba43e39f392 Signed-off-by: Taka Cho --- packages/policy-pap-docker/pom.xml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml index 692d85dd..e41c1b6b 100644 --- a/packages/policy-pap-docker/pom.xml +++ b/packages/policy-pap-docker/pom.xml @@ -49,9 +49,9 @@ ${project.artifactId}-${project.version} - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate @@ -59,21 +59,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 -- cgit 1.2.3-korg