carlos 2004/11/28 02:54:12
Modified: scm plugin.jelly
scm/xdocs changes.xml
Log:
Ignore POM if the scm root is specified in command line
Revision Changes Path
1.16 +7 -0 maven-plugins/scm/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven-plugins/scm/plugin.jelly,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- plugin.jelly 9 Aug 2004 01:25:46 -0000 1.15
+++ plugin.jelly 28 Nov 2004 10:54:12 -0000 1.16
@@ -35,6 +35,13 @@
<!-- Goal to validate SCM properties -->
<!--==================================================================-->
<goal name="scm:parse-connection">
+
+ <!-- ignore POM if the scm root is specified in command line -->
+ <j:if test="${!empty(context.getVariable('maven.scm.cvs.root')) ||
+ !empty(context.getVariable('maven.scm.svn.root'))}">
+ <j:set var="maven.scm.ignore.pom.connection" value="true"/>
+ </j:if>
+
<j:set var="checkValue" value="${maven.scm.ignore.pom.connection}"/>
<j:if test="${!checkValue}">
<j:set var="checkValue"
value="${maven.scm.ignore.pom.developerConnection}"/>
1.20 +1 -0 maven-plugins/scm/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven-plugins/scm/xdocs/changes.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- changes.xml 9 Aug 2004 01:25:47 -0000 1.19
+++ changes.xml 28 Nov 2004 10:54:12 -0000 1.20
@@ -26,6 +26,7 @@
<body>
<release version="1.4.2-SNAPSHOT" date="in CVS">
<action dev="dion" type="fix" issue="MPSCM-25">Ignore whitespace when
creating a patch</action>
+ <action dev="carlos" type="fix">Ignore POM if the scm root is
specified in command line</action>
</release>
<release version="1.4.1" date="2004-07-30">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
