Update INFO.yaml file

[dmaap/messagerouter/messageservice.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index ea8f069..2a2956e 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
        <groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
        <artifactId>dmaapMR1</artifactId>
-       <version>1.1.9-SNAPSHOT</version>
+       <version>1.1.11-SNAPSHOT</version>
        <name>dmaap-messagerouter-messageservice</name>
        <description>Message Router - Restful interface built for kafka</description>
        <licenses>
@@ -110,8 +110,8 @@
                                        <dockerDirectory>${dockerLocation}</dockerDirectory>
                                        <serverId>docker-hub</serverId>
                                        <imageTags>
-                                               <imageTag>${dmaapImg}</imageTag>
-                                               <imageTag>latest</imageTag>
+                                               <imageTag>${dockertag1}</imageTag>
+                                               <imageTag>${dockertag2}</imageTag>
                                        </imageTags>
                                        <forceTags>true</forceTags>
                                        <resources>
@@ -147,7 +147,7 @@
                                                </goals>
                                                <configuration>
                                                        <image>onap/dmaap/dmaap-mr</image>
-                                                       <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</newName>
+                                                       <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag2}</newName>
                                                        <skipDockerTag>${skip.docker.push}</skipDockerTag>
                                                </configuration>
                                        </execution>
@@ -160,7 +160,7 @@
                                                </goals>
                                                <configuration>
                                                        <image>onap/dmaap/dmaap-mr</image>
-                                                       <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</newName>
+                                                       <newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag1}</newName>
                                                        <skipDockerTag>${skip.docker.push}</skipDockerTag>
                                                </configuration>
                                        </execution>
@@ -172,7 +172,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                       <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</imageName>
+                                                       <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag2}</imageName>
                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>
@@ -184,7 +184,7 @@
                                                        <goal>push</goal>
                                                </goals>
                                                <configuration>
-                                                       <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</imageName>
+                                                       <imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${dockertag1}</imageName>
                                                        <skipDockerPush>${skip.docker.push}</skipDockerPush>
                                                </configuration>
                                        </execution>
@@ -262,7 +262,8 @@
                <testRouteOffer>workstation</testRouteOffer>
                <testEnv>DEV</testEnv>
                <!-- <dmaapImg>${project.version}</dmaapImg> -->
-               <dmaapImg>1.1.8</dmaapImg>
+               <timestamp>${maven.build.timestamp}</timestamp>
+        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
                <camel.version>2.21.1</camel.version>
                <sitePath>/content/sites/site/org/onap/dmaap/messagerouter/messageservice/${project.artifactId}/${project.version}</sitePath>
                <skip.docker.build>true</skip.docker.build>
@@ -457,7 +458,7 @@
                <dependency>
                        <groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
                        <artifactId>msgrtr</artifactId>
-                       <version>1.1.13</version>
+                       <version>1.1.15</version>
                        <exclusions>
                                <exclusion>
                                        <groupId>org.slf4j</groupId>
@@ -726,11 +727,44 @@
                <profile>
                        <id>docker</id>
                        <properties>
-
                                <skip.docker.build>false</skip.docker.build>
                                <skip.docker.tag>false</skip.docker.tag>
                                <skip.docker.push>false</skip.docker.push>
                        </properties>
+                       <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.groovy.maven</groupId>
+                        <artifactId>gmaven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>validate</phase>
+                                <goals>
+                                    <goal>execute</goal>
+                                </goals>
+                                <configuration>
+                                    <properties>
+                                        <ver>${project.version}</ver>
+                                        <timestamp>${maven.build.timestamp}</timestamp>
+                                    </properties>
+                                    <source>
+                                        println project.properties['ver'];
+                                        if ( project.properties['ver'].endsWith("-SNAPSHOT") ) {
+                                        project.properties['dockertag1']=project.properties['ver'] + "-latest";
+                                        project.properties['dockertag2']=project.properties['ver'] + "-" + project.properties['timestamp'];
+                                        } else {
+                                        project.properties['dockertag1']=project.properties['ver'] + "-STAGING-latest";
+                                        project.properties['dockertag2']=project.properties['ver'] + "-STAGING-" + project.properties['timestamp'];
+                                        }
+                                        println 'docker tag 1: ' + project.properties['dockertag1'];
+                                        println 'docker tag 2: ' + project.properties['dockertag2'];
+                                    </source>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                    </plugins>
+                    </build>
                </profile>
 
                <profile>