Set the default tag of image policy-xacml-pdp to be project version on honolulu

[policy/xacml-pdp.git] / packages / policy-xacmlpdp-docker / pom.xml

diff --git a/packages/policy-xacmlpdp-docker/pom.xml b/packages/policy-xacmlpdp-docker/pom.xml
index ef47dd7..c7a73d2 100644 (file)
--- a/packages/policy-xacmlpdp-docker/pom.xml
+++ b/packages/policy-xacmlpdp-docker/pom.xml
@@ -1,6 +1,7 @@
 <!--
   ============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");
   you may not use this file except in compliance with the License.
@@ -24,13 +25,13 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.onap.policy.xacml-pdp</groupId>
-        <artifactId>packages</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <artifactId>xacml-packages</artifactId>
+        <version>2.4.6-SNAPSHOT</version>
     </parent>
 
     <packaging>pom</packaging>
     <artifactId>policy-xacmlpdp-docker</artifactId>
-    
+
     <name>${project.artifactId}</name>
     <description>Creates Policy Xacml PDP docker images</description>
 
@@ -62,18 +63,18 @@
                         <configuration>
                             <source>
                                 println 'Project version: ' + project.properties['pdpx.project.version'];
-                                def versionArray;
-                                if ( project.properties['pdpx.project.version'] != null ) {
-                                    versionArray = project.properties['pdpx.project.version'].split('-');
-                                }
-
-                                if ( project.properties['pdpx.project.version'].endsWith("-SNAPSHOT") ) {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest";
-                                } else {
-                                    project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+                                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']
                                 }
-
-                                println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
                             </source>
                         </configuration>
                     </execution>
@@ -83,7 +84,6 @@
             <plugin>
                 <groupId>io.fabric8</groupId>
                 <artifactId>docker-maven-plugin</artifactId>
-                <version>0.28.0</version>
 
                 <configuration>
                     <verbose>true</verbose>
@@ -93,14 +93,13 @@
 
                     <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.latesttag.version}</tag>
+                                    <tag>${project.docker.latest.minmax.tag.version}</tag>
                                 </tags>
                                 <assembly>
                                     <inline>