diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
index 1768787a..47e86bcb 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmAddBean.java
@@ -17,19 +17,20 @@ package org.apache.maven.plugins.scm;
  * ====================================================================
  */
 
+import java.io.File;
+
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.add.AddScmResult;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.scm.ScmManager;
 
-import java.io.File;
-
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ScmAddBean extends ScmPatternBean
+public class ScmAddBean
+    extends ScmPatternBean
 {
     private String message;
 
@@ -40,7 +41,8 @@ public class ScmAddBean extends ScmPatternBean
 
         ScmRepository repository = getScmRepository( scmManager );
 
-        AddScmResult result = scmManager.add( repository,  new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(), getExcludes() ) );
+        AddScmResult result = scmManager.add( repository, new ScmFileSet( new File( getWorkingDirectory() ),
+                                                                          getIncludes(), getExcludes() ) );
         checkResult( result );
     }
 
@@ -55,4 +57,3 @@ public class ScmAddBean extends ScmPatternBean
     }
 
 }
-
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 5dc346be..5ca063a2 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmBean.java
@@ -17,22 +17,22 @@ package org.apache.maven.plugins.scm;
  * ====================================================================
  */
 
+import java.io.File;
+
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.ScmResult;
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
-import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
-import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.command.tag.TagScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.codehaus.plexus.embed.Embedder;
-import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.scm.ScmManager;
 import org.apache.maven.scm.log.DefaultLog;
+import org.apache.maven.scm.provider.starteam.repository.StarteamScmProviderRepository;
+import org.apache.maven.scm.provider.svn.repository.SvnScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
+import org.codehaus.plexus.embed.Embedder;
 import org.codehaus.plexus.scm.NoSuchScmProviderException;
-
-import java.io.File;
+import org.codehaus.plexus.scm.ScmManager;
+import org.codehaus.plexus.util.FileUtils;
 
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
@@ -94,7 +94,8 @@ public class ScmBean
         }
         checkoutDirectory.mkdirs();
 
-        CheckOutScmResult result = scmManager.checkOut( repository, new ScmFileSet( checkoutDirectory.getAbsoluteFile() ), tag );
+        CheckOutScmResult result = scmManager.checkOut( repository,
+                                                        new ScmFileSet( checkoutDirectory.getAbsoluteFile() ), tag );
 
         checkResult( result );
     }
@@ -121,10 +122,11 @@ public class ScmBean
                 svnRepo.setTagBase( tagBase );
             }
         }
-        
+
         if ( repository.getProvider().equals( "starteam" ) )
         {
-            StarteamScmProviderRepository starteamRepo = (StarteamScmProviderRepository) repository.getProviderRepository();
+            StarteamScmProviderRepository starteamRepo = (StarteamScmProviderRepository) repository
+                .getProviderRepository();
 
             if ( username != null && username.length() > 0 )
             {
@@ -135,7 +137,7 @@ public class ScmBean
                 starteamRepo.setPassword( password );
             }
         }
-        
+
         return repository;
     }
 
@@ -145,7 +147,7 @@ public class ScmBean
         Embedder embedder = getEmbedder();
         ScmManager scmManager = (ScmManager) embedder.lookup( ScmManager.ROLE );
         scmManager.addListener( new DefaultLog() );
-        
+
         return scmManager;
     }
 
@@ -257,4 +259,3 @@ public class ScmBean
     }
 
 }
-
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
index f0878aff..2d1f2a67 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmCheckinBean.java
@@ -17,19 +17,20 @@ package org.apache.maven.plugins.scm;
  * ====================================================================
  */
 
+import java.io.File;
+
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.checkin.CheckInScmResult;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.scm.ScmManager;
 
-import java.io.File;
-
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ScmCheckinBean extends ScmPatternBean
+public class ScmCheckinBean
+    extends ScmPatternBean
 {
     private String message;
 
@@ -57,4 +58,3 @@ public class ScmCheckinBean extends ScmPatternBean
     }
 
 }
-
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
index 44cb954b..5de306be 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmDiffBean.java
@@ -17,24 +17,26 @@ package org.apache.maven.plugins.scm;
  * ====================================================================
  */
 
+import java.io.File;
+
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.diff.DiffScmResult;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.codehaus.plexus.embed.Embedder;
-import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.scm.ScmManager;
-
-import java.io.File;
+import org.codehaus.plexus.util.FileUtils;
 
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ScmDiffBean extends ScmPatternBean
+public class ScmDiffBean
+    extends ScmPatternBean
 {
     private String patchFile;
+
     private String startRevision;
+
     private String endRevision;
 
     public void diff()
@@ -61,23 +63,23 @@ public class ScmDiffBean extends ScmPatternBean
         return patchFile;
     }
 
-	public String getStartRevision()
-	{
-		return startRevision;
-	}
+    public String getStartRevision()
+    {
+        return startRevision;
+    }
 
-	public void setStartRevision(String startRevision)
-	{
-		this.startRevision = startRevision;
-	}
+    public void setStartRevision( String startRevision )
+    {
+        this.startRevision = startRevision;
+    }
 
-	public String getEndRevision()
-	{
-		return endRevision;
-	}
+    public String getEndRevision()
+    {
+        return endRevision;
+    }
 
-	public void setEndRevision(String endRevision)
-	{
-		this.endRevision = endRevision;
-	}
+    public void setEndRevision( String endRevision )
+    {
+        this.endRevision = endRevision;
+    }
 }
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java
index 673f4cf0..69c4d5f3 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmPatternBean.java
@@ -22,7 +22,8 @@ package org.apache.maven.plugins.scm;
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ScmPatternBean extends ScmBean
+public class ScmPatternBean
+    extends ScmBean
 {
     private String includes;
 
@@ -48,4 +49,3 @@ public class ScmPatternBean extends ScmBean
         return excludes;
     }
 }
-
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
index 9016d7c5..dee16234 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmStatusBean.java
@@ -17,22 +17,23 @@ package org.apache.maven.plugins.scm;
  * ====================================================================
  */
 
+import java.io.File;
+import java.util.Iterator;
+import java.util.List;
+
 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.repository.ScmRepository;
 import org.codehaus.plexus.scm.ScmManager;
 
-import java.io.File;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ScmStatusBean extends ScmBean
+public class ScmStatusBean
+    extends ScmBean
 {
     private List changedFiles;
 
@@ -52,10 +53,8 @@ public class ScmStatusBean extends ScmBean
         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" ) )
+            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();
             }
@@ -67,4 +66,3 @@ public class ScmStatusBean extends ScmBean
         return changedFiles;
     }
 }
-
diff --git a/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java b/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
index 2aa1da07..b0789ee2 100644
--- a/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
+++ b/scm/src/main/org/apache/maven/plugins/scm/ScmUpdateBean.java
@@ -17,19 +17,20 @@ package org.apache.maven.plugins.scm;
  * ====================================================================
  */
 
+import java.io.File;
+
 import org.apache.maven.scm.ScmFileSet;
 import org.apache.maven.scm.command.update.UpdateScmResult;
 import org.apache.maven.scm.repository.ScmRepository;
 import org.codehaus.plexus.scm.ScmManager;
 
-import java.io.File;
-
 /**
  * A bean for using the Maven SCM API because wrangling objects in Jelly is no fun.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ScmUpdateBean extends ScmPatternBean
+public class ScmUpdateBean
+    extends ScmPatternBean
 {
     private String message;
 
@@ -40,11 +41,10 @@ public class ScmUpdateBean extends ScmPatternBean
 
         ScmRepository repository = getScmRepository( scmManager );
 
-        UpdateScmResult result = scmManager.update( repository, 
-                                                    new ScmFileSet( new File( getWorkingDirectory() ), getIncludes(), getExcludes() ),
+        UpdateScmResult result = scmManager.update( repository, new ScmFileSet( new File( getWorkingDirectory() ),
+                                                                                getIncludes(), getExcludes() ),
                                                     getTag() );
         checkResult( result );
     }
 
 }
-