X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=4d2563f6ed3cd4f64916810f887028287c895275;hb=46d8250f0c0884991e00593ec05477c0759efd57;hp=a4c985a006bb965900891e7626686af0a122cbaa;hpb=437dbc12410e956076bc067b8cc9e67de2b35b37;p=dmaap%2Fkafka11aaf.git

diff --git a/pom.xml b/pom.xml
index a4c985a..4d2563f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,13 +16,13 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>1.1.0</version>
+		<version>2.0.0</version>
 	</parent>
 
 	<groupId>org.onap.dmaap.kafka</groupId>
 	<artifactId>kafka11aaf</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
-	<name>kafka11aaf</name>
+	<version>1.0.2-SNAPSHOT</version>
+	<name>dmaap-kafka</name>
 	<licenses>
 		<license>
 			<name>Apache License Version 2.0</name>
@@ -39,7 +39,39 @@
 	</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>
+                    <includes>
+                        <include>*</include>
+                    </includes>
+            </resource>
+        </resources>
 		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>2.12.4</version>
+				<configuration>
+					<excludes>
+						<!-- exclude until junits updated <exclude>**/DME2*.java</exclude> -->
+					</excludes>
+					<!-- <skipTests>true</skipTests> -->
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<version>2.7</version>
+				<configuration>
+					<formats>
+						<format>html</format>
+						<format>xml</format>
+					</formats>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-site-plugin</artifactId>
@@ -53,11 +85,8 @@
 				</dependencies>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.0.2</version>
-			</plugin>
+			<!-- <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> 
+				<version>3.0.2</version> </plugin> -->
 
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
@@ -91,88 +120,91 @@
 			</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-deploy-plugin</artifactId>
+				<version>2.8</version>
 				<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>
+						<id>default-deploy</id>
+						<phase>none</phase>
 						<configuration>
-							<image>onap/dmaap/kafka01101</image>
-							<newName>${docker.push.registry}/onap/dmaap/kafka01101:${KafkaImg}</newName>
-							<skipDockerTag>${skip.docker.push}</skipDockerTag>
+							<skip />
 						</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>
-
+				</executions>
+				<configuration>
+					<skip />
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-dependency-plugin</artifactId>
+				<executions>
 					<execution>
-						<id>push-image</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:${KafkaImg}</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>
+				<version>2.4.1</version>
+				<configuration>
+					<!-- get all project dependencies -->
+					<descriptorRefs>
+						<descriptorRef>jar-with-dependencies</descriptorRef>
+					</descriptorRefs>
+					<!-- MainClass in mainfest make a executable jar -->
+					<finalName>kafka11aaf</finalName>
+				</configuration>
+				<executions>
 					<execution>
-						<id>push-image-latest</id>
-						<phase>deploy</phase>
+						<id>make-assembly</id>
+						<!-- bind to the packaging phase -->
+						<phase>package</phase>
 						<goals>
-							<goal>push</goal>
+							<goal>single</goal>
 						</goals>
-						<configuration>
-							<imageName>${docker.push.registry}/onap/dmaap/kafka01101:latest</imageName>
-							<skipDockerPush>${skip.docker.push}</skipDockerPush>
-						</configuration>
 					</execution>
 				</executions>
 			</plugin>
@@ -182,12 +214,14 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<KafkaImg>0.0.1</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 -->
@@ -199,6 +233,53 @@
 	</distributionManagement>
 
 	<dependencies>
+		<dependency>
+			<groupId>org.onap.aaf.authz</groupId>
+			<artifactId>aaf-cadi-aaf</artifactId>
+			<version>2.1.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>1.7.2</version>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-simple</artifactId>
+			<version>1.7.2</version>
+			<scope>runtime</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.apache.kafka</groupId>
+			<artifactId>kafka_2.12</artifactId>
+			<version>1.1.1</version>
+		</dependency>
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-api-mockito</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>org.powermock</groupId>
+			<artifactId>powermock-module-junit4-rule</artifactId>
+			<version>1.6.4</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>1.10.19</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<profiles>
@@ -209,6 +290,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/kafka01101</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>