X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=engine-d-standalone%2Fpom.xml;h=68e16312ec2efec69e37ee983d63228058549bed;hb=refs%2Fchanges%2F02%2F71602%2F1;hp=bfa5ac6867705ba7085fe3fde9ed5bbd0c3277d6;hpb=1177d23e2be4a99f231b2d886ea121bf4e0611bc;p=holmes%2Fengine-management.git

diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml
index bfa5ac6..68e1631 100644
--- a/engine-d-standalone/pom.xml
+++ b/engine-d-standalone/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.onap.holmes.engine-management</groupId>
         <artifactId>holmes-engine-parent</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.2.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>holmes-engine-d-standalone</artifactId>
@@ -32,7 +32,7 @@
 
     <properties>
 	<holmes.engine.project.version>${project.version}</holmes.engine.project.version>
-	<maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+	<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
         <build.number>${maven.build.timestamp}</build.number>
     </properties>
 
@@ -68,23 +68,6 @@
                             <overwrite>true</overwrite>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-lib-${linux64id}</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${linux64outputdir}/lib</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.parent.basedir}/engine-d/target/lib</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                            <overwrite>true</overwrite>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>copy-resources-${win64id}</id>
                         <phase>process-resources</phase>
@@ -112,23 +95,6 @@
                             <overwrite>true</overwrite>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>copy-lib-${win64id}</id>
-                        <phase>process-resources</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${win64outputdir}/lib</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${project.parent.basedir}/engine-d/target/lib</directory>
-                                    <filtering>false</filtering>
-                                </resource>
-                            </resources>
-                            <overwrite>true</overwrite>
-                        </configuration>
-                    </execution>
                     <execution>
                         <id>copy-dockerfile</id>
                         <phase>process-resources</phase>
@@ -243,10 +209,11 @@
                                 println project.properties['holmes.engine.project.version'];
                                 def versionArray;
                                 if ( project.properties['holmes.engine.project.version'] != null ) {
-                                    versionArray = project.properties['holmes.engine.project.version'].split('\\.');
+                                    versionArray = project.properties['holmes.engine.project.version'].split('-');
                                 }
 
-								project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+                                project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
+                                project.properties['project.docker.latesttag.version.with.timestamp'] = versionArray[0] + "-STAGING-${build.number}";
 
                                 println 'New Tag for docker:' +
                                 project.properties['project.docker.latesttag.version'];
@@ -278,8 +245,9 @@
                                         <dockerFile>${basedir}/target/version/Dockerfile</dockerFile>
                                         <tags>
                                             <tag>${project.version}</tag>
-                                            <tag>${project.version}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.version}-${build.number}</tag>
                                             <tag>${project.docker.latesttag.version}</tag>
+                                            <tag>${project.docker.latesttag.version.with.timestamp}</tag>
                                         </tags>
                                     </build>
                                 </image>