Fixed the Instantiation Problem of Engine

[holmes/engine-management.git] / engine-d-standalone / pom.xml

diff --git a/engine-d-standalone/pom.xml b/engine-d-standalone/pom.xml
index 791dc8f..84a3970 100644 (file)
--- 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.0.0-SNAPSHOT</version>
+        <version>1.1.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>holmes-engine-d-standalone</artifactId>
@@ -30,6 +30,12 @@
     <name>holmes-engine/holmes-engine-d-standalone</name>
     <packaging>pom</packaging>
 
+    <properties>
+       <holmes.engine.project.version>${project.version}</holmes.engine.project.version>
+       <maven.build.timestamp.format>yyMMdd-HHmmss</maven.build.timestamp.format>
+        <build.number>${maven.build.timestamp}</build.number>
+    </properties>
+
     <build>
         <plugins>
             <plugin>
@@ -53,6 +59,10 @@
                                     <excludes>
                                         <exclude>**/*.bat</exclude>
                                     </excludes>
+                                </resource>
+                                                               <resource>
+                                    <directory>../engine-d/src/main/resources</directory>
+                                    <filtering>false</filtering>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
@@ -76,6 +86,10 @@
                                     <excludes>
                                         <exclude>**/*.sh</exclude>
                                     </excludes>
+                                </resource>
+                                                               <resource>
+                                    <directory>../engine-d/src/main/resources</directory>
+                                    <filtering>false</filtering>
                                 </resource>
                             </resources>
                             <overwrite>true</overwrite>
@@ -181,6 +195,32 @@
                     </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['holmes.engine.project.version'];
+                                def versionArray;
+                                if ( project.properties['holmes.engine.project.version'] != null ) {
+                                    versionArray = project.properties['holmes.engine.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>
 
@@ -203,7 +243,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}-STAGING-${maven.build.timestamp}</tag>
+                                            <tag>${project.docker.latesttag.version}</tag>
                                         </tags>
                                     </build>
                                 </image>