Bommels05/maven-plugins
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove uses of the invalid svn equivalent to cvs module.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@179027 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
brett 2005-05-30 07:06:16 +00:00
parent 9d9d3aa947
commit 4e0bd21ab9
7 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cruisecontrol/plugin.jelly
View File

@ -58,8 +58,7 @@
</j:if> </j:if>
<j:if test="${method == 'svn'}"> <j:if test="${method == 'svn'}">
<maven:pluginVar var="root" plugin="maven-scm-plugin" property="maven.scm.svn.root"/> <maven:pluginVar var="root" plugin="maven-scm-plugin" property="maven.scm.svn.root"/>
<maven:pluginVar var="module" plugin="maven-scm-plugin" property="maven.scm.svn.module"/> <j:set var="url" value="${root}"/>
<j:set var="url" value="${root}/${module}"/>
</j:if> </j:if>

3
cruisecontrol/xdocs/changes.xml
View File

@ -26,6 +26,9 @@
</properties> </properties>
<body> <body>
<release version="1.7-SNAPSHOT" date="in SVN"> <release version="1.7-SNAPSHOT" date="in SVN">
<action dev="brett" type="add">
Remove use of deprecated maven.scm.svn.module property
</action>
<action dev="brett" type="add" issue="MPCRUISECONTROL-23" due-to="Philip Dodds"> <action dev="brett" type="add" issue="MPCRUISECONTROL-23" due-to="Philip Dodds">
Add a Jabber publisher and configuration. Add a Jabber publisher and configuration.
</action> </action>

4
gump/plugin.jelly
View File

@ -68,7 +68,9 @@
<j:set var="moduleName" value="${scmTokens[5]}"/> <j:set var="moduleName" value="${scmTokens[5]}"/>
</j:when> </j:when>
<j:when test="${scmTokens[1] == 'svn'}"> <j:when test="${scmTokens[1] == 'svn'}">
<j:set var="moduleName" value="${scmTokens[4]}"/> <j:if test="${empty(context.getVariable('maven.gump.svn.dir'))}">
<ant:fail>You must specify maven.gump.svn.dir as the directory under the gump repository in SVN</ant:fail>
</j:if>
</j:when> </j:when>
<j:otherwise> <j:otherwise>
<ant:echo>Unknown SCM type ${scmTokens[1]}: you may need to manually add the repository</ant:echo> <ant:echo>Unknown SCM type ${scmTokens[1]}: you may need to manually add the repository</ant:echo>

2
gump/src/plugin-resources/module.jelly
View File

@ -56,7 +56,7 @@
<nag from="${maven.gump.module.name} development &lt;${pom.build.nagEmailAddress}&gt;" to="${pom.build.nagEmailAddress}"/>]]> <nag from="${maven.gump.module.name} development &lt;${pom.build.nagEmailAddress}&gt;" to="${pom.build.nagEmailAddress}"/>]]>
<j:choose><j:when test="${scmTokens[1] == 'cvs'}"><![CDATA[<cvs repository="${pom.gumpRepositoryId}" module="${moduleName}" />]]></j:when><j:when test="${scmTokens[1] == 'svn'}"><![CDATA[<svn repository="${pom.gumpRepositoryId}" dir="${moduleName}" />]]></j:when></j:choose><j:forEach var="project" items="${reactorProjects}"> <j:choose><j:when test="${scmTokens[1] == 'cvs'}"><![CDATA[<cvs repository="${pom.gumpRepositoryId}" module="${moduleName}" />]]></j:when><j:when test="${scmTokens[1] == 'svn'}"><![CDATA[<svn repository="${pom.gumpRepositoryId}" dir="${maven.gump.svn.dir}" />]]></j:when></j:choose><j:forEach var="project" items="${reactorProjects}">
<j:import file="${plugin.resources}/project.jelly" inherit="true" /></j:forEach> <j:import file="${plugin.resources}/project.jelly" inherit="true" /></j:forEach>
</module> </module>
</j:whitespace> </j:whitespace>

1
gump/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="2.0.1-SNAPSHOT" date="in SVN"> <release version="2.0.1-SNAPSHOT" date="in SVN">
<action dev="brett" type="add">Add maven.gump.svn.dir property for setting the subdirectory under the svn repository</action>
<action dev="brett" type="add">Add the ability to specify the "runtime" attribute of a dependency using the <action dev="brett" type="add">Add the ability to specify the "runtime" attribute of a dependency using the
<code>gump.runtime</code> property</action> <code>gump.runtime</code> property</action>
<action dev="brett" type="update">Pass ids to depends element also</action> <action dev="brett" type="update">Pass ids to depends element also</action>

17
scm/plugin.jelly
View File

@ -263,11 +263,7 @@
<j:if test="${empty(svnRoot)}"> <j:if test="${empty(svnRoot)}">
<ant:fail>You must specify maven.scm.svn.root</ant:fail> <ant:fail>You must specify maven.scm.svn.root</ant:fail>
</j:if> </j:if>
<j:set var="svnModule" value="${maven.scm.svn.module}"/> </j:when>
<j:if test="${empty(svnModule)}">
<ant:fail>You must specify maven.scm.svn.module</ant:fail>
</j:if>
</j:when>
<j:otherwise> <j:otherwise>
<ant:fail>Unknown SCM method: '${maven.scm.method}'</ant:fail> <ant:fail>Unknown SCM method: '${maven.scm.method}'</ant:fail>
</j:otherwise> </j:otherwise>
@ -318,11 +314,14 @@
</j:if> </j:if>
<j:if test="${scmMethod == 'svn'}"> <j:if test="${scmMethod == 'svn'}">
<j:set var="maven.scm.svn.root" value="${tokens[2]}:${tokens[3]}"/> <j:set var="maven.scm.svn.root" value="${tokens[2]}:${tokens[3]}"/>
<j:set var="maven.scm.svn.module" value="${tokens[4]}"/> <j:set var="svnModule" value="${tokens[4]}"/>
<j:if test="${!empty(svnModule)}">
<ant:echo>DEPRECATED: using ':' to separate a module in the SVN connection string is deprecated</ant:echo>
<j:set var="maven.scm.svn.root" value="${maven.scm.svn.root}/${svnModule}" />
</j:if>
<ant:echo>Using SVN repository: ${maven.scm.svn.root}</ant:echo> <ant:echo>Using SVN repository: ${maven.scm.svn.root}</ant:echo>
<ant:echo>Using module: ${maven.scm.svn.module}</ant:echo> </j:if>
</j:if>
</j:if> </j:if>
</goal> </goal>

7
scm/xdocs/properties.xml
View File

@ -190,13 +190,6 @@
</p> </p>
</td> </td>
</tr> </tr>
<tr>
<td>maven.scm.svn.module</td>
<td>Yes</td>
<td>
<p>The SVN module to checkout</p>
</td>
</tr>
<tr> <tr>
<td>maven.scm.cvs.sticky.tag</td> <td>maven.scm.cvs.sticky.tag</td>
<td>Yes</td> <td>Yes</td>