Menu
▾
▴
[Maven-plugins-cvs] cvs commit: maven-plugins/cobertura/xdocs changes.xml properties.xml
|
From: Jeff J. <jef...@us...> - 2007-06-24 03:06:17
|
jeffjensen 07/06/23 20:06:12
Modified: cobertura plugin.properties project.xml plugin.jelly
cobertura/xdocs changes.xml properties.xml
Log:
Upgrade Cobertura plugin to use new Cobertura 1.9rc1.
Revision Changes Path
1.11 +3 -0 maven-plugins/cobertura/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/cobertura/plugin.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plugin.properties 23 Jan 2007 03:14:30 -0000 1.10
+++ plugin.properties 24 Jun 2007 03:06:11 -0000 1.11
@@ -19,6 +19,7 @@
maven.cobertura.junit.fork=yes
maven.cobertura.instrumentation.includes=**/*.class
maven.cobertura.instrumentation.excludes=NOT_DEFINED
+maven.cobertura.instrumentation.maxmemory=64m
#set default datafile location and name
maven.cobertura.datafile=${maven.cobertura.dir}/cobertura.ser
@@ -43,3 +44,5 @@
# set to true to force cobertura to run to get total number of
# executable lines, regardless of if unit tests exist or not.
maven.cobertura.force=false
+
+maven.cobertura.report.maxmemory=64m
1.35 +15 -4 maven-plugins/cobertura/project.xml
Index: project.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/cobertura/project.xml,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- project.xml 13 May 2007 20:26:56 -0000 1.34
+++ project.xml 24 Jun 2007 03:06:12 -0000 1.35
@@ -22,10 +22,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/3.0.0 http://maven.apache.org/maven-v3_0_0.xsd">
<extend>${basedir}/../plugin-project.xml</extend>
- <pomVersion>3</pomVersion>
+ <!--pomVersion is in parent -->
<artifactId>maven-cobertura-plugin</artifactId>
<name>Maven Cobertura Plug-in</name>
- <currentVersion>1.3.1</currentVersion>
+ <currentVersion>1.4-SNAPSHOT</currentVersion>
<inceptionYear>2005</inceptionYear>
<shortDescription>Cobertura calculates the percentage of code accessed by tests.</shortDescription>
<description>Cobertura is a free Java tool that calculates the percentage of code accessed by tests. It can be used to identify which parts of your Java program are lacking test coverage. It is based on jcoverage.</description>
@@ -66,9 +66,9 @@
</developers>
<dependencies>
<dependency>
- <groupId>cobertura</groupId>
+ <groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura</artifactId>
- <version>1.8</version>
+ <version>1.9rc1</version>
<url>http://cobertura.sourceforge.net/</url>
</dependency>
<dependency>
@@ -84,6 +84,12 @@
<url>http://asm.objectweb.org/</url>
</dependency>
<dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-tree</artifactId>
+ <version>2.2.1</version>
+ <url>http://asm.objectweb.org/</url>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
@@ -136,5 +142,10 @@
<name>1.3.1</name>
<tag>MAVEN_COBERTURA_1_3_1</tag>
</version>
+ <version>
+ <id>1.4-SNAPSHOT</id>
+ <name>1.4-SNAPSHOT</name>
+ <tag>MAVEN_COBERTURA_1_4</tag>
+ </version>
</versions>
</project>
1.22 +4 -2 maven-plugins/cobertura/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/cobertura/plugin.jelly,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- plugin.jelly 13 May 2007 19:17:39 -0000 1.21
+++ plugin.jelly 24 Jun 2007 03:06:12 -0000 1.22
@@ -34,6 +34,7 @@
<ant:pathelement path="${plugin.getDependencyPath('javancss:javancss')}"/>
<ant:pathelement path="${plugin.getDependencyPath('javancss:ccl')}"/>
<ant:pathelement path="${plugin.getDependencyPath('asm')}"/>
+ <ant:pathelement path="${plugin.getDependencyPath('asm-tree')}"/>
<ant:pathelement path="${plugin.getDependencyPath('oro')}"/>
<ant:pathelement path="${plugin.getDependencyPath('log4j')}"/>
<ant:pathelement path="${plugin.getDependencyPath('cobertura')}"/>
@@ -104,7 +105,7 @@
<maven:addPath id="maven.dependency.classpath" refid="cobertura.classpath"/>
- <ant:cobertura-instrument todir="${maven.cobertura.instrumentation}" datafile="${maven.cobertura.datafile}">
+ <ant:cobertura-instrument todir="${maven.cobertura.instrumentation}" datafile="${maven.cobertura.datafile}" maxmemory="${maven.cobertura.instrumentation.maxmemory}">
<j:if test="${not empty(context.getVariable('maven.cobertura.ignoreregex'))}">
<ant:ignore regex="${maven.cobertura.ignoreregex}"/>
@@ -292,7 +293,8 @@
description="Generate test coverage reports with Cobertura in maven.cobertura.format format">
<ant:cobertura-report srcdir="${sourceDir}" destdir="${coberturaDocs}"
- datafile="${maven.cobertura.datafile}" format="${maven.cobertura.format}">
+ datafile="${maven.cobertura.datafile}" format="${maven.cobertura.format}"
+ maxmemory="$(maven.cobertura.report.maxmemory)">
<ant:classpath>
<ant:path refid="cobertura.classpath"/>
<ant:path refid="maven.dependency.classpath"/>
1.30 +11 -0 maven-plugins/cobertura/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/cobertura/xdocs/changes.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- changes.xml 13 May 2007 20:26:55 -0000 1.29
+++ changes.xml 24 Jun 2007 03:06:12 -0000 1.30
@@ -22,6 +22,17 @@
<title>Changes</title>
</properties>
<body>
+ <release version="1.4-SNAPSHOT" date="in CVS" description="Upgrade to Cobertura 1.9.">
+ <action dev="jeffjensen" type="add">
+ Upgrade to Cobertura 1.9. This includes adding new dependency asm-tree.jar.
+ </action>
+ <action dev="jeffjensen" type="add">
+ Add maven.cobertura.instrumentation.maxmemory property available with Cobertura 1.9.
+ </action>
+ <action dev="jeffjensen" type="add">
+ Add maven.cobertura.report.maxmemory property available with Cobertura 1.9.
+ </action>
+ </release>
<release version="1.3.1" date="2007-05-13" description="Make it Maven 1.1 compatible.">
<action dev="lukas_theussl" type="update">
Running with test-plugin-1.8 (Maven 1.1), the plugin would fail if there are test errors.
1.13 +16 -0 maven-plugins/cobertura/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /cvsroot/maven-plugins/maven-plugins/cobertura/xdocs/properties.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- properties.xml 14 May 2007 14:29:31 -0000 1.12
+++ properties.xml 24 Jun 2007 03:06:12 -0000 1.13
@@ -48,6 +48,14 @@
</td>
</tr>
<tr>
+ <td>maven.cobertura.instrumentation.maxmemory</td>
+ <td>64m</td>
+ <td>Yes</td>
+ <td>
+ Specifies the JVM max memory amount for the instrumentation task.
+ </td>
+ </tr>
+ <tr>
<td>maven.cobertura.instrumentation.includes</td>
<td>**/*.class</td>
<td>Yes</td>
@@ -64,6 +72,14 @@
</td>
</tr>
<tr>
+ <td>maven.cobertura.report.maxmemory</td>
+ <td>64m</td>
+ <td>Yes</td>
+ <td>
+ Specifies the JVM max memory amount for the report task.
+ </td>
+ </tr>
+ <tr>
<td>maven.cobertura.ignoreregex</td>
<td>Not defined</td>
<td>Yes</td>
|
