X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=standalone%2Fpom.xml;h=986dc7d66e0cc00f3eb6a649d2ee978b8598ad4c;hp=b3bc7b261331898cb3250a20407909fc512d521e;hb=5357a086c1cf950de5781e35d5b2601a62bcb7fc;hpb=5e1ac5e71b590720862e6a9f7e6dc7642b555bd1

diff --git a/standalone/pom.xml b/standalone/pom.xml
index b3bc7b2..986dc7d 100644
--- a/standalone/pom.xml
+++ b/standalone/pom.xml
@@ -20,7 +20,7 @@
     <parent>
 		<groupId>org.onap.aai.esr-server</groupId>
 		<artifactId>aai-esr-server</artifactId>
-		<version>1.0.0-SNAPSHOT</version>
+		<version>1.5.2</version>
 	</parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -35,8 +35,9 @@
         <linux64outputdir>target/assembly/${linux64id}</linux64outputdir>
         <win64outputdir>target/assembly/${win64id}</win64outputdir>
         <version.output>target/version</version.output>
-    </properties>
-
+		<aai.esr.server.project.version>${project.version}</aai.esr.server.project.version>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+	</properties>
     <build>
         <plugins>
             <plugin>
@@ -185,11 +186,37 @@
                         </configuration>
                     </execution>
                 </executions>
+            </plugin>
+			<plugin>
+                <groupId>org.codehaus.groovy.maven</groupId>
+                <artifactId>gmaven-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>validate</phase>
+                        <goals>
+                            <goal>execute</goal>
+                        </goals>
+                        <configuration>
+                            <source>
+                                println project.properties['aai.esr.server.project.version'];
+                                def versionArray;
+                                if ( project.properties['aai.esr.server.project.version'] != null ) {
+                                    versionArray = project.properties['aai.esr.server.project.version'].split('-');
+                                }
+
+                                project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+
+                                println 'New Tag for docker:' +
+                                project.properties['project.docker.latesttag.version'];
+                            </source>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
         </plugins>
     </build>
 	
-	    <profiles>
+	<profiles>
         <profile>
             <id>docker</id>
             <build>
@@ -198,6 +225,13 @@
                         <groupId>io.fabric8</groupId>
                         <artifactId>docker-maven-plugin</artifactId>
                         <version>0.16.5</version>
+                        <dependencies>
+                            <dependency>
+                                <groupId>com.github.jnr</groupId>
+                                <artifactId>jnr-unixsocket</artifactId>
+                                <version>0.13</version>
+                            </dependency>
+                        </dependencies>
                         <inherited>false</inherited>
                         <configuration>
                             <images>
@@ -208,7 +242,9 @@
                                         <dockerFileDir>${basedir}/target/version/</dockerFileDir>
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
-                                            <tag>${project.version}-STAGING-latest</tag>
+                                            <tag>${project.version}</tag>
+                                            <tag>${project.version}-${maven.build.timestamp}</tag>
+                                            <tag>${project.docker.latesttag.version}</tag>
                                         </tags>
                                     </build>
                                 </image>
@@ -236,7 +272,7 @@
                 </plugins>
             </build>
         </profile>
-    </profiles>
+    </profiles> 
 
     <dependencies>
         <dependency>