You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by br...@apache.org on 2005/05/30 09:06:17 UTC
svn commit: r179027 - in /maven/maven-1/plugins/trunk:
cruisecontrol/plugin.jelly cruisecontrol/xdocs/changes.xml
gump/plugin.jelly gump/src/plugin-resources/module.jelly
gump/xdocs/changes.xml scm/plugin.jelly scm/xdocs/properties.xml
Author: brett
Date: Mon May 30 00:06:16 2005
New Revision: 179027
URL: http://svn.apache.org/viewcvs?rev=179027&view=rev
Log:
remove uses of the invalid svn equivalent to cvs module.
Modified:
maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly
maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
maven/maven-1/plugins/trunk/gump/plugin.jelly
maven/maven-1/plugins/trunk/gump/src/plugin-resources/module.jelly
maven/maven-1/plugins/trunk/gump/xdocs/changes.xml
maven/maven-1/plugins/trunk/scm/plugin.jelly
maven/maven-1/plugins/trunk/scm/xdocs/properties.xml
Modified: maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly?rev=179027&r1=179026&r2=179027&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/plugin.jelly Mon May 30 00:06:16 2005
@@ -58,8 +58,7 @@
</j:if>
<j:if test="${method == 'svn'}">
<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}/${module}"/>
+ <j:set var="url" value="${root}"/>
</j:if>
Modified: maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml?rev=179027&r1=179026&r2=179027&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/cruisecontrol/xdocs/changes.xml Mon May 30 00:06:16 2005
@@ -26,6 +26,9 @@
</properties>
<body>
<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">
Add a Jabber publisher and configuration.
</action>
Modified: maven/maven-1/plugins/trunk/gump/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/gump/plugin.jelly?rev=179027&r1=179026&r2=179027&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/gump/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/gump/plugin.jelly Mon May 30 00:06:16 2005
@@ -68,7 +68,9 @@
<j:set var="moduleName" value="${scmTokens[5]}"/>
</j:when>
<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:otherwise>
<ant:echo>Unknown SCM type ${scmTokens[1]}: you may need to manually add the repository</ant:echo>
Modified: maven/maven-1/plugins/trunk/gump/src/plugin-resources/module.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/gump/src/plugin-resources/module.jelly?rev=179027&r1=179026&r2=179027&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/gump/src/plugin-resources/module.jelly (original)
+++ maven/maven-1/plugins/trunk/gump/src/plugin-resources/module.jelly Mon May 30 00:06:16 2005
@@ -56,7 +56,7 @@
<nag from="${maven.gump.module.name} development <${pom.build.nagEmailAddress}>" 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>
</module>
</j:whitespace>
Modified: maven/maven-1/plugins/trunk/gump/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/gump/xdocs/changes.xml?rev=179027&r1=179026&r2=179027&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/gump/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/gump/xdocs/changes.xml Mon May 30 00:06:16 2005
@@ -25,6 +25,7 @@
</properties>
<body>
<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
<code>gump.runtime</code> property</action>
<action dev="brett" type="update">Pass ids to depends element also</action>
Modified: maven/maven-1/plugins/trunk/scm/plugin.jelly
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/plugin.jelly?rev=179027&r1=179026&r2=179027&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/scm/plugin.jelly Mon May 30 00:06:16 2005
@@ -263,11 +263,7 @@
<j:if test="${empty(svnRoot)}">
<ant:fail>You must specify maven.scm.svn.root</ant:fail>
</j:if>
- <j:set var="svnModule" value="${maven.scm.svn.module}"/>
- <j:if test="${empty(svnModule)}">
- <ant:fail>You must specify maven.scm.svn.module</ant:fail>
- </j:if>
- </j:when>
+ </j:when>
<j:otherwise>
<ant:fail>Unknown SCM method: '${maven.scm.method}'</ant:fail>
</j:otherwise>
@@ -318,11 +314,14 @@
</j:if>
<j:if test="${scmMethod == 'svn'}">
<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 module: ${maven.scm.svn.module}</ant:echo>
- </j:if>
+ </j:if>
</j:if>
</goal>
Modified: maven/maven-1/plugins/trunk/scm/xdocs/properties.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/properties.xml?rev=179027&r1=179026&r2=179027&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/xdocs/properties.xml (original)
+++ maven/maven-1/plugins/trunk/scm/xdocs/properties.xml Mon May 30 00:06:16 2005
@@ -191,13 +191,6 @@
</td>
</tr>
<tr>
- <td>maven.scm.svn.module</td>
- <td>Yes</td>
- <td>
- <p>The SVN module to checkout</p>
- </td>
- </tr>
- <tr>
<td>maven.scm.cvs.sticky.tag</td>
<td>Yes</td>
<td>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org