From d2d765bc9b41e3600f1c63a441657821f90ce837 Mon Sep 17 00:00:00 2001 From: danielhanrahan Date: Wed, 29 Jun 2022 11:21:27 +0100 Subject: use url resource for docker-tag -- clamp use groovy url resource from docker repo to identify the tag for docker. Issue-ID: POLICY-3378 Signed-off-by: danielhanrahan Change-Id: I4cf830b52fd6ad561271edc966f4f4735756337a --- packages/policy-clamp-docker/pom.xml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'packages/policy-clamp-docker') diff --git a/packages/policy-clamp-docker/pom.xml b/packages/policy-clamp-docker/pom.xml index 10747ff87..5d3f0af16 100644 --- a/packages/policy-clamp-docker/pom.xml +++ b/packages/policy-clamp-docker/pom.xml @@ -50,9 +50,9 @@ ${project.artifactId}-${project.version} - org.codehaus.groovy.maven - gmaven-plugin - 1.0 + org.codehaus.gmaven + groovy-maven-plugin + 2.1.1 validate @@ -60,21 +60,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