From 46b95ed43371573810a134746f097063ccd4e869 Mon Sep 17 00:00:00 2001
From: Vijay Venkatesh Kumar <vv770d@att.com>
Date: Tue, 4 Feb 2020 23:34:57 +0000
Subject: Setup additional docker tag

Change-Id: Icdd6627485a88f5821be498a70ac1ea15f23b73c
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
Issue-ID: DCAEGEN2-2064
Signed-off-by: Vijay Venkatesh Kumar <vv770d@att.com>
---
 dcae-analytics/dcae-analytics-tca-web/pom.xml | 38 +++++++++++++++++++--------
 eelf-logger/pom.xml                           |  1 -
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/dcae-analytics/dcae-analytics-tca-web/pom.xml b/dcae-analytics/dcae-analytics-tca-web/pom.xml
index 5cdfa4a..c9cd80c 100644
--- a/dcae-analytics/dcae-analytics-tca-web/pom.xml
+++ b/dcae-analytics/dcae-analytics-tca-web/pom.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
   ~ ================================================================================
-  ~ Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+  ~ Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
   ~ ================================================================================
   ~ Modifications Copyright (C) 2019 IBM
   ~ ================================================================================
@@ -42,6 +42,7 @@
     <properties>
         <main.basedir>${project.parent.basedir}</main.basedir>
         <docker.image.name>onap/${project.groupId}.${project.artifactId}</docker.image.name>
+	<maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>	
     </properties>
 
     <dependencies>
@@ -160,11 +161,6 @@
 	             <configuration>
 		          <contextDirectory>${project.basedir}</contextDirectory>
 		          <repository>${docker.repository}/${docker.image.name}</repository>
-		          <imageTags>
-			         <tag>${project.version}</tag>
-			         <tag>latest</tag>
-			         <tag>${project.version}-${maven.build.timestamp}Z</tag>
-		          </imageTags>
 		          <useMavenSettingsForAuth>true</useMavenSettingsForAuth>
 		       <buildArgs>
 			     <PROJECT_BUILD_DIR_NAME>target</PROJECT_BUILD_DIR_NAME>
@@ -174,16 +170,36 @@
 		       </buildArgs>
 	         </configuration>
 	         <executions>
-		        <execution>
-			       <id>default</id>
+			<execution>
+				<id>build-image</id>
+				<phase>install</phase>
+				<goals>
+					<goal>build</goal>
+				</goals>
+			</execution>
+			<execution>
+			       <id>tag-version</id>
 			       <phase>install</phase>
 			       <goals>
-				      <goal>build</goal>
+				      <goal>tag</goal>
 				      <goal>push</goal>
 			       </goals>
-		       </execution>
+            			<configuration>
+              				<tag>${project.version}</tag>
+            			</configuration>
+          		</execution>
+                        <execution>
+                               <id>tag-version-ts</id>
+                               <phase>install</phase>
+                               <goals>
+                                      <goal>tag</goal>
+                                      <goal>push</goal>
+                               </goals>
+                                <configuration>
+              				<tag>${project.version}-${maven.build.timestamp}Z</tag>
+                                </configuration>
+                        </execution>
 	        </executions>
-
            </plugin>
         </plugins>
     </build>
diff --git a/eelf-logger/pom.xml b/eelf-logger/pom.xml
index 8dac573..d5bed07 100644
--- a/eelf-logger/pom.xml
+++ b/eelf-logger/pom.xml
@@ -438,7 +438,6 @@
                 <artifactId>maven-deploy-plugin</artifactId>
             </plugin>
 
-
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-- 
cgit 1.2.3-korg