From d4f7ee836b055877cdd299623b6a9e9f7e8ccb26 Mon Sep 17 00:00:00 2001 From: Taka Cho Date: Mon, 9 Aug 2021 16:12:04 -0400 Subject: use url resource for docker-tag -- apex use groovy url resource from docker repo to identify the tag for docker Issue-ID: POLICY-3378 Change-Id: I73be74f19d0d39912676d839c99f918fdfcf2078 Signed-off-by: Taka Cho --- packages/apex-pdp-docker/pom.xml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/packages/apex-pdp-docker/pom.xml b/packages/apex-pdp-docker/pom.xml index b6fbe30df..f83755708 100644 --- a/packages/apex-pdp-docker/pom.xml +++ b/packages/apex-pdp-docker/pom.xml @@ -46,9 +46,9 @@ ${project.artifactId}-${project.version} - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate @@ -56,21 +56,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: ' + 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