Update to JaCoCo 0.7.4 and fix location of coverage data in build-output

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1680228 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index 9509ed3dbf86d0ec01d5f841a97a8248f22288c2..4e4d60932cfeae6d85b9a7c3c18a6a43cc8219d3 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -173,8 +173,8 @@ under the License.
               value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/>
        
     <!-- coverage libs -->
-    <property name="jacoco.zip" location="${main.lib}/jacoco-0.7.2.201409121644.zip"/>
-    <property name="jacoco.url" value="${repository.m2}/maven2/org/jacoco/jacoco/0.7.2.201409121644/jacoco-0.7.2.201409121644.zip"/>
+    <property name="jacoco.zip" location="${main.lib}/jacoco-0.7.4.201502262128.zip"/>
+    <property name="jacoco.url" value="${repository.m2}/maven2/org/jacoco/jacoco/0.7.4.201502262128/jacoco-0.7.4.201502262128.zip"/>
     <property name="asm.jar" location="${main.lib}/asm-all-5.0.3.jar"/>
     <property name="asm.url" value="${repository.m2}/maven2/org/ow2/asm/asm-all/5.0.3/asm-all-5.0.3.jar"/>
        
@@ -415,6 +415,7 @@ under the License.
                                <include name="commons-logging-1.1.jar"/>
                                <include name="jacoco-0.6*"/>
                                <include name="jacoco-0.7.1*"/>
+                               <include name="jacoco-0.7.2*"/>
                                <include name="log4j-1.2.13*"/>
                                <include name="org.jacoco.*-0.6.*"/>
                                <include name="org.jacoco.*-0.7.1*"/>
@@ -942,7 +943,7 @@ under the License.
             <xml destfile="${coverage.dir}/coverage.xml"/>
         </jacoco:report>        
         
-        <echo message="Coverage results are available at coverage\index.html, coverage/coverage.xml" />
+        <echo message="Coverage results are available at ${coverage.dir}/index.html, ${coverage.dir}/coverage.xml" />
     </target>
 
     <target name="-test-main-check">