From 8cfbd8a52037a810a870be7c9621ce7d8b4e197d Mon Sep 17 00:00:00 2001 From: ltheussl Date: Sun, 29 Jan 2006 21:55:01 +0000 Subject: [PATCH] Reverting Dennis' patch, there is something wrong with scm:tag when using svn git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@373363 13f79535-47bb-0310-9956-ffa450edef68 --- scm/plugin.jelly | 4 ++-- .../org/apache/maven/plugins/scm/ScmBean.java | 17 ++--------------- scm/xdocs/changes.xml | 2 +- 3 files changed, 5 insertions(+), 18 deletions(-) diff --git a/scm/plugin.jelly b/scm/plugin.jelly index 9be43833..53007e02 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 01599cbc..f4ae3c4c 100644 --- a/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java +++ b/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java @@ -56,8 +56,6 @@ public class ScmBean private String tagBase; - private String excludes; - protected Embedder getEmbedder() throws Exception { @@ -194,10 +192,9 @@ public class ScmBean ScmRepository repository = getScmRepository( scmManager ); - // TODO: want includes? + // TODO: want includes/excludes? TagScmResult result = scmManager.getProviderByRepository( repository ) - .tag( repository, new ScmFileSet( new File( workingDirectory ), - null, getExcludes() ), tag ); + .tag( repository, new ScmFileSet( new File( workingDirectory ) ), tag ); checkResult( result ); } @@ -267,14 +264,4 @@ 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 65912e1f..93f75f2e 100644 --- a/scm/xdocs/changes.xml +++ b/scm/xdocs/changes.xml @@ -25,7 +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.