X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=packages%2Fpolicy-api-docker%2Fpom.xml;h=02b67688ce0ab2c56634ef9c169aa788894452e9;hb=9613f7f3b7074b173757f53de4160a9a134eecfc;hp=f0ee9ba4c098dee0ffb3ce2f6f135063b0ce7d1e;hpb=9bcc74f6a5d69833a848d771811064e65c62098e;p=policy%2Fapi.git

diff --git a/packages/policy-api-docker/pom.xml b/packages/policy-api-docker/pom.xml
index f0ee9ba4..02b67688 100644
--- a/packages/policy-api-docker/pom.xml
+++ b/packages/policy-api-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.
@@ -25,13 +26,13 @@
 
     <parent>
         <groupId>org.onap.policy.api</groupId>
-        <artifactId>packages</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
+        <artifactId>api-packages</artifactId>
+        <version>2.4.5</version>
     </parent>
 
     <packaging>pom</packaging>
     <artifactId>policy-api-docker</artifactId>
-    <name>Policy api docker image</name>
+    <name>${project.artifactId}</name>
     <description>Policy api docker image</description>
 
     <properties>
@@ -61,19 +62,19 @@
                         </goals>
                         <configuration>
                             <source>
-                                println 'Project version: ' + project.properties['dist.project.version'];
-                                def versionArray;
-                                if ( project.properties['dist.project.version'] != null ) {
-                                    versionArray = project.properties['dist.project.version'].split('-');
+                                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']
                                 }
-
-                                if ( project.properties['dist.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";
-                                }
-
-                                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>
@@ -100,7 +100,7 @@
                                 <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>