epugh 2004/05/31 08:56:08
Modified: cruisecontrol plugin.jelly plugin.properties
cruisecontrol/xdocs changes.xml
Log:
allow maven.cruisecontrol.home to be passed in by using more typical check for
missing properties.
Revision Changes Path
1.5 +2 -1 maven-plugins/cruisecontrol/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.jelly,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin.jelly 31 May 2004 13:18:46 -0000 1.4
+++ plugin.jelly 31 May 2004 15:56:08 -0000 1.5
@@ -30,8 +30,9 @@
<!-- Validate necessary properties for Cruise Control -->
<!--==================================================================-->
<goal name="cruisecontrol:validate" prereqs="scm:validate">
+ <j:set var="cruisecontrolHomeX" value="${maven.cruisecontrol.home}X"/>
<j:set var="ccHome" value="${maven.cruisecontrol.home}" />
- <j:if test="${ccHome == 'CC_HOME_NOT_SET'}">
+ <j:if test="${cruisecontrolHomeX == 'X'}">
<ant:fail>You must specify maven.cruisecontrol.home</ant:fail>
</j:if>
1.6 +0 -1 maven-plugins/cruisecontrol/plugin.properties
Index: plugin.properties
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/plugin.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- plugin.properties 31 May 2004 13:18:46 -0000 1.5
+++ plugin.properties 31 May 2004 15:56:08 -0000 1.6
@@ -19,7 +19,6 @@
maven.cruisecontrol.checkout.dir=${basedir}/checkout
maven.cruisecontrol.logs.dir=${maven.build.dir}/cc-logs
maven.cruisecontrol.goals=scm:update-project|clean test|site:deploy
-maven.cruisecontrol.home=CC_HOME_NOT_SET
maven.cruisecontrol.mail.host=localhost
maven.cruisecontrol.mail.defaultsuffix=DEFAULT_SUFFIX_NOT_SET
maven.cruisecontrol.mail.subjectprefix=[BUILD]
1.6 +1 -0 maven-plugins/cruisecontrol/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/cruisecontrol/xdocs/changes.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- changes.xml 31 May 2004 13:18:46 -0000 1.5
+++ changes.xml 31 May 2004 15:56:08 -0000 1.6
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.3" date="n/a">
+ <action dev="epugh" type="fix">allow the maven.cruisecontrol.home property to
be overrided by other plugins via preGoal calls.</action>
<action dev="epugh" type="add">allow user to specify different cc template to
use</action>
</release>
<release version="1.2" date="2004-05-15">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]