From 3901cf8002977b5008ecf727d9911dd9334e12da Mon Sep 17 00:00:00 2001
From: IanHowell <ian.howell@att.com>
Date: Tue, 3 Apr 2018 11:24:27 -0500
Subject: Update POMS for SONAR code coverage

Issue-ID: AAF-128
Change-Id: I3340c9596682d00291414c5ae3e0a4b71d19c228
Signed-off-by: IanHowell <ian.howell@att.com>
---
 misc/xgen/pom.xml | 168 +++++++++++++++++++++++++++---------------------------
 1 file changed, 83 insertions(+), 85 deletions(-)

(limited to 'misc/xgen/pom.xml')

diff --git a/misc/xgen/pom.xml b/misc/xgen/pom.xml
index a3bceb10..08b4e1a4 100644
--- a/misc/xgen/pom.xml
+++ b/misc/xgen/pom.xml
@@ -94,94 +94,92 @@
 	
 	<build>
 	<plugins>
-	<plugin>
-				<groupId>org.sonatype.plugins</groupId>
-				<artifactId>nexus-staging-maven-plugin</artifactId>
-				<version>1.6.7</version>
-				<extensions>true</extensions>
-				<configuration>
-					<nexusUrl>${nexusproxy}</nexusUrl>
-					<stagingProfileId>176c31dfe190a</stagingProfileId>
-					<serverId>ecomp-staging</serverId>
-				</configuration>
-			</plugin>		
 		<plugin>
-            <groupId>org.sonarsource.scanner.maven</groupId>
-            <artifactId>sonar-maven-plugin</artifactId>
-            <version>3.2</version>
-        </plugin>
-		
+			<groupId>org.sonatype.plugins</groupId>
+			<artifactId>nexus-staging-maven-plugin</artifactId>
+			<version>1.6.7</version>
+			<extensions>true</extensions>
+			<configuration>
+				<nexusUrl>${nexusproxy}</nexusUrl>
+				<stagingProfileId>176c31dfe190a</stagingProfileId>
+				<serverId>ecomp-staging</serverId>
+			</configuration>
+		</plugin>		
+		<plugin>
+			<groupId>org.sonarsource.scanner.maven</groupId>
+			<artifactId>sonar-maven-plugin</artifactId>
+			<version>3.2</version>
+		</plugin>
+
 		<!-- Jacoco -->
-			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<!-- Override OParent version -->
-				<version>${jacocoVersion}</version>
-				<executions>
-					<!-- disable jacoco executions from oparent -->
-					<execution>
-						<id>pre-unit-test</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>post-unit-test</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>pre-integration-test</id>
-						<phase>none</phase>
-					</execution>
-					<execution>
-						<id>post-integration-test</id>
-						<phase>none</phase>
-					</execution>
-					<!-- Order matters -->
-					<execution>
-						<id>portal-prepare-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<destFile>${sonar.jacoco.reportPath}</destFile>
-						</configuration>
-					</execution>
-					<!-- offline instrumentation for PowerMock -->
-					<execution>
-						<id>portal-offline-instrument</id>
-						<goals>
-							<goal>instrument</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>portal-restore-instrumented-classes</id>
-						<phase>test</phase>
-						<goals>
-							<goal>restore-instrumented-classes</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>portal-post-unit-test</id>
-						<phase>test</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-						<configuration>
-							<dataFile>${sonar.jacoco.reportPath}</dataFile>
-							<outputDirectory>${project.basedir}/target/site/jacoco</outputDirectory>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
+		<plugin>
+			<groupId>org.jacoco</groupId>
+			<artifactId>jacoco-maven-plugin</artifactId>
+			<version>${jacoco.version}</version>
+			<configuration>
+				<excludes>
+					<exclude>**/gen/**</exclude>
+					<exclude>**/generated-sources/**</exclude>
+					<exclude>**/yang-gen/**</exclude>
+					<exclude>**/pax/**</exclude>
+				</excludes>
+			</configuration>
+			<executions>
+				<execution>
+					<id>pre-unit-test</id>
+					<goals>
+						<goal>prepare-agent</goal>
+					</goals>
+					<configuration>
+						<destFile>${project.build.directory}/code-coverage/jacoco-ut.exec</destFile>
+						<propertyName>surefireArgLine</propertyName>
+					</configuration>
+				</execution>
+				<execution>
+					<id>post-unit-test</id>
+					<phase>test</phase>
+					<goals>
+						<goal>report</goal>
+					</goals>
+					<configuration>
+						<dataFile>${project.build.directory}/code-coverage/jacoco-ut.exec</dataFile>
+						<outputDirectory>${project.reporting.outputDirectory}/jacoco-ut</outputDirectory>
+					</configuration>
+				</execution>
+				<execution>
+					<id>pre-integration-test</id>
+					<phase>pre-integration-test</phase>
+					<goals>
+						<goal>prepare-agent</goal>
+					</goals>
+					<configuration>
+						<destFile>${project.build.directory}/code-coverage/jacoco-it.exec</destFile>
+						<propertyName>failsafeArgLine</propertyName>
+					</configuration>
+				</execution>
+				<execution>
+					<id>post-integration-test</id>
+					<phase>post-integration-test</phase>
+					<goals>
+						<goal>report</goal>
+					</goals>
+					<configuration>
+						<dataFile>${project.build.directory}/code-coverage/jacoco-it.exec</dataFile>
+						<outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory>
+					</configuration>
+				</execution>
+			</executions>
+		</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<systemPropertyVariables>
-						<jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
-					</systemPropertyVariables>
-				</configuration>
-			</plugin>
+		<plugin>
+			<groupId>org.apache.maven.plugins</groupId>
+			<artifactId>maven-surefire-plugin</artifactId>
+			<configuration>
+				<systemPropertyVariables>
+					<jacoco-agent.destfile>${project.build.directory}/code-coverage/jacoco-ut.exec</jacoco-agent.destfile>
+				</systemPropertyVariables>
+			</configuration>
+		</plugin>
 	</plugins>
 	</build>
 	
-- 
cgit 1.2.3-korg