Revert MAVEN-795
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@113979 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
1 parent
04b3ccef5a
commit
8c089c1fa9
1 file changed
+2
-15
+2
-15
@@ -95,8 +95,6 @@
|
||||
|
||||
<maven:addPath id="maven.dependency.classpath" refid="jcoverage.classpath"/>
|
||||
<maven:addPath id="maven.dependency.classpath" refid="${pom.getDependencyClasspath()}"/>
|
||||
|
||||
|
||||
|
||||
<instrument todir="${maven.jcoverage.instrumentation}">
|
||||
<ant:fileset dir="${maven.build.dest}">
|
||||
@@ -138,19 +136,9 @@
|
||||
<j:catch var="ex">
|
||||
|
||||
<j:set var="template" value="${maven.jcoverage.report.template}"/>
|
||||
|
||||
<ant:copy todir="${maven.jcoverage.sourceDirectory}">
|
||||
<ant:fileset dir="${pom.build.sourceDirectory}">
|
||||
<ant:include name="**/*.java" />
|
||||
</ant:fileset>
|
||||
<ant:fileset dir="${pom.build.unitTestSourceDirectory}">
|
||||
<ant:include name="**/*.java" />
|
||||
</ant:fileset>
|
||||
</ant:copy>
|
||||
|
||||
<j:choose>
|
||||
<j:when test="${template == 'jcoverage'}">
|
||||
<report srcdir="${maven.jcoverage.sourceDirectory}" destdir="${maven.coverage.dir}">
|
||||
<report srcdir="${pom.build.sourceDirectory}" destdir="${maven.coverage.dir}">
|
||||
<ant:classpath>
|
||||
<ant:path refid="jcoverage.classpath"/>
|
||||
</ant:classpath>
|
||||
@@ -160,14 +148,13 @@
|
||||
<log:info>The HTML report is ${maven.build.coverage.dir}/index.html</log:info>
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<report srcdir="${maven.jcoverage.sourceDirectory}" destdir="${maven.jcoverage.dir}"
|
||||
<report srcdir="${pom.build.sourceDirectory}" destdir="${maven.jcoverage.dir}"
|
||||
format="xml">
|
||||
<ant:classpath>
|
||||
<ant:path refid="jcoverage.classpath"/>
|
||||
</ant:classpath>
|
||||
</report>
|
||||
<ant:copy file="${plugin.resources}/style.css" todir="${maven.coverage.dir}"/>
|
||||
<ant:echo>jcoverage:report params : {dataFile, ouputDir}={${maven.jcoverage.dir}/coverage.xml, ${maven.coverage.dir}}</ant:echo>
|
||||
<jcoverage:report
|
||||
dataFile="${maven.jcoverage.dir}/coverage.xml"
|
||||
outputDir="${maven.coverage.dir}"/>
|
||||
|
||||
Reference in new issue
Block a user