X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fpolicy-xacmlpdp-docker%2Fpom.xml;h=35962eec0a9f8bd69075ce043457009f9cd29bd9;hb=923b8047da57ae1866ff1816878164ceee8f3c1e;hp=5aa999b0489e1c61bd9b6783ba1f7f613ba20a73;hpb=085bb42d77d91726f7d51e21148ac7906fad689c;p=policy%2Fxacml-pdp.git

diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index 5aa999b0..35962eec 100644
--- a/packages/policy-xacmlpdp-docker/pom.xml
+++ b/packages/policy-xacmlpdp-docker/pom.xml
@@ -1,6 +1,6 @@
 <!--
   ============LICENSE_START=======================================================
-   Copyright (C) 2019 AT&T Intellectual Property. All rights reserved.
+   Copyright (C) 2019, 2021 AT&T Intellectual Property. All rights reserved.
    Modifications Copyright (C) 2020 Bell Canada.
   ================================================================================
   Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,24 +26,22 @@
     <parent>
         <groupId>org.onap.policy.xacml-pdp</groupId>
         <artifactId>xacml-packages</artifactId>
-        <version>2.2.2-SNAPSHOT</version>
+        <version>2.6.4</version>
     </parent>
 
     <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>
-        <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
-        <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
         <maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
     </properties>
 
@@ -51,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>
@@ -61,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>
@@ -93,12 +77,11 @@
 
                     <images>
                         <image>
-                            <name>onap/policy-xacml-pdp</name>
+                            <name>onap/policy-xacml-pdp:${project.version}</name>
                             <build>
                                 <cleanup>try</cleanup>
                                 <dockerFile>Dockerfile</dockerFile>
                                 <tags>
-                                    <tag>${project.version}</tag>
                                     <tag>${project.version}-${maven.build.timestamp}</tag>
                                     <tag>${project.docker.latest.minmax.tag.version}</tag>
                                 </tags>