From 4d34be7b35016ff0368286003e1dffd441e88e8f Mon Sep 17 00:00:00 2001
From: Sudarshan Kumar <sudars19@in.ibm.com>
Date: Tue, 4 Jun 2019 14:05:53 +0530
Subject: Modified ValetApi pom.xml

Modified ValetApi pom.xml

Issue-ID: OPTFRA-516
Change-Id: I813f6ba69223707edb3997aa5fce04fd54bc9efb
Signed-off-by: Sudarshan Kumar <sudars19@in.ibm.com>
---
 valetapi/pom.xml | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

(limited to 'valetapi')

diff --git a/valetapi/pom.xml b/valetapi/pom.xml
index f341f31..3770303 100644
--- a/valetapi/pom.xml
+++ b/valetapi/pom.xml
@@ -19,6 +19,8 @@
 		<maven.compiler.target>1.8</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sdk.java.rest>6.2.0.11</sdk.java.rest>
+		
+		<!-- SONAR -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
 		<sonar.surefire.reportsPath>${basedir}/target/surefire-reports</sonar.surefire.reportsPath>
@@ -28,8 +30,9 @@
 		<sonar.jacoco.reportPath>${basedir}/target/jacoco-ut.exec</sonar.jacoco.reportPath>
 		<sonar.jacoco.itReportPath>${basedir}/target/jacoco-it.exec</sonar.jacoco.itReportPath>
 		<sonar.language>java</sonar.language>
-		<serviceArtifactName>valetapi</serviceArtifactName>
+		<sonar.exclusions>**/gen/**,**/generated-sources/**</sonar.exclusions>
 		
+		<serviceArtifactName>valetapi</serviceArtifactName>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
@@ -168,8 +171,14 @@
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>
 			<artifactId> json-simple</artifactId>
-		    <version>1.1.1</version>  
-			</dependency>
+		    <version>1.1.1</version> 
+			<exclusions>
+                <exclusion>
+                    <groupId>com.google.guava</groupId>
+                    <artifactId>guava</artifactId>
+                </exclusion>
+            </exclusions>
+		</dependency>
 		<dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
@@ -272,6 +281,12 @@
 		    <groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
 				<version>0.7.5.201505241946</version>
+				<configuration>
+					<excludes>
+				        <exclude>**/gen/**</exclude>
+					    <exclude>**/generated-sources/**</exclude>
+					</excludes>
+				</configuration>
 				<executions>
 					<!-- Prepares the property pointing to the JaCoCo runtime agent which 
 						is passed as VM argument when Maven the Surefire plugin is executed. -->
@@ -413,7 +428,7 @@
 					</serviceProviders>
 				</configuration>
 			</plugin>
-<plugin>
+			<plugin>
 				<artifactId>maven-dependency-plugin</artifactId>
 			</plugin>
 			<plugin>
@@ -489,7 +504,7 @@
 				     <layout>ZIP</layout>
 				</configuration>
 			</plugin>		
-			</plugins>
+		</plugins>
 			<!-- mention the logback.xml location through system property or environment 
 			variable to edit logback.xml at run time -->
 		<resources>
-- 
cgit 1.2.3-korg