From 9407eccc5c8347c7c92d2f25590d8867213107aa Mon Sep 17 00:00:00 2001
From: Jerry Flood <jflood@att.com>
Date: Fri, 19 Apr 2019 07:09:34 -0400
Subject: Rename classes to avoid duplicates

Copy jacoco exec files for upload to sonar

Handle ending midnight in time window

Issue-ID: OPTFRA-474
Change-Id: Id5df25e404a08e039537e4eb987838835ee12f11
Signed-off-by: Jerry Flood <jflood@att.com>
---
 cmso-sonar/pom.xml | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

(limited to 'cmso-sonar/pom.xml')

diff --git a/cmso-sonar/pom.xml b/cmso-sonar/pom.xml
index a46add5..5811df7 100644
--- a/cmso-sonar/pom.xml
+++ b/cmso-sonar/pom.xml
@@ -55,7 +55,7 @@
 		<docker.skip.push>false</docker.skip.push>
 		<docker.skip.tag>false</docker.skip.tag>
 		<skip.staging.artifacts>false</skip.staging.artifacts>
-
+		<skipIntegrationTests>true</skipIntegrationTests>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -87,6 +87,13 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<configuration>
+					<skipITs>${skipIntegrationTests}</skipITs>
+				</configuration>
+			</plugin>
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
@@ -98,6 +105,7 @@
 							<goal>report</goal>
 						</goals>
 						<configuration>
+							<skip>${skipIntegrationTests}</skip>
 							<dataFile>${project.basedir}/target/code-coverage/service.jacoco.exec</dataFile>
 							<outputDirectory>${project.basedir}/target/site/service-it</outputDirectory>
 							<includes>
@@ -111,6 +119,27 @@
 							</excludes>
 						</configuration>
 					</execution>
+					<execution>
+						<id>post-integration-test2</id>
+						<phase>post-integration-test</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+						<configuration>
+							<skip>${skipIntegrationTests}</skip>
+							<dataFile>${project.basedir}/target/code-coverage/optimizer.jacoco.exec</dataFile>
+							<outputDirectory>${project.basedir}/target/site/optimizer-it</outputDirectory>
+							<includes>
+								<include>optimizer/**</include>
+							</includes>
+							<excludes>
+								<exclude>**/gen/**</exclude>
+								<exclude>**/generated-sources/**</exclude>
+								<exclude>**/yang-gen/**</exclude>
+								<exclude>**/pax/**</exclude>
+							</excludes>
+						</configuration>
+					</execution>
 				</executions>
 			</plugin>
 		</plugins>
-- 
cgit 1.2.3-korg