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/18 12:03:41 UTC
svn commit: r125480 - /maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly /maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
Author: brett
Date: Tue Jan 18 03:03:40 2005
New Revision: 125480
URL: http://svn.apache.org/viewcvs?view=rev&rev=125480
Log:
manually ignore allowed status changes
Modified:
maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly
maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
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=125480&p1=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r1=125479&p2=maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly&r2=125480
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/plugin.jelly Tue Jan 18 03:03:40 2005
@@ -193,7 +193,7 @@
description="Prepare for a release in SCM">
<ant:echo>Verifying no modifications are present</ant:echo>
- <scm:status var="scmStatusBean" url="${scmConnection}" workingDirectory="${basedir}" excludes="project.xml,xdocs/changes.xml" />
+ <scm:status var="scmStatusBean" url="${scmConnection}" workingDirectory="${basedir}" />
<j:set var="modifiedItems" value="${scmStatusBean.changedFiles}" />
<j:if test="${not empty modifiedItems}">
Modified: maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
Url: http://svn.apache.org/viewcvs/maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java?view=diff&rev=125480&p1=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java&r1=125479&p2=maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java&r2=125480
==============================================================================
--- maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java (original)
+++ maven/maven-1/plugins/branches/scm-1.5-branch/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java Tue Jan 18 03:03:40 2005
@@ -17,6 +17,7 @@
* ====================================================================
*/
+import org.apache.maven.scm.ScmFile;
import org.apache.maven.scm.ScmFileSet;
import org.apache.maven.scm.command.status.StatusScmResult;
import org.apache.maven.scm.manager.ScmManager;
@@ -24,6 +25,7 @@
import org.codehaus.plexus.embed.Embedder;
import java.io.File;
+import java.util.Iterator;
import java.util.List;
/**
@@ -31,7 +33,7 @@
*
* @author <a href="mailto:brett@apache.org">Brett Porter</a>
*/
-public class ScmStatusBean extends ScmPatternBean
+public class ScmStatusBean extends ScmBean
{
private List changedFiles;
@@ -42,11 +44,23 @@
ScmRepository repository = scmManager.makeScmRepository( getUrl() );
- StatusScmResult result = scmManager.status( repository, new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(), getExcludes() ) );
+ StatusScmResult result = scmManager.status( repository, new ScmFileSet( new File( getWorkingDirectory() ) ) );
checkResult( result );
changedFiles = result.getChangedFiles();
+
+ for ( Iterator i = changedFiles.iterator(); i.hasNext(); )
+ {
+ ScmFile f = (ScmFile) i.next();
+ if ( f.getPath().equals( "project.xml" ) ||
+ f.getPath().equals( "project.xml.backup" ) ||
+ f.getPath().equals( "xdocs/changes.xml" ) ||
+ f.getPath().equals( "xdocs/changes.xml.backup" ) )
+ {
+ i.remove();
+ }
+ }
}
public List getChangedFiles()
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org