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/01/07 14:05:58 UTC
svn commit: r124494 - /maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly /maven/maven-1/plugins/branches/scm-1.5-branch/project.xml /maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml
Author: brett
Date: Fri Jan 7 05:05:57 2005
New Revision: 124494
URL: http://svn.apache.org/viewcvs?view=rev&rev=124494
Log:
MPSCM-33: honour maven.scm.bootstrap.pom.dir
Modified:
maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly
maven/maven-1/plugins/branches/scm-1.5-branch/project.xml
maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly?view=diff&rev=124494&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r1=124493&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r2=124494
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Fri Jan 7 05:05:57 2005
@@ -107,8 +107,13 @@
<goal name="scm:bootstrap" prereqs="scm:checkout" description="Boostrap a project from the SCM">
<ant:echo>Bootstrapping from ${scmCheckoutBean.checkoutDirectory}/project.xml with goals ${maven.scm.bootstrap.goals}</ant:echo>
+ <j:set var="pomDir" value="${maven.scm.bootstrap.pom.dir}" />
+ <j:set var="dir" value="${scmCheckoutBean.checkoutDirectory}" />
+ <j:if test="${!empty(pomDir)}">
+ <j:set var="dir" value="${dir}/${pomDir}" />
+ </j:if>
<maven:maven
- descriptor="${scmCheckoutBean.checkoutDirectory}/project.xml"
+ descriptor="${dir}/project.xml"
goals="${maven.scm.bootstrap.goals}"
ignoreFailures="false"
/>
@@ -370,8 +375,12 @@
</j:if>
</j:if>
+ <j:set var="pomDir" value="${maven.scm.bootstrap.pom.dir}" />
+ <j:if test="${empty(pomDir)}">
+ <j:set var="pomDir" value="." />
+ </j:if>
<maven:maven
- descriptor="${maven.scm.bootstrap.pom.dir}/project.xml"
+ descriptor="${pomDir}/project.xml"
goals="${maven.scm.bootstrap.goals}"
ignoreFailures="false"
/>
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/project.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/project.xml?view=diff&rev=124494&p1=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r1=124493&p2=maven/maven-1/plugins/branches/scm-1.5-branch/project.xml&r2=124494
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/project.xml (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/project.xml Fri Jan 7 05:05:57 2005
@@ -22,7 +22,7 @@
<extend>../plugin-parent/project.xml</extend>
<id>maven-scm-plugin</id>
<name>Maven Source Control Management Plug-in</name>
- <currentVersion>1.5-beta-2</currentVersion>
+ <currentVersion>1.5-beta-3-SNAPSHOT</currentVersion>
<description>A plugin for SCM tasks, currently CVS.</description>
<shortDescription>SCM Plugin for Maven.</shortDescription>
<url>http://maven.apache.org/reference/plugins/scm/</url>
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml?view=diff&rev=124494&p1=maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml&r1=124493&p2=maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml&r2=124494
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/xdocs/changes.xml Fri Jan 7 05:05:57 2005
@@ -24,8 +24,9 @@
<author email="brett@apache.org">Brett Porter</author>
</properties>
<body>
- <release version="1.5-beta-2" date="2005-01-07">
- <action dev="brett" type="add">Add support for subversion</action>
+ <release version="1.5-beta-3-SNAPSHOT" date="in SVN">
+ <action dev="brett" type="add" issue="MPSCM-33">Use maven.scm.bootstrap.pom.dir</action>
+ <action dev="brett" type="add" issue="MPSCM-32">Add support for subversion</action>
<action dev="brett" type="add">Rewritten to utilise the Maven SCM library</action>
<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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org