From 78ba06106f296ad58eaf41d74c9773fd26caa252 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Mon, 16 Jan 2006 20:52:21 +0000 Subject: [PATCH] PR: MPSCM-67 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 --- scm/plugin.jelly | 4 ++-- .../org/apache/maven/plugins/scm/ScmBean.java | 17 +++++++++++++++-- scm/xdocs/changes.xml | 1 + 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/scm/plugin.jelly b/scm/plugin.jelly index 53007e02..9be43833 100644 --- a/scm/plugin.jelly +++ b/scm/plugin.jelly @@ -159,7 +159,7 @@ Tagging ${scmConnection} with ${maven.scm.tag} - + @@ -312,7 +312,7 @@ Tagging source tree - + diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java index f4ae3c4c..01599cbc 100644 --- a/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java +++ b/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java @@ -56,6 +56,8 @@ public class ScmBean private String tagBase; + private String excludes; + protected Embedder getEmbedder() throws Exception { @@ -192,9 +194,10 @@ public class ScmBean 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 ); } @@ -264,4 +267,14 @@ public class ScmBean this.password = password; } + public String getExcludes() + { + return excludes; + } + + public void setExcludes( String excludes ) + { + this.excludes = excludes; + } + } diff --git a/scm/xdocs/changes.xml b/scm/xdocs/changes.xml index 964655d0..65912e1f 100644 --- a/scm/xdocs/changes.xml +++ b/scm/xdocs/changes.xml @@ -25,6 +25,7 @@ + scm:prepare-release fails because project.xml has been locally modified. When pom.repository.connection ends with '/' checkout fails. Re-add changes.xml file to display announcements. Update to released version of maven-scm.