X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=30cd824453d18dd46da2ce329afb953d821223d9;hb=737b823cc577412ddab206d2e3493b855d17bd12;hp=c1d645b5e67e8c2fc9c64af8775d875a8026a289;hpb=46bd5dc50478495e8698afbb7a706b991c791eaf;p=dmaap%2Fkafka11aaf.git

diff --git a/pom.xml b/pom.xml
index c1d645b..30cd824 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <!-- ============LICENSE_START======================================================= 
 	org.onap.dmaap ================================================================================ 
-	Copyright © 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
+	Copyright © 2017 AT&T Intellectual Property. All rights reserved. ================================================================================ 
 	Licensed under the Apache License, Version 2.0 (the "License"); you may not 
 	use this file except in compliance with the License. You may obtain a copy 
 	of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required 
@@ -16,13 +16,13 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.2.0</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<groupId>org.onap.dmaap.kafka</groupId>
 	<artifactId>kafka11aaf</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
-	<name>dmaap-kafka11aaf</name>
+	<version>1.0.3-SNAPSHOT</version>
+	<name>dmaap-kafka</name>
 	<licenses>
 		<license>
 			<name>Apache License Version 2.0</name>
@@ -39,6 +39,18 @@
 	</developers>
 
 	<build>
+		<!-- Copy files to docker-stage to be included in image -->
+        <resources>
+            		<resource>
+                		<targetPath>${basedir}/target/docker-stage</targetPath>
+                		<directory>${basedir}/src/main/docker</directory>
+                           		</resource>
+                        <resource>
+                		<directory>${basedir}/src/main/resources</directory>
+            		</resource>
+                
+
+        	</resources> 
 		<plugins>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -109,17 +121,6 @@
 				</dependencies>
 			</plugin>
 
-			<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<extensions>false</extensions>
-				<executions>
-					<execution>
-						<id>injected-nexus-deploy</id>
-						<phase>none</phase>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<artifactId>maven-deploy-plugin</artifactId>
 				<version>2.8</version>
@@ -137,92 +138,54 @@
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>com.spotify</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>1.0.0</version>
-				<configuration>
-					<imageName>onap/dmaap/kafka01101</imageName>
-					<dockerDirectory>src/main/docker</dockerDirectory>
-					<serverId>docker-hub</serverId>
-					<imageTags>
-						<imageTag>${KafkaImg}</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>
+				<artifactId>maven-dependency-plugin</artifactId>
 				<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/kafka01101</image>
-							<newName>${docker.push.registry}/onap/dmaap/kafka01101:${KafkaImg}</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/kafka01101</image>
-							<newName>${docker.push.registry}/onap/dmaap/kafka01101:latest</newName>
-							<skipDockerTag>${skip.docker.push}</skipDockerTag>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>push-image</id>
-						<phase>deploy</phase>
-						<goals>
-							<goal>push</goal>
-						</goals>
-						<configuration>
-							<imageName>${docker.push.registry}/onap/dmaap/kafka01101:${KafkaImg}</imageName>
-							<skipDockerPush>${skip.docker.push}</skipDockerPush>
-						</configuration>
-					</execution>
-
-					<execution>
-						<id>push-image-latest</id>
-						<phase>deploy</phase>
+						<id>copy</id>
+						<phase>package</phase>
 						<goals>
-							<goal>push</goal>
+							<goal>copy</goal>
 						</goals>
 						<configuration>
-							<imageName>${docker.push.registry}/onap/dmaap/kafka01101:latest</imageName>
-							<skipDockerPush>${skip.docker.push}</skipDockerPush>
+							<outputDirectory>target</outputDirectory>
+							<encoding>UTF-8</encoding>
+							<artifactItems>
+								<artifactItem>
+									<groupId>org.onap.dmaap.messagerouter.mirroragent</groupId>
+									<artifactId>dmaapMMAgent</artifactId>
+									<version>1.1.2</version>
+									<destFileName>dmaapMMAgent.jar</destFileName>
+								</artifactItem>
+							</artifactItems>
 						</configuration>
 					</execution>
 				</executions>
 			</plugin>
-
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+		                  	<version>2.7</version>
+                		  	<executions>
+		                     		<execution>
+                		          		<id>copy-jar</id>
+		                          		<phase>install</phase>
+                		          		<goals>
+		                              			<goal>copy-resources</goal>
+                		          		</goals>
+		                          		<configuration>
+                		              			<outputDirectory>${basedir}/target/docker-stage</outputDirectory>
+		                              			<resources>
+		                                  			<resource>
+		                                      				<directory>${basedir}/target</directory>
+		                                      				<includes>
+		                                          				<include>dmaapMMAgent.jar</include>
+		                                          				<include>kafka11aaf-jar-with-dependencies.jar</include>
+		                                      				</includes>
+		                                  			</resource>
+		                              			</resources>
+		                          		</configuration>
+		                      		</execution>
+		                  </executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
@@ -233,7 +196,7 @@
 						<descriptorRef>jar-with-dependencies</descriptorRef>
 					</descriptorRefs>
 					<!-- MainClass in mainfest make a executable jar -->
-                 <finalName>kafka11aaf</finalName>
+					<finalName>kafka11aaf</finalName>
 				</configuration>
 				<executions>
 					<execution>
@@ -246,47 +209,20 @@
 					</execution>
 				</executions>
 			</plugin>
-			
-		<plugin>
-			<groupId>org.apache.maven.plugins</groupId>
-			<artifactId>maven-enforcer-plugin</artifactId>
-			<executions>
-				<execution>
-					<id>enforce-no-snapshots</id>
-					<goals>
-						<goal>enforce</goal>
-					</goals>
-					<configuration>
-						<rules>
-							<requireReleaseDeps>
-								<message>No Snapshots Allowed!</message>
-								<excludes>
-									<exclude>org.onap.aaf.authz:aaf-cadi-client</exclude>
-									<exclude>org.onap.aaf.authz:aaf-misc-env</exclude>
-									<exclude>org.onap.aaf.authz:aaf-cadi-aaf</exclude>
-									<exclude>org.onap.aaf.authz:aaf-auth-client</exclude>
-									<exclude>org.onap.aaf.authz:aaf-cadi-core</exclude>
-									<exclude>org.onap.aaf.authz:aaf-misc-rosetta</exclude>
-								</excludes>
-							</requireReleaseDeps>
-						</rules>
-						<fail>true</fail>
-					</configuration>
-				</execution>
-			</executions>
-		</plugin>
 
 		</plugins>
 	</build>
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<KafkaImg>0.0.2</KafkaImg>
+		<timestamp>${maven.build.timestamp}</timestamp>
+		<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
 		<sitePath>/content/sites/site/org/onap/dmaap/kafka0111/${project.artifactId}/${project.version}</sitePath>
 		<skip.docker.build>true</skip.docker.build>
 		<skip.docker.push>true</skip.docker.push>
 		<nexusproxy>https://nexus.onap.org</nexusproxy>
 		<docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
+		<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
 	</properties>
 
 	<!-- Distribution management -->
@@ -301,7 +237,7 @@
 		<dependency>
 			<groupId>org.onap.aaf.authz</groupId>
 			<artifactId>aaf-cadi-aaf</artifactId>
-			<version>2.1.2-SNAPSHOT</version>
+			<version>2.1.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
@@ -317,8 +253,10 @@
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
 			<artifactId>kafka_2.11</artifactId>
-			<version>0.11.0.3</version>
+			<version>2.3.0</version>
+			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-api-mockito</artifactId>
@@ -355,6 +293,86 @@
 				<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>
+					<!-- build docker image -->
+                    			<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/kafka111</name>
+			                                  		<build>
+			                                      			<cleanup>try</cleanup>
+			                                     			<dockerFileDir>${basedir}/target/docker-stage</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>
 
 	</profiles>