From 4a7a9e4e4b5cfe6b6abfadfb958f1e278d0f4f6c Mon Sep 17 00:00:00 2001
From: James Agnew <jamesagnew@gmail.com>
Date: Tue, 15 Sep 2015 14:34:06 -0400
Subject: [PATCH] Revert from JaCoCo to Cobertura (better ignore functionality
 in Cobertura)

---
 .travis.yml                 |  2 +-
 hapi-fhir-cobertura/pom.xml | 82 +++++++++++++++++++++++++++++--------
 pom.xml                     |  5 +++
 3 files changed, 71 insertions(+), 18 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8b586656406..e98f5c574d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,6 @@ before_script:
   - export MAVEN_SKIP_RC=true
 
 script:
-  - mvn -B clean install && cd hapi-fhir-cobertura && mvn -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID -P COBERTURA clean test jacoco:report coveralls:report 
+  - mvn -B clean install && cd hapi-fhir-cobertura && mvn -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID -P COBERTURA clean cobertura:cobertura coveralls:report 
 
 
diff --git a/hapi-fhir-cobertura/pom.xml b/hapi-fhir-cobertura/pom.xml
index 2032667209c..f784335b753 100644
--- a/hapi-fhir-cobertura/pom.xml
+++ b/hapi-fhir-cobertura/pom.xml
@@ -176,10 +176,36 @@
 						<skipDeploy>true</skipDeploy>
 					</configuration>
 				</plugin>
-
-				<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <configuration> <skip>false</skip> <formats> <format>html</format> <format>xml</format> </formats> 
-					<maxmem>256m</maxmem> <instrumentation> <ignores> <ignore>ca.uhn.fhir.model.dstu.valueset.*</ignore> </ignores> <excludes> <ignore>**/valueset/*.class</ignore> <ignore>**/exceptions/*.class</ignore> </excludes> 
-					</instrumentation> </configuration> <executions> <execution> <phase>verify</phase> <goals> <goal>check</goal> </goals> </execution> </executions> </plugin> -->
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>cobertura-maven-plugin</artifactId>
+					<configuration>
+						<skip>false</skip>
+						<formats>
+							<format>html</format>
+							<format>xml</format>
+						</formats>
+						<maxmem>256m</maxmem>
+						<instrumentation>
+							<ignores>
+								<ignore>ca.uhn.fhir.model.dstu.valueset.*</ignore>
+							</ignores>
+							<excludes>
+								<ignore>**/valueset/*.class</ignore>
+								<ignore>**/exceptions/*.class</ignore>
+							</excludes>
+							<!-- <ignoreMethodAnnotations> <ignoreMethodAnnotation>net.sourceforge.cobertura.CoverageIgnore</ignoreMethodAnnotation> </ignoreMethodAnnotations> -->
+						</instrumentation>
+					</configuration>
+					<executions>
+						<execution>
+							<phase>verify</phase>
+							<goals>
+								<goal>check</goal>
+							</goals>
+						</execution>
+					</executions>
+				</plugin>
 			</plugins>
 		</pluginManagement>
 		<plugins>
@@ -188,6 +214,11 @@
 				<artifactId>coveralls-maven-plugin</artifactId>
 				<version>3.1.0</version>
 				<configuration>
+					<coberturaReports>
+						<coberturaReport>
+							${basedir}/target/coverage.xml
+						</coberturaReport>
+					</coberturaReports>
 					<sourceEncoding>UTF-8</sourceEncoding>
 					<serviceName>travis-ci</serviceName>
 					<serviceJobId>${env.TRAVIS_JOB_ID}</serviceJobId>
@@ -241,7 +272,7 @@
 				<artifactId>maven-surefire-plugin</artifactId>
 				<configuration>
 					<runOrder>alphabetical</runOrder>
-					<argLine>-Xms512m -Xmx1024m ${argLine}</argLine>
+					<argLine>-Xms512m -Xmx1024m</argLine>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -260,25 +291,26 @@
 			</plugin>
 
 			<plugin>
-				<groupId>org.jacoco</groupId>
-				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.7.5.201505241946</version>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<configuration>
+					<check>
+						<haltOnFailure>true</haltOnFailure>
+					</check>
+				</configuration>
 				<executions>
 					<execution>
-						<id>prepare-agent</id>
+						<phase>verify</phase>
 						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-					</execution>
-					<execution>
-						<id>jacoco-site</id>
-						<phase>post-integration-test</phase>
-						<goals>
-							<goal>report</goal>
+							<goal>check</goal>
 						</goals>
 					</execution>
 				</executions>
 			</plugin>
+			<!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>cobertura-maven-plugin</artifactId> <version>${maven_cobertura_plugin_version}</version> <configuration> <check> <branchRate>85</branchRate> 
+				<lineRate>85</lineRate> <haltOnFailure>true</haltOnFailure> <totalBranchRate>85</totalBranchRate> <totalLineRate>85</totalLineRate> <packageLineRate>85</packageLineRate> <packageBranchRate>85</packageBranchRate> 
+				<regexes> <regex> <pattern>com.example.reallyimportant.*</pattern> <branchRate>90</branchRate> <lineRate>80</lineRate> </regex> <regex> <pattern>com.example.boringcode.*</pattern> <branchRate>40</branchRate> 
+				<lineRate>30</lineRate> </regex> </regexes> </check> </configuration> <executions> <execution> <goals> <goal>clean</goal> <goal>check</goal> </goals> </execution> </executions> </plugin> -->
 		</plugins>
 		<resources>
 		</resources>
@@ -299,6 +331,22 @@
 	</build>
 	<reporting>
 		<plugins>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>cobertura-maven-plugin</artifactId>
+				<reportSets>
+					<reportSet>
+						<reports>
+							<report>cobertura</report>
+						</reports>
+						<configuration>
+							<check>
+								<haltOnFailure>true</haltOnFailure>
+							</check>
+						</configuration>
+					</reportSet>
+				</reportSets>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-project-info-reports-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 450911b50cd..2d3fc019ac7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -615,6 +615,11 @@
 					<artifactId>maven-war-plugin</artifactId>
 					<version>2.6</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>cobertura-maven-plugin</artifactId>
+					<version>2.7</version>
+				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>animal-sniffer-maven-plugin</artifactId>