X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=d66c6e404de3b0d5ada508d24aaa05a4cecdad0d;hb=refs%2Fchanges%2F16%2F83816%2F1;hp=8f2153dc782936f9c43c786f72c5ab3a44cc8bbb;hpb=4e794ec84f43347edf2ce91ab5f73113f75e760b;p=dmaap%2Fmessagerouter%2Fmessageservice.git

diff --git a/pom.xml b/pom.xml
index 8f2153d..d66c6e4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,12 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>1.2.1</version>
 	</parent>
 
 	<groupId>org.onap.dmaap.messagerouter.messageservice</groupId>
 	<artifactId>dmaapMR1</artifactId>
-	<version>1.1.4-SNAPSHOT</version>
+	<version>1.1.11-SNAPSHOT</version>
 	<name>dmaap-messagerouter-messageservice</name>
 	<description>Message Router - Restful interface built for kafka</description>
 	<licenses>
@@ -47,6 +47,7 @@
 
 	<build>
 		<plugins>
+
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
@@ -100,96 +101,8 @@
 					</dependency>
 				</dependencies>
 			</plugin>
+                
 
-			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<configuration>
-					<imageName>onap/dmaap/dmaap-mr</imageName>
-					<dockerDirectory>${dockerLocation}</dockerDirectory>
-					<serverId>docker-hub</serverId>
-					<imageTags>
-						<imageTag>${dmaapImg}</imageTag>
-						<imageTag>latest</imageTag>
-					</imageTags>
-					<forceTags>true</forceTags>
-					<resources>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${dockerLocation}</directory>
-							<include>${project.build.finalName}.jar</include>
-						</resource>
-						<resource>
-							<targetPath>/</targetPath>
-							<directory>${project.build.directory}</directory>
-							<include>**/**</include>
-						</resource>
-					</resources>
-				</configuration>
-				<executions>
-					<execution>
-						<id>build-image</id>
-						<phase>install</phase>
-						<goals>
-							<goal>build</goal>
-						</goals>
-						<configuration>
-							<skipDockerBuild>${skip.docker.build}</skipDockerBuild>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>tag-image-project-version</id>
-						<phase>install</phase>
-						<goals>
-							<goal>tag</goal>
-						</goals>
-						<configuration>
-							<image>onap/dmaap/dmaap-mr</image>
-							<newName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</newName>
-							<skipDockerTag>${skip.docker.push}</skipDockerTag>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>tag-image-latest</id>
-						<phase>install</phase>
-						<goals>
-							<goal>tag</goal>
-						</goals>
-						<configuration>
-							<image>onap/dmaap/dmaap-mr</image>
-							<newName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</newName>
-							<skipDockerTag>${skip.docker.push}</skipDockerTag>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>push-image-latest</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>push</goal>
-						</goals>
-						<configuration>
-							<imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:${project.version}</imageName>
-							<skipDockerPush>${skip.docker.push}</skipDockerPush>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>push-image</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>push</goal>
-						</goals>
-						<configuration>
-							<imageName>${docker.push.registry}/onap/dmaap/dmaap-mr:latest</imageName>
-							<skipDockerPush>${skip.docker.push}</skipDockerPush>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>com.blackducksoftware.integration</groupId>
 				<artifactId>hub-maven-plugin</artifactId>
@@ -209,29 +122,13 @@
 				</executions>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.1</version>
-				<configuration>
-					<compilerId>groovy-eclipse-compiler</compilerId>
-					<verbose>true</verbose>
-					<source>1.7</source>
-					<target>1.7</target>
-				</configuration>
-				<dependencies>
-					<dependency>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-eclipse-compiler</artifactId>
-						<version>2.8.0-01</version>
-					</dependency>
-					<dependency>
-						<groupId>org.codehaus.groovy</groupId>
-						<artifactId>groovy-eclipse-batch</artifactId>
-						<version>2.1.5-03</version>
-					</dependency>
-				</dependencies>
-			</plugin>
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> 
+				<version>3.1</version> <configuration> <compilerId>groovy-eclipse-compiler</compilerId> 
+				<verbose>true</verbose> <source>1.7</source> <target>1.7</target> </configuration> 
+				<dependencies> <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>groovy-eclipse-compiler</artifactId> 
+				<version>2.8.0-01</version> </dependency> <dependency> <groupId>org.codehaus.groovy</groupId> 
+				<artifactId>groovy-eclipse-batch</artifactId> <version>2.1.5-03</version> 
+				</dependency> </dependencies> </plugin> -->
 			<plugin>
 				<groupId>org.codehaus.groovy</groupId>
 				<artifactId>groovy-eclipse-compiler</artifactId>
@@ -246,10 +143,10 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<dockerLocation>${basedir}/target/swm/package/nix/dist_files/</dockerLocation>
 		<docker.image.prefix>simpledemo</docker.image.prefix>
-        <javax-mail-version>1.5.0</javax-mail-version>
+		<!-- <javax-mail-version>1.5.0</javax-mail-version> -->
 		<module.ajsc.namespace.name>dmaap</module.ajsc.namespace.name>
 		<module.ajsc.namespace.version>v1</module.ajsc.namespace.version>
-		<ajscRuntimeVersion>3.0.6-oss</ajscRuntimeVersion>
+		<ajscRuntimeVersion>3.0.10-oss</ajscRuntimeVersion>
 
 		<!-- This will be the Absolute Root of the Project and should contain NO 
 			Versioning -->
@@ -274,13 +171,16 @@
 			8080 -->
 		<serverPort>3904</serverPort>
 		<sslport>3905</sslport>
-
+        <onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
 		<testRouteOffer>workstation</testRouteOffer>
 		<testEnv>DEV</testEnv>
-		<dmaapImg>${project.version}</dmaapImg>
-		<camel.version>2.17.6</camel.version>
+		<!-- <dmaapImg>${project.version}</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>
+		<skip.docker.tag>true</skip.docker.tag>
 		<skip.docker.push>true</skip.docker.push>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
@@ -312,7 +212,7 @@
 		so). If you have a startup failure related to a missing dme2 class not found 
 		exception, please contact the AJSC team for assistance. You can email support 
 		at ajsc-Support <DL-ajsc-Support@att.com>. For more information regarding 
-		the usage of the AJSC service pom.xml and management of dependencies,  -->
+		the usage of the AJSC service pom.xml and management of dependencies, -->
 	<dependencies>
 
 		<!-- cmn-CommonDataModel dependency added to resolve build issue not finding 
@@ -322,7 +222,45 @@
 			<version>112.0.50</version> </dependency> -->
 		<!-- TODO: add open source version here -->
 
-		<dependency>
+
+	<dependency>
+		<groupId>com.sun.mail</groupId>
+		<artifactId>javax.mail</artifactId>
+		<version>1.6.0</version>
+		<exclusions>
+			<!-- javax activation is part of the JDK now -->
+			<exclusion>
+				<groupId>javax.activation</groupId>
+				<artifactId>activation</artifactId>
+			</exclusion>
+		</exclusions>
+	</dependency>
+	<dependency>
+		<groupId>com.sun.xml.bind</groupId>
+		<artifactId>jaxb-core</artifactId>
+		<version>2.3.0.1</version>
+		<scope>compile</scope>
+	</dependency>
+	<dependency>
+		<groupId>com.sun.xml.bind</groupId>
+		<artifactId>jaxb-impl</artifactId>
+		<version>2.3.0.1</version>
+		<scope>compile</scope>
+		<exclusions>
+			<exclusion>
+				<artifactId>jsr181-api</artifactId>
+				<groupId>javax.jws</groupId>
+			</exclusion>
+		</exclusions>
+	</dependency>
+        
+		 <dependency>
+            <groupId>org.apache.cxf</groupId>
+            <artifactId>cxf-rt-transports-http</artifactId>
+            <version>3.2.5</version>
+           </dependency>
+
+		<!-- <dependency>
 			<groupId>com.att.cadi</groupId>
 			<artifactId>cadi-core</artifactId>
 			<version>1.3.0</version>
@@ -331,103 +269,95 @@
 			<groupId>com.att.aft</groupId>
 			<artifactId>dme2</artifactId>
 			<version>3.1.200-oss</version>
-		</dependency>
+		</dependency> -->
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-expression</artifactId>
-			<version>4.3.16.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-messaging</artifactId>
 			<version>4.1.9.RELEASE</version>
 		</dependency>
-		<dependency>
-            <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>${javax-mail-version}</version>
-            <exclusions>
-              <!-- javax activation is part of the JDK now -->
-              <exclusion>
-                <groupId>javax.activation</groupId>
-                <artifactId>activation</artifactId>
-              </exclusion>
-            </exclusions>
-        </dependency>
-		
+		<!-- <dependency> <groupId>com.sun.mail</groupId> <artifactId>javax.mail</artifactId> 
+			<version>${javax-mail-version}</version> <exclusions> javax activation is 
+			part of the JDK now <exclusion> <groupId>javax.activation</groupId> <artifactId>activation</artifactId> 
+			</exclusion> </exclusions> </dependency> -->
+
 		<dependency>
 			<groupId>org.apache.zookeeper</groupId>
 			<artifactId>zookeeper</artifactId>
 			<version>3.4.10</version>
 		</dependency>
 		<dependency>
-      <groupId>org.grails</groupId>
-      <artifactId>grails-bootstrap</artifactId>
-      <version>2.5.4</version>
-      <scope>compile</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>ant</artifactId>
-          <groupId>org.apache.ant</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jna</artifactId>
-          <groupId>net.java.dev.jna</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>ant-trax</artifactId>
-          <groupId>org.apache.ant</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>gant_groovy1.8</artifactId>
-          <groupId>org.codehaus.gant</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>ant-launcher</artifactId>
-          <groupId>org.apache.ant</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jline</artifactId>
-          <groupId>jline</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>ivy</artifactId>
-          <groupId>org.apache.ivy</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>jansi</artifactId>
-          <groupId>org.fusesource.jansi</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>ant-junit</artifactId>
-          <groupId>org.apache.ant</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
+			<groupId>org.grails</groupId>
+			<artifactId>grails-bootstrap</artifactId>
+			<version>2.5.4</version>
+			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>ant</artifactId>
+					<groupId>org.apache.ant</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jna</artifactId>
+					<groupId>net.java.dev.jna</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>ant-trax</artifactId>
+					<groupId>org.apache.ant</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>gant_groovy1.8</artifactId>
+					<groupId>org.codehaus.gant</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>ant-launcher</artifactId>
+					<groupId>org.apache.ant</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jline</artifactId>
+					<groupId>jline</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>ivy</artifactId>
+					<groupId>org.apache.ivy</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>jansi</artifactId>
+					<groupId>org.fusesource.jansi</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>commons-logging</artifactId>
+					<groupId>commons-logging</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>ant-junit</artifactId>
+					<groupId>org.apache.ant</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-webmvc</artifactId>
-			<version>4.3.15.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
-	<dependency>
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>
-			<version>4.3.15.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
-	<dependency>
+		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-beans</artifactId>
-			<version>4.3.15.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
-			<version>4.3.15.RELEASE</version>
+			<version>4.3.18.RELEASE</version>
 		</dependency>
 		<dependency>
 			<groupId>commons-io</groupId>
@@ -442,7 +372,7 @@
 		<dependency>
 			<groupId>org.onap.dmaap.messagerouter.msgrtr</groupId>
 			<artifactId>msgrtr</artifactId>
-			<version>1.1.3</version>
+			<version>1.1.15</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.slf4j</groupId>
@@ -501,7 +431,7 @@
 			<artifactId>jackson-mapper-asl</artifactId> <version>1.9.13</version> </dependency> 
 			<dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> 
 			<version>1.9.13</version> </dependency> -->
-        
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.jaxrs</groupId>
 			<artifactId>jackson-jaxrs-json-provider</artifactId>
@@ -520,28 +450,28 @@
 			<version>2.8.11.1</version>
 		</dependency>
 		<dependency>
-		<groupId>org.grails</groupId>
-	<artifactId>grails-web</artifactId>
-	<version>2.5.4</version>
-	<exclusions>
-		<exclusion>
 			<groupId>org.grails</groupId>
-			<artifactId>grails-web-jsp</artifactId>
-		</exclusion>
-	</exclusions>
+			<artifactId>grails-web</artifactId>
+			<version>2.5.4</version>
+			<exclusions>
+				<exclusion>
+					<groupId>org.grails</groupId>
+					<artifactId>grails-web-jsp</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>org.codehaus.groovy</groupId>
+			<artifactId>groovy-all</artifactId>
+			<version>2.4.8</version>
+			<scope>compile</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>jline</artifactId>
+					<groupId>jline</groupId>
+				</exclusion>
+			</exclusions>
 		</dependency>
-        <dependency>
-		<groupId>org.codehaus.groovy</groupId>
-		<artifactId>groovy-all</artifactId>
-		<version>2.4.4</version>
-		<scope>compile</scope>
-		<exclusions>
-			<exclusion>
-				<artifactId>jline</artifactId>
-				<groupId>jline</groupId>
-			</exclusion>
-		</exclusions>
-	</dependency>
 
 		<dependency>
 			<groupId>junit</groupId>
@@ -560,58 +490,43 @@
 		<dependency>
 			<groupId>org.apache.cxf</groupId>
 			<artifactId>cxf-rt-rs-extension-providers</artifactId>
-			<version>3.0.12</version>
+			<version>3.2.2</version>
+			<!-- <exclusions> <exclusion> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> 
+				</exclusion> </exclusions> -->
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.cxf</groupId>
+					<artifactId>cxf-core</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+		<!-- <dependency> <groupId>org.apache.cxf</groupId> <artifactId>cxf-rt-transports-http</artifactId> 
+			<version>3.1.14</version> </dependency> -->
 		<dependency>
 			<groupId>org.codehaus.jettison</groupId>
 			<artifactId>jettison</artifactId>
 			<version>1.3.7</version>
 		</dependency>
 
-		<dependency>
-			<groupId>dom4j</groupId>
-			<artifactId>dom4j</artifactId>
-			<version>1.6.1</version>
-			<scope>provided</scope>
-		</dependency>
+		<!-- <dependency> <groupId>dom4j</groupId> <artifactId>dom4j</artifactId> 
+			<version>1.6.1</version> <scope>provided</scope> </dependency> -->
 		<dependency>
 			<groupId>com.att.ajsc</groupId>
 			<artifactId>ajsc-archetype-parent</artifactId>
-			<version>3.0.6-oss</version>
+			<version>3.0.10-oss</version>
 			<type>pom</type>
 		</dependency>
 
-		<dependency>
-			<groupId>com.att.cadi</groupId>
-			<artifactId>cadi-aaf</artifactId>
-			<version>1.3.0</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.att.inno</groupId>
-			<artifactId>rosetta</artifactId>
-			<version>1.2.11</version>
-		</dependency>
-		<dependency>
-			<groupId>com.att.inno</groupId>
-			<artifactId>env</artifactId>
-			<version>1.2.11</version>
-		</dependency>
-		<dependency>
-			<groupId>com.att.inno</groupId>
-			<artifactId>xgen</artifactId>
-			<version>1.2.11</version>
-		</dependency>
-		<dependency>
-			<groupId>com.att.inno</groupId>
-			<artifactId>rosetta</artifactId>
-			<version>1.2.11</version>
-		</dependency>
-		<dependency>
-			<groupId>backport-util-concurrent</groupId>
-			<artifactId>backport-util-concurrent</artifactId>
-			<version>3.1</version>
-		</dependency>
+	<dependency>
+		<groupId>org.onap.aaf.authz</groupId>
+		<artifactId>aaf-cadi-aaf</artifactId>
+		<version>2.1.5</version>
+	</dependency>
+	<dependency>
+		<groupId>backport-util-concurrent</groupId>
+		<artifactId>backport-util-concurrent</artifactId>
+		<version>3.1</version>
+	</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-core</artifactId>
@@ -642,18 +557,11 @@
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-servlet</artifactId>
 			<version>${camel.version}</version>
-			<!-- <exclusions>
-				<exclusion>
-					<groupId>commons-httpclient</groupId>
-					<artifactId>commons-httpclient</artifactId>
-				</exclusion>
-			</exclusions> -->
+			<!-- <exclusions> <exclusion> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> 
+				</exclusion> </exclusions> -->
 		</dependency>
-		<!-- <dependency>
-			<groupId>org.apache.httpcomponents</groupId>
-			<artifactId>httpclient</artifactId>
-			<version>4.0</version>
-		</dependency> -->
+		<!-- <dependency> <groupId>org.apache.httpcomponents</groupId> <artifactId>httpclient</artifactId> 
+			<version>4.0</version> </dependency> -->
 
 		<dependency>
 			<groupId>org.apache.camel</groupId>
@@ -701,6 +609,11 @@
 			<artifactId>camel-xmpp</artifactId>
 			<version>${camel.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.igniterealtime.smack</groupId>
+			<artifactId>smack-tcp</artifactId>
+			<version>4.1.0-rc1</version>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.camel</groupId>
 			<artifactId>camel-velocity</artifactId>
@@ -709,13 +622,13 @@
 		<dependency>
 			<groupId>com.att.ajsc</groupId>
 			<artifactId>ajsc-runner</artifactId>
-			<version>3.0.6-oss</version>
+			<version>3.0.10-oss</version>
 			<scope>runtime</scope>
 		</dependency>
 		<dependency>
 			<groupId>com.att.ajsc</groupId>
 			<artifactId>ajsc-core</artifactId>
-			<version>3.0.6-oss</version>
+			<version>3.0.10-oss</version>
 			<scope>provided</scope>
 		</dependency>
 	</dependencies>
@@ -728,11 +641,85 @@
 		<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>
+                   <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                        <version>0.28.0</version>  
+                        <configuration>
+                            <verbose>${docker.verbose}</verbose>
+                            <apiVersion>${docker.apiVersion}</apiVersion>
+                            <pullRegistry>${docker.pull.registry}</pullRegistry>
+                            <pushRegistry>${docker.push.registry}</pushRegistry>
+                            <images>
+                                <image>                            
+                                    <name>onap/dmaap/dmaap-mr</name>
+                                    <build>
+                                        <cleanup>try</cleanup>
+                                        <dockerFileDir>${dockerLocation}</dockerFileDir>
+                                        <dockerFile>Dockerfile</dockerFile>
+                                        <tags>
+                                            <tag>${dockertag1}</tag>
+                                            <tag>${dockertag2}</tag>
+                                        </tags>
+                                    </build>
+                                </image>
+                            </images>
+                        </configuration>
+                         <executions>
+                             <execution>
+                                 <id>generate-images</id>
+                                 <phase>install</phase>
+                                 <goals>
+                                     <goal>build</goal>
+                                 </goals>
+                             </execution>
+                             <execution>
+                                 <id>push-images</id>
+                                 <phase>deploy</phase>
+                                 <goals>
+                                     <goal>push</goal>
+                                 </goals>
+                             </execution>
+                         </executions>
+                    </plugin>
+                </plugins>
+            </build>
 		</profile>
 
 		<profile>