diff sonar-ant.xml @ 27:ea29594bb799

TL-34: Switch to Jacoco for coverage analysis.
author smith@nwoca.org
date Sun, 10 Apr 2011 21:42:19 -0400
parents 639bec4999f2
children ad0a75e20f7b
line wrap: on
line diff
--- a/sonar-ant.xml	Fri Apr 08 17:37:19 2011 -0400
+++ b/sonar-ant.xml	Sun Apr 10 21:42:19 2011 -0400
@@ -10,33 +10,29 @@
                         value="http://ivy.ssdt.nwoca.org/repository/sonar/sonar-ant-task.jar"/>
     <ssdt:fetch         dest="${user.home.ant.lib}/sonar.jar"
                         src="${ssdt.sonar.jar.src}"/>
-    <ssdt:import-ant    file="clover-ant.xml"/>
-
-    <taskdef uri="antlib:org.sonar.ant" resource="org/sonar/ant/antlib.xml"/>
-
-    <property name="sonar.host.url" value="http://ssdt-web-10.nwoca.org:9000" />
-    <property name="sonar.language" value="grvy"/>
+    <ssdt:import-ant    file="jacoco-ant.xml"/>
 
     <target name="-check-sonar">
         <property file="${ssdt.devel.kit}/sonar.properties"/>
+        <property name="sonar.host.url" value="http://ssdt-web-10.nwoca.org:9000" />
+        <property name="sonar.language" value="grvy"/>
+        <taskdef uri="antlib:org.sonar.ant" resource="org/sonar/ant/antlib.xml"/>
     </target>
 
     <target name="sonar" depends="project.init,-check-sonar,ivy-info,coverage.xml" if="sonar.enabled">
-        <property name="clover.dest" value="${build.dir}/clover"/>
-        <property name="coverage.report.path" location="${clover.dest}/clover.xml"/>
-        <sonar:sonar 
+        <sonar:sonar
             workDir="${build.dir}/sonar"
             key="${ivy.project.organisation}:${ivy.project.module}"
             version="${project.version}" >
             <sources>
                 <path location="${src.dir}" />
             </sources>
-            <property key="sonar.core.codeCoveragePlugin" value="clover"/>
+            <property key="sonar.core.codeCoveragePlugin" value="jacoco"/>
             <property key="sonar.projectName" value="${ivy.project.module}"/>
             <property key="sonar.language" value="${sonar.language}" />
             <property key="sonar.dynamicAnalysis" value="reuseReports" />
             <property key="sonar.surefire.reportsPath" value="${build.test.results.dir}"/>
-            <property key="sonar.clover.reportPath" value="${clover.dest}/clover.xml"/>
+            <property key="sonar.jacoco.reportPath" value="${jacoco.data.file}"/>
             <tests>
                 <path location="${test.dir}" />
             </tests>