dion 2003/09/23 22:56:36
Modified: src/plugins-build/scm/xdocs changes.xml
src/plugins-build/scm plugin.jelly
Log:
Apply MAVEN-834
Revision Changes Path
1.3 +3 -0 maven/src/plugins-build/scm/xdocs/changes.xml
Index: changes.xml
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/scm/xdocs/changes.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- changes.xml 17 Sep 2003 23:08:17 -0000 1.2
+++ changes.xml 24 Sep 2003 05:56:36 -0000 1.3
@@ -7,6 +7,9 @@
<body>
<release version="1.1-SNAPSHOT" date="in CVS">
+ <action dev="dion" type="update">
+ Apply MAVEN-834. Support for scm delimiters other than ':'
+ </action>
<action dev="brett" type="fix">
Turn off pretty printing to fix MAVEN-769 - random spaces added
to project.xml.
1.4 +5 -1 maven/src/plugins-build/scm/plugin.jelly
Index: plugin.jelly
===================================================================
RCS file: /home/cvs/maven/src/plugins-build/scm/plugin.jelly,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin.jelly 17 Sep 2003 23:03:24 -0000 1.3
+++ plugin.jelly 24 Sep 2003 05:56:36 -0000 1.4
@@ -20,7 +20,11 @@
<j:set var="value" value="${pom.repository.connection}"/>
<j:if test="${!empty(value)}">
<!-- Use pom.repository.connection if present -->
- <util:tokenize var="tokens"
delim=":">${pom.repository.connection}</util:tokenize>
+ <j:set var="delim" value=":"/>
+ <j:if test="${value.length() gt 3}">
+ <j:set var="delim" value="${value.substring(3, 4)}"/>
+ </j:if>
+ <util:tokenize var="tokens"
delim="${delim}">${pom.repository.connection}</util:tokenize>
<j:if test="${tokens[0] != 'scm'}">
<ant:fail>Invalid repository connection format</ant:fail>
</j:if>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
