Author: ltheussl
Date: Mon Jan 16 12:52:21 2006
New Revision: 369569
URL: http://svn.apache.org/viewcvs?rev=369569&view=rev
Log:
PR: MPSCM-67
Submitted by: Dennis Lundberg
scm:prepare-release fails because project.xml has been locally modified.
Modified:
maven/maven-1/plugins/trunk/scm/plugin.jelly
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
Modified: maven/maven-1/plugins/trunk/scm/plugin.jelly
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/plugin.jelly?rev=369569&r1=369568&r2=369569&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/plugin.jelly (original)
+++ maven/maven-1/plugins/trunk/scm/plugin.jelly Mon Jan 16 12:52:21 2006
@@ -159,7 +159,7 @@
<ant:echo>Tagging ${scmConnection} with ${maven.scm.tag}</ant:echo>
- <scm:tag url="${scmConnection}" workingDirectory="${basedir}"
tag="${maven.scm.tag}" tagBase="${maven.scm.svn.tag.base}"
username="${maven.scm.username}" password="${maven.scm.password}" />
+ <scm:tag url="${scmConnection}" workingDirectory="${basedir}"
excludes="project.xml.backup,xdocs/changes.xml.backup" tag="${maven.scm.tag}"
tagBase="${maven.scm.svn.tag.base}" username="${maven.scm.username}"
password="${maven.scm.password}" />
</goal>
<goal name="scm:checkin" prereqs="scm:find-connection" description="Checkin
a set of files in the current directory of SCM" >
@@ -312,7 +312,7 @@
<scm:checkin url="${scmConnection}" workingDirectory="${basedir}"
includes="project.xml,xdocs/changes.xml" message="[maven-scm-plugin] prepare
release ${version_name}" username="${maven.scm.username}"
password="${maven.scm.password}" />
<ant:echo>Tagging source tree</ant:echo>
- <scm:tag url="${scmConnection}" workingDirectory="${basedir}"
tag="${tag_name}" tagBase="${maven.scm.svn.tag.base}"
username="${maven.scm.username}" password="${maven.scm.password}" />
+ <scm:tag url="${scmConnection}" workingDirectory="${basedir}"
excludes="project.xml.backup,xdocs/changes.xml.backup" tag="${tag_name}"
tagBase="${maven.scm.svn.tag.base}" username="${maven.scm.username}"
password="${maven.scm.password}" />
</goal>
<goal name="scm:create-patch" description="Create a patch file for changes
single last SCM update" prereqs="scm:find-connection">
Modified:
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java?rev=369569&r1=369568&r2=369569&view=diff
==============================================================================
---
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
(original)
+++
maven/maven-1/plugins/trunk/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
Mon Jan 16 12:52:21 2006
@@ -56,6 +56,8 @@
private String tagBase;
+ private String excludes;
+
protected Embedder getEmbedder()
throws Exception
{
@@ -192,9 +194,10 @@
ScmRepository repository = getScmRepository( scmManager );
- // TODO: want includes/excludes?
+ // TODO: want includes?
TagScmResult result = scmManager.getProviderByRepository( repository )
- .tag( repository, new ScmFileSet( new File( workingDirectory ) ),
tag );
+ .tag( repository, new ScmFileSet( new File( workingDirectory ),
+ null, getExcludes() ), tag );
checkResult( result );
}
@@ -262,6 +265,16 @@
public void setPassword( String password )
{
this.password = password;
+ }
+
+ public String getExcludes()
+ {
+ return excludes;
+ }
+
+ public void setExcludes( String excludes )
+ {
+ this.excludes = excludes;
}
}
Modified: maven/maven-1/plugins/trunk/scm/xdocs/changes.xml
URL:
http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/scm/xdocs/changes.xml?rev=369569&r1=369568&r2=369569&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/scm/xdocs/changes.xml (original)
+++ maven/maven-1/plugins/trunk/scm/xdocs/changes.xml Mon Jan 16 12:52:21 2006
@@ -25,6 +25,7 @@
</properties>
<body>
<release version="1.6-SNAPSHOT" date="in SVN">
+ <action dev="ltheussl" type="fix" issue="MPSCM-67" due-to="Dennis
Lundberg">scm:prepare-release fails because project.xml has been locally
modified.</action>
<action dev="ltheussl" type="fix" issue="MPSCM-65" due-to="Phil
Steitz">When pom.repository.connection ends with '/' checkout fails.</action>
<action dev="ltheussl" type="fix" issue="MPSCM-57">Re-add changes.xml
file to display announcements.</action>
<action dev="aheritier" type="update" issue="MPSCM-66">Update to
released version of maven-scm.</action>
