From 0492cd0ee5e58ca2ea0a9921d93c1a7660838e27 Mon Sep 17 00:00:00 2001
From: sg481n <sg481n@att.com>
Date: Sun, 24 Sep 2017 23:08:44 +0000
Subject: Release docker image of AAF to nexus

Issue-id: AAF-59
Change-Id: I659ac1ecd26694720d58a717364fb446dc897550
Signed-off-by: sg481n <sg481n@att.com>
---
 authz-service/pom.xml | 38 +++++++++-----------------------------
 1 file changed, 9 insertions(+), 29 deletions(-)

diff --git a/authz-service/pom.xml b/authz-service/pom.xml
index ad7ebd4a..bb268726 100644
--- a/authz-service/pom.xml
+++ b/authz-service/pom.xml
@@ -199,29 +199,19 @@
           </execution> 
 
           <execution>
-            <id>tag-image-latest-timestamp</id>
+            <id>tag-image-project-version</id>
             <phase>package</phase>
             <goals>
               <goal>tag</goal>
             </goals>
             <configuration>
               <image>onap/aaf/authz-service</image>
-              <newName>onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</newName>
+              <newName>onap/aaf/authz-service:${project.version}</newName>
               <skipDockerTag>${skip.docker.push}</skipDockerTag>
             </configuration>
           </execution>
-          <execution>
-            <id>push-image-latest-timestamp</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>push</goal>
-            </goals>
-            <configuration>
-              <imageName>onap/aaf/authz-service:${project.docker.latesttagtimestamp.version}</imageName>
-              <skipDockerPush>${skip.docker.push}</skipDockerPush>
-            </configuration>
-          </execution>
-          <execution>
+		  
+		  <execution>
             <id>tag-image-latest</id>
             <phase>package</phase>
             <goals>
@@ -229,33 +219,23 @@
             </goals>
             <configuration>
               <image>onap/aaf/authz-service</image>
-              <newName>onap/aaf/authz-service:${project.docker.latesttag.version}</newName>
+              <newName>onap/aaf/authz-service:latest</newName>
               <skipDockerTag>${skip.docker.push}</skipDockerTag>
             </configuration>
           </execution>
-          <execution>
+          
+         <execution>
             <id>push-image-latest</id>
             <phase>deploy</phase>
             <goals>
               <goal>push</goal>
             </goals>
             <configuration>
-              <imageName>onap/aaf/authz-service:${project.docker.latesttag.version}</imageName>
+              <imageName>onap/aaf/authz-service:${project.version}</imageName>
               <skipDockerPush>${skip.docker.push}</skipDockerPush>
             </configuration>
           </execution>
-          <execution>
-            <id>tag-image</id>
-            <phase>package</phase>
-            <goals>
-              <goal>tag</goal>
-            </goals>
-            <configuration>
-              <image>onap/aaf/authz-service</image>
-              <newName>onap/aaf/authz-service:latest</newName>
-              <skipDockerTag>${skip.docker.push}</skipDockerTag>
-            </configuration>
-          </execution>
+          
           <execution>
             <id>push-image</id>
             <phase>deploy</phase>
-- 
cgit 1.2.3-korg