X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=324a0758337fa9de4cf1f4a3fc248a2c94651bd8;hb=47cf048f30abd3bdd675f1398f88c370f90c5943;hp=7e2d933ce16d9d38330cf229d705e59819f2b239;hpb=ccebf7fa3f3f6bb415f092ced8490758c70b08dc;p=dmaap%2Fkafka11aaf.git

diff --git a/pom.xml b/pom.xml
index 7e2d933..324a075 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.1</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<groupId>org.onap.dmaap.kafka</groupId>
 	<artifactId>kafka11aaf</artifactId>
-	<version>0.0.4-SNAPSHOT</version>
-	<name>dmaap-kafka11aaf</name>
+	<version>1.0.5-SNAPSHOT</version>
+	<name>dmaap-kafka</name>
 	<licenses>
 		<license>
 			<name>Apache License Version 2.0</name>
@@ -39,17 +39,46 @@
 	</developers>
 
 	<build>
-        <!-- Copy files to docker-stage to be included in image -->        
+		<!-- 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>
+            		<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.sonarsource.scanner.maven</groupId>
+				<artifactId>sonar-maven-plugin</artifactId>
+				<version>3.6.0.1398</version>
+			</plugin>
+		    <plugin>
+                    <groupId>org.jacoco</groupId>
+                    <artifactId>jacoco-maven-plugin</artifactId>
+                    <executions>
+                        <execution>
+                            <id>prepare-agent</id>
+                            <goals>
+                                <goal>prepare-agent</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>report</id>
+                            <goals>
+                                <goal>report</goal>
+                            </goals>
+                            <configuration>
+                                <dataFile>${project.build.directory}/code-coverage/jacoco.exec</dataFile>
+                                <outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -61,17 +90,6 @@
 					<!-- <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>
@@ -119,17 +137,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>
@@ -162,7 +169,7 @@
 								<artifactItem>
 									<groupId>org.onap.dmaap.messagerouter.mirroragent</groupId>
 									<artifactId>dmaapMMAgent</artifactId>
-									<version>1.1.1</version>
+									<version>1.1.2</version>
 									<destFileName>dmaapMMAgent.jar</destFileName>
 								</artifactItem>
 							</artifactItems>
@@ -170,32 +177,31 @@
 					</execution>
 				</executions>
 			</plugin>
-              <!-- Copy jar to docker-stage to be included in image -->
-              <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>
+				<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>
@@ -226,13 +232,18 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<timestamp>${maven.build.timestamp}</timestamp>
-        <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
+		<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>
+		<sonar.language>java</sonar.language>
+        <sonar.skip>false</sonar.skip>
+        <sonar.surefire.reportsPath>${project.build.directory}/surefire-reports</sonar.surefire.reportsPath>
+        <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
+        <sonar.projectVersion>${project.version}</sonar.projectVersion>
 	</properties>
 
 	<!-- Distribution management -->
@@ -263,8 +274,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>
@@ -302,81 +315,85 @@
 				<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>
+				<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>