vmassol 2003/11/08 04:45:46
Modified: integration/maven/xdocs changes.xml
integration/maven plugin.jelly
Log:
When running reports, make sure Cactus tests do not fail the build.
Revision Changes Path
1.6 +3 -0 jakarta-cactus/integration/maven/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 8 Nov 2003 12:07:52 -0000 1.5
+++ changes.xml 8 Nov 2003 12:45:46 -0000 1.6
@@ -8,6 +8,9 @@
<body>
<release version="1.6dev" date="in CVS">
+ <action dev="vmassol" type="add">
+ When running reports, make sure Cactus tests do not fail the build.
+ </action>
<action dev="vmassol" type="fix">
Fixed bug
<a
href="http://jira.codehaus.org/secure/ViewIssue.jspa?key=MAVEN-1000";>MAVEN-1000</a>.
1.6 +8 -3 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.jelly 8 Nov 2003 12:07:52 -0000 1.5
+++ plugin.jelly 8 Nov 2003 12:45:46 -0000 1.6
@@ -742,13 +742,19 @@
description="Generate a report from the test results">
<j:if test="${context.getVariable('cactus.execute.during.report') == 'true'}">
+
+ <!-- When running reports, make sure Cactus tests do not fail the
+ build -->
+ <j:set var="cactus.halt.on.failure" value="false"/>
+ <j:set var="cactus.halt.on.error" value="false"/>
<attainGoal name="cactus:test"/>
+
</j:if>
<!-- Before running the report, check the required test suite xml file has
been generated -->
<util:file var="inputAsFile"
- name="${cactus.reports.dir}/TESTS-TestSuites-Cactus.xml}"/>
+ name="${cactus.reports.dir}/TESTS-TestSuites-Cactus.xml"/>
<j:choose>
<j:when test="${inputAsFile.exists()}">
@@ -786,8 +792,7 @@
<define:taglib uri="cactus">
<define:tag name="dependency-handle">
- <!-- XXX Use this tag to allow this plugin to be loaded into another -->
- <!--<attainGoal name="cactus:init"/>-->
+ <!-- Use this tag to allow this plugin to be loaded into another -->
</define:tag>
</define:taglib>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
