summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaka Cho <takamune.cho@att.com>2021-08-09 16:29:29 -0400
committerTaka Cho <takamune.cho@att.com>2021-08-09 16:36:31 -0400
commitd91e75bc0c1953c034f263863c41d506170dedcf (patch)
tree25c9605f6042ba6c7b323418770b4deaea877538
parent031a0fe51dff21445034befc8a6d8732622acd07 (diff)
use url resource for docker-tag -- xacml
use groovy url resource from docker repo to identify the tag for docker. Also, rename to dist.project.version for the unified docker-tag.groovy Issue-ID: POLICY-3378 Change-Id: I68c739b315d3d794baa4685a3f141e3b7cf9ef31 Signed-off-by: Taka Cho <takamune.cho@att.com>
-rw-r--r--packages/policy-xacmlpdp-docker/pom.xml26
1 files changed, 6 insertions, 20 deletions
diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index e2cba71f..35931e0c 100644
--- a/packages/policy-xacmlpdp-docker/pom.xml
+++ b/packages/policy-xacmlpdp-docker/pom.xml
@@ -31,14 +31,14 @@
<packaging>pom</packaging>
<artifactId>policy-xacmlpdp-docker</artifactId>
-
+
<name>${project.artifactId}</name>
<description>Creates Policy Xacml PDP docker images</description>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <pdpx.project.version>${project.version}</pdpx.project.version>
+ <dist.project.version>${project.version}</dist.project.version>
<docker.skip>false</docker.skip>
<docker.skip.build>false</docker.skip.build>
<docker.skip.push>false</docker.skip.push>
@@ -49,9 +49,9 @@
<finalName>${project.artifactId}-${project.version}</finalName>
<plugins>
<plugin>
- <groupId>org.codehaus.groovy.maven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <version>1.0</version>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>groovy-maven-plugin</artifactId>
+ <version>2.1.1</version>
<executions>
<execution>
<phase>validate</phase>
@@ -59,21 +59,7 @@
<goal>execute</goal>
</goals>
<configuration>
- <source>
- println 'Project version: ' + project.properties['pdpx.project.version'];
- if (project.properties['pdpx.project.version'] != null) {
- def versionArray = project.properties['pdpx.project.version'].split('-')
- def minMaxVersionArray = versionArray[0].tokenize('.')
- if (project.properties['pdpx.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']
- }
- </source>
+ <source>https://github.com/onap/policy-docker/raw/master/utils/groovy/docker-tag.groovy</source>
</configuration>
</execution>
</executions>