brett 2004/06/11 22:20:57
Modified: clover plugin.jelly project.xml
clover/xdocs changes.xml
Log:
rollback last change due to breakage
Revision Changes Path
1.24 +7 -4 maven-plugins/clover/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/clover/plugin.jelly,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- plugin.jelly 12 Jun 2004 04:52:28 -0000 1.23
+++ plugin.jelly 12 Jun 2004 05:20:57 -0000 1.24
@@ -51,21 +51,24 @@
<ant:path id="clover.classpath">
<j:choose>
<j:when test="${context.getVariable('maven.clover.jar') != null}">
- <ant:pathelement location="${maven.clover.jar}"/>
+ <ant:pathelement path="${maven.clover.jar}"/>
</j:when>
<j:otherwise>
- <ant:pathelement location="${plugin.getDependencyPath('clover')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('clover')}"/>
</j:otherwise>
</j:choose>
</ant:path>
- <ant:taskdef resource="clovertasks" classpathref="clover.classpath" />
- <ant:typedef resource="clovertypes" classpathref="clover.classpath" />
+ <ant:taskdef resource="clovertasks"/>
+ <ant:typedef resource="clovertypes"/>
<j:set var="cloverDatabase"
value="${maven.clover.database.dir}/clover_coverage.db"/>
<j:set var="cloverReportDirectory" value="${maven.docs.dest}/clover"/>
+
+ <!-- Allow users to override the version of the Clover jar to use -->
+ <maven:addPath id="maven.dependency.classpath" refid="clover.classpath"/>
<ant:mkdir dir="${maven.clover.build.classes}"/>
<ant:mkdir dir="${maven.clover.database.dir}"/>
1.41 +4 -1 maven-plugins/clover/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/maven-plugins/clover/project.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- project.xml 12 Jun 2004 04:52:28 -0000 1.40
+++ project.xml 12 Jun 2004 05:20:57 -0000 1.41
@@ -23,7 +23,7 @@
<pomVersion>3</pomVersion>
<id>maven-clover-plugin</id>
<name>Maven Clover Plugin</name>
- <currentVersion>1.6-SNAPSHOT</currentVersion>
+ <currentVersion>1.5</currentVersion>
<description/>
<shortDescription>Produce Clover reports</shortDescription>
<url>http://maven.apache.org/reference/plugins/clover/</url>
@@ -104,6 +104,9 @@
<groupId>clover</groupId>
<artifactId>clover</artifactId>
<version>1.2.3</version>
+ <properties>
+ <classloader>root</classloader>
+ </properties>
</dependency>
</dependencies>
</project>
1.30 +0 -3 maven-plugins/clover/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/clover/xdocs/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 12 Jun 2004 04:52:28 -0000 1.29
+++ changes.xml 12 Jun 2004 05:20:57 -0000 1.30
@@ -25,9 +25,6 @@
<author email="[EMAIL PROTECTED]">Emmanuel Venisse</author>
</properties>
<body>
- <release version="1.6-SNAPSHOT" date="in CVS">
- <action dev="brett" type="fix" issue="MPCLOVER-15">Make maven.clover.jar
work</action>
- </release>
<release version="1.5" date="2004-05-15">
<action dev="vmassol" type="fix">Do not execute Clover if there are no tests
to run Clover on. This prevents an error happening in the
<code>clover:on</code>goal.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
