felipeal 2004/10/13 20:26:24
Modified: integration/maven plugin.jelly
integration/maven/xdocs changes.xml properties.xml
Log:
fix for CACTUS-146: cactus:test now skip tests if maven.test.skip is true
Revision Changes Path
1.34 +3 -0 jakarta-cactus/integration/maven/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/plugin.jelly,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- plugin.jelly 21 Aug 2004 08:49:41 -0000 1.33
+++ plugin.jelly 14 Oct 2004 03:26:23 -0000 1.34
@@ -333,6 +333,9 @@
prereqs="cactus:init">
<j:choose>
+ <j:when test="${maven.test.skip}">
+ <ant:echo>Not runnnig Cactus tests because maven.test.skip is
true.</ant:echo>
+ </j:when>
<j:when test="${cactusSourcePresent}">
<j:choose>
<j:when test="${context.getVariable('cactus.is.ear') == 'true'}">
1.47 +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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- changes.xml 14 Oct 2004 03:04:08 -0000 1.46
+++ changes.xml 14 Oct 2004 03:26:24 -0000 1.47
@@ -8,6 +8,9 @@
<body>
<release version="1.7dev" date="in CVS">
+ <action dev="felipeal" type="new" issue="CACTUS-146">
+ Goal <code>cactus:test</code> is not executed if property
<code>maven.test.skip</code> is set.
+ </action>
<action dev="felipeal" type="update" issue="CACTUS-139">
Cactus now uses <code>HttpUnit 1.6</code>.
</action>
1.23 +19 -0 jakarta-cactus/integration/maven/xdocs/properties.xml
Index: properties.xml
===================================================================
RCS file: /home/cvs/jakarta-cactus/integration/maven/xdocs/properties.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- properties.xml 20 Jun 2004 14:04:12 -0000 1.22
+++ properties.xml 14 Oct 2004 03:26:24 -0000 1.23
@@ -521,5 +521,24 @@
</table>
</section>
+ <section name="Related Settings">
+ <table>
+ <tr>
+ <th>Property</th>
+ <th>Optional?</th>
+ <th>Description</th>
+ </tr>
+ <tr>
+ <td>maven.test.skip</td>
+ <td>Yes</td>
+ <td>
+ <p>
+ If set to <code>true</code>, goal <code>cactus:test</code> will skip
tests (it does not affects other goals though, like <code>cactus:test-war</code> and
<code>cactus:test-ear</code>).
+ </p>
+ </td>
+ </tr>
+ </table>
+ </section>
+
</body>
</document>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
