# This patch file was generated by NetBeans IDE # Following Index: paths are relative to: D:\projects\foreign\apache\jmeter\trunk # This patch can be applied using context Tools: Patch action on respective folder. # It uses platform neutral UTF-8 encoding and \n newlines. # Above lines and this line are ignored by the patching process. Index: build.properties --- build.properties Base (BASE) +++ build.properties Locally Modified (Based On LOCAL) @@ -389,3 +389,9 @@ rat-tasks.loc = ${maven2.repo}/org/apache/rat/apache-rat-tasks/${rat.version} rat-tasks.md5 = 96b699581b4475ed5756a0c24af745e8 +# Optional for use by JaCoCo +jacocoant.version = 0.7.7.201606060606 +jacocoant.jar = org.jacoco.ant-${jacocoant.version}-nodeps.jar +jacocoant.loc = ${maven2.repo}/org/jacoco/org.jacoco.ant/${jacocoant.version} +#jacocoant.md5 = 3ca768b6f77cc4fe52795ee9c3f679fd +jacocoant.md5 = fc093f67abf5bafb782d2eafa2f5815e \ No newline at end of file Index: build.xml --- build.xml Base (BASE) +++ build.xml Locally Modified (Based On LOCAL) @@ -17,7 +17,9 @@ --> + xmlns:jacoco="antlib:org.jacoco.ant" + xmlns:if="ant:if" + xmlns="antlib:org.apache.tools.ant" > N.B. To build JMeter from a release you need both the binary and source archives, @@ -331,6 +333,14 @@ + + + + @@ -892,6 +902,7 @@ + @@ -2457,6 +2468,7 @@ + @@ -2558,6 +2570,7 @@ + @@ -2755,6 +2768,7 @@ + @@ -2781,6 +2795,7 @@ printsummary="on"> + @@ -3016,6 +3031,7 @@ + @@ -3085,6 +3101,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: test/src/org/apache/jmeter/JMeterVersionTest.java --- test/src/org/apache/jmeter/JMeterVersionTest.java Base (BASE) +++ test/src/org/apache/jmeter/JMeterVersionTest.java Locally Modified (Based On LOCAL) @@ -115,6 +115,11 @@ versions.remove("rat"); propNames.remove("rat-tasks"); versions.remove("rat-tasks"); + + // remove optional jacoco jars (required for coverage reporting, not required for jmeter) + propNames.remove("jacocoant"); + versions.remove("jacocoant"); + prop = buildProp; final File licencesDir = getFileFromHome("licenses/bin"); licencesDir.list(new FilenameFilter() {