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

PR: MPSCM-67

Browse Source 
Submitted by: Dennis Lundberg
scm:prepare-release fails because project.xml has been locally modified.


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@369569 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ltheussl 2006-01-16 20:52:21 +00:00
parent 3aa9669d43
commit 78ba06106f
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scm/plugin.jelly
View File

@ -159,7 +159,7 @@
<ant:echo>Tagging ${scmConnection} with ${maven.scm.tag}</ant:echo> <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>
<goal name="scm:checkin" prereqs="scm:find-connection" description="Checkin a set of files in the current directory of SCM" > <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}" /> <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> <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>
<goal name="scm:create-patch" description="Create a patch file for changes single last SCM update" prereqs="scm:find-connection"> <goal name="scm:create-patch" description="Create a patch file for changes single last SCM update" prereqs="scm:find-connection">

17
scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
View File

@ -56,6 +56,8 @@ public class ScmBean
private String tagBase; private String tagBase;
private String excludes;
protected Embedder getEmbedder() protected Embedder getEmbedder()
throws Exception throws Exception
{ {
@ -192,9 +194,10 @@ public class ScmBean
ScmRepository repository = getScmRepository( scmManager ); ScmRepository repository = getScmRepository( scmManager );
// TODO: want includes/excludes? // TODO: want includes?
TagScmResult result = scmManager.getProviderByRepository( repository ) 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 ); checkResult( result );
} }
@ -264,4 +267,14 @@ public class ScmBean
this.password = password; this.password = password;
} }
public String getExcludes()
{
return excludes;
}
public void setExcludes( String excludes )
{
this.excludes = excludes;
}
} }

1
scm/xdocs/changes.xml
View File

@ -25,6 +25,7 @@
</properties> </properties>
<body> <body>
<release version="1.6-SNAPSHOT" date="in SVN"> <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-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="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> <action dev="aheritier" type="update" issue="MPSCM-66">Update to released version of maven-scm.</action>