X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=pom.xml;h=b04e48fb00a5f56dc8c68dc468d016816099e802;hb=da4ebdb366a4233639f92fb367aad003cf84779e;hp=067fbbc0f220bc2c92feec220ff22a1420ff381a;hpb=8a503123a284a9d5183a5941603a6ad88d80869d;p=dmaap%2Fkafka11aaf.git

diff --git a/pom.xml b/pom.xml
index 067fbbc..b04e48f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,12 +16,12 @@
 	<parent>
 		<groupId>org.onap.oparent</groupId>
 		<artifactId>oparent</artifactId>
-		<version>2.0.0</version>
+		<version>2.1.0</version>
 	</parent>
 
 	<groupId>org.onap.dmaap.kafka</groupId>
 	<artifactId>kafka11aaf</artifactId>
-	<version>1.0.3-SNAPSHOT</version>
+	<version>1.0.4-SNAPSHOT</version>
 	<name>dmaap-kafka</name>
 	<licenses>
 		<license>
@@ -40,16 +40,40 @@
 
 	<build>
 		<!-- Copy files to docker-stage to be included in image -->
-        	<resources>
+        <resources>
             		<resource>
                 		<targetPath>${basedir}/target/docker-stage</targetPath>
                 		<directory>${basedir}/src/main/docker</directory>
-                    			<includes>
-                        			<include>*</include>
-                    			</includes>
+                           		</resource>
+                        <resource>
+                		<directory>${basedir}/src/main/resources</directory>
             		</resource>
-        	</resources>
+                
+
+        	</resources> 
 		<plugins>
+		    <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 +85,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>
@@ -221,6 +234,11 @@
 		<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 -->
@@ -250,9 +268,11 @@
 		</dependency>
 		<dependency>
 			<groupId>org.apache.kafka</groupId>
-			<artifactId>kafka_2.12</artifactId>
-			<version>1.1.1</version>
+			<artifactId>kafka_2.11</artifactId>
+			<version>2.3.0</version>
+			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.powermock</groupId>
 			<artifactId>powermock-api-mockito</artifactId>