Reformatted to code style, modernized code

git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517983 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/it/minimal-pom-output-encoding/pom.xml b/src/it/minimal-pom-output-encoding/pom.xml
index 2faecd9..35dc542 100644
--- a/src/it/minimal-pom-output-encoding/pom.xml
+++ b/src/it/minimal-pom-output-encoding/pom.xml
@@ -32,7 +32,8 @@
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</developerConnection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/
+    </developerConnection>
     <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/</url>
   </scm>
 
diff --git a/src/it/minimal-pom/pom.xml b/src/it/minimal-pom/pom.xml
index 71901ce..459ef9e 100644
--- a/src/it/minimal-pom/pom.xml
+++ b/src/it/minimal-pom/pom.xml
@@ -32,7 +32,8 @@
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</developerConnection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/
+    </developerConnection>
     <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/</url>
   </scm>
 
diff --git a/src/it/project-reporting-output-encoding/pom.xml b/src/it/project-reporting-output-encoding/pom.xml
index c3bb94c..4625ccf 100644
--- a/src/it/project-reporting-output-encoding/pom.xml
+++ b/src/it/project-reporting-output-encoding/pom.xml
@@ -32,7 +32,8 @@
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</developerConnection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/
+    </developerConnection>
     <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/</url>
   </scm>
 
diff --git a/src/it/with-svnjava-maven-2.x/pom.xml b/src/it/with-svnjava-maven-2.x/pom.xml
index 045798d..c6c7705 100644
--- a/src/it/with-svnjava-maven-2.x/pom.xml
+++ b/src/it/with-svnjava-maven-2.x/pom.xml
@@ -32,7 +32,8 @@
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</developerConnection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/
+    </developerConnection>
     <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/</url>
   </scm>
 
diff --git a/src/it/with-svnjava-maven-2.x/verify.groovy b/src/it/with-svnjava-maven-2.x/verify.groovy
index 268098f..245d506 100644
--- a/src/it/with-svnjava-maven-2.x/verify.groovy
+++ b/src/it/with-svnjava-maven-2.x/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/it/with-svnjava-maven-3/pom.xml b/src/it/with-svnjava-maven-3/pom.xml
index 133b8e4..2d09c9c 100644
--- a/src/it/with-svnjava-maven-3/pom.xml
+++ b/src/it/with-svnjava-maven-3/pom.xml
@@ -32,7 +32,8 @@
 
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/</developerConnection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-changelog-plugin/
+    </developerConnection>
     <url>http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changelog-plugin/</url>
   </scm>
 
diff --git a/src/it/with-svnjava-maven-3/verify.groovy b/src/it/with-svnjava-maven-3/verify.groovy
index 268098f..245d506 100644
--- a/src/it/with-svnjava-maven-3/verify.groovy
+++ b/src/it/with-svnjava-maven-3/verify.groovy
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
index 3ba76b1..269f9c2 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLog.java
@@ -19,6 +19,13 @@
  * under the License.
  */
 
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
@@ -26,14 +33,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.apache.maven.scm.command.changelog.ChangeLogSet;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
 /**
  * Change log task. It uses a ChangeLogGenerator and ChangeLogParser to create
  * a Collection of ChangeLogEntry objects, which are used to produce an XML
diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
index 7c0a6f0..2026106 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogHandler.java
@@ -34,6 +34,7 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.TimeZone;
+import java.util.regex.Pattern;
 
 /**
  * Change log generated xml parser.  SAXParser listener for processing a previously generated xml into several
@@ -47,6 +48,7 @@
     // Use the same time zone offset when reading and adding times
     // It doesn't matter which one we use, as long we always use the same one
     private static final String TIMEZONE_STRING = "GMT-00:00";
+
     private static final TimeZone TIMEZONE = TimeZone.getTimeZone( TIMEZONE_STRING );
 
     private Collection<ChangeLogSet> changeSets;
@@ -63,6 +65,8 @@
 
     private String currentPattern;
 
+    private final Pattern nameRegex = Pattern.compile( " \\(from [^:]+:\\d+\\)" );
+
     /**
      * contructor
      *
@@ -73,14 +77,18 @@
         this.changeSets = changeSets;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void characters( char[] ch, int start, int length )
         throws SAXException
     {
         bufData += new String( ch, start, length );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void endElement( String uri, String localName, String qName )
         throws SAXException
     {
@@ -127,8 +135,8 @@
                 // MCHANGELOG-68 Adjust for time zone when parsing the time
                 simpleDateFormat.setTimeZone( TIMEZONE );
                 // Adjust for time zone when adding up the milliseconds
-                bufEntry.setDate( new Date( ms + simpleDateFormat.parse( bufData ).getTime()
-                    + TIMEZONE.getRawOffset() ) );
+                bufEntry.setDate(
+                    new Date( ms + simpleDateFormat.parse( bufData ).getTime() + TIMEZONE.getRawOffset() ) );
             }
             catch ( ParseException e )
             {
@@ -150,11 +158,13 @@
         }
         else if ( "name".equals( qName ) )
         {
-            bufFile.setName( bufData.replaceFirst( " \\(from [^:]+:\\d+\\)", "" ) );
+            bufFile.setName( nameRegex.matcher( bufData ).replaceFirst( "" ) );
         }
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void startElement( String uri, String localName, String qName, Attributes attributes )
         throws SAXException
     {
diff --git a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
index 20bd3fe..423691d 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/ChangeLogReport.java
@@ -84,6 +84,7 @@
  *
  * @version $Id$
  */
+@SuppressWarnings( "ALL" )
 @Mojo( name = "changelog" )
 public class ChangeLogReport
     extends AbstractMavenReport
@@ -235,19 +236,21 @@
      *
      * @since 2.3
      */
-    @Parameter( property = "encodeFileUri", defaultValue = "false")
+    @Parameter( property = "encodeFileUri", defaultValue = "false" )
     protected boolean encodeFileUri;
 
     /**
      * List of files to include. Specified as fileset patterns of files to include in the report
+     *
      * @since 2.3
      */
     @Parameter
     private String[] includes;
 
     /**
-     *  List of files to include. Specified as fileset patterns of files to omit in the report
-     *  @since 2.3
+     * List of files to include. Specified as fileset patterns of files to omit in the report
+     *
+     * @since 2.3
      */
     @Parameter
     private String[] excludes;
@@ -317,6 +320,7 @@
      * value is a JIRA-style issue identification pattern.
      * <p/>
      * <strong>Note:</strong> Default value is [a-zA-Z]{2,}-\d+
+     *
      * @since 2.2
      */
     @Parameter( property = "issueIDRegexPattern", defaultValue = DEFAULT_ISSUE_ID_REGEX_PATTERN, required = true )
@@ -418,7 +422,11 @@
     @Parameter
     private Properties systemProperties;
 
-    /** {@inheritDoc} */
+    private final Pattern sinkFileNamePattern = Pattern.compile( "\\\\" );
+
+    /**
+     * {@inheritDoc}
+     */
     public void executeReport( Locale locale )
         throws MavenReportException
     {
@@ -436,12 +444,13 @@
             {
                 String providerType = entry.getKey();
                 String providerImplementation = entry.getValue();
-                getLog().info( "Change the default '" + providerType + "' provider implementation to '"
-                                   + providerImplementation + "'." );
+                getLog().info(
+                    "Change the default '" + providerType + "' provider implementation to '" + providerImplementation
+                        + "'." );
                 manager.setScmProviderImplementation( providerType, providerImplementation );
             }
         }
-        
+
         initializeDefaultConfigurationParameters();
 
         initializeDeveloperMaps();
@@ -461,7 +470,7 @@
 
                 System.setProperty( key, value );
 
-                getLog().debug( "Setting system property: " + key + "=" + value );
+                getLog().debug( "Setting system property: " + key + '=' + value );
             }
         }
 
@@ -527,7 +536,8 @@
 
                     getLog().info( "Using existing changelog.xml..." );
 
-                    changelogList = ChangeLog.loadChangedSets( ReaderFactory.newReader( outputXML, getOutputEncoding() ) );
+                    changelogList =
+                        ChangeLog.loadChangedSets( ReaderFactory.newReader( outputXML, getOutputEncoding() ) );
                 }
                 catch ( FileNotFoundException e )
                 {
@@ -606,7 +616,8 @@
         //pw.flush();
         //pw.close();
         // MCHANGELOG-86
-        Writer writer = WriterFactory.newWriter( new BufferedOutputStream( new FileOutputStream( outputXML ) ), getOutputEncoding() );
+        Writer writer = WriterFactory.newWriter( new BufferedOutputStream( new FileOutputStream( outputXML ) ),
+                                                 getOutputEncoding() );
         writer.write( changelogXml.toString() );
         writer.flush();
         writer.close();
@@ -715,7 +726,7 @@
             {
                 throw new MavenReportException( "The type '" + type + "' isn't supported." );
             }
-            filter(changeSets);
+            filter( changeSets );
             return changeSets;
 
         }
@@ -732,82 +743,96 @@
     /**
      * filters out unwanted files from the changesets
      */
-    private void filter(List<ChangeLogSet> changeSets)
+    private void filter( List<ChangeLogSet> changeSets )
     {
-        List<Pattern> include = compilePatterns(includes);
-        List<Pattern> exclude = compilePatterns(excludes);
-        if(includes==null && excludes==null)
+        List<Pattern> include = compilePatterns( includes );
+        List<Pattern> exclude = compilePatterns( excludes );
+        if ( includes == null && excludes == null )
+        {
             return;
-        for (ChangeLogSet changeLogSet : changeSets)
+        }
+        for ( ChangeLogSet changeLogSet : changeSets )
         {
             List<ChangeSet> set = changeLogSet.getChangeSets();
-            filter(set, include, exclude);
+            filter( set, include, exclude );
         }
 
     }
 
-    private List<Pattern> compilePatterns(String[] patternArray)
+    private List<Pattern> compilePatterns( String[] patternArray )
     {
-        if(patternArray==null)
+        if ( patternArray == null )
+        {
             return new ArrayList<Pattern>();
-        List<Pattern> patterns = new ArrayList<Pattern>(patternArray.length);
-        for (String string : patternArray)
+        }
+        List<Pattern> patterns = new ArrayList<Pattern>( patternArray.length );
+        for ( String string : patternArray )
         {
             //replaces * with [/\]* (everything but file seperators)
             //replaces ** with .*
             //quotes the rest of the string
             string = "\\Q" + string + "\\E";
-            string = string.replace("**", "\\E.?REPLACEMENT?\\Q");
-            string = string.replace("*", "\\E[^/\\\\]?REPLACEMENT?\\Q");
-            string = string.replace("?REPLACEMENT?", "*");
-            string = string.replace("\\Q\\E", "");
-            patterns.add(Pattern.compile(string));
+            string = string.replace( "**", "\\E.?REPLACEMENT?\\Q" );
+            string = string.replace( "*", "\\E[^/\\\\]?REPLACEMENT?\\Q" );
+            string = string.replace( "?REPLACEMENT?", "*" );
+            string = string.replace( "\\Q\\E", "" );
+            patterns.add( Pattern.compile( string ) );
         }
         return patterns;
     }
 
-    private void filter(List<ChangeSet> sets, List<Pattern> includes, List<Pattern> excludes)
+    private void filter( List<ChangeSet> sets, List<Pattern> includes, List<Pattern> excludes )
     {
         Iterator<ChangeSet> it = sets.iterator();
-        while (it.hasNext())
+        while ( it.hasNext() )
         {
             ChangeSet changeSet = it.next();
             List<ChangeFile> files = changeSet.getFiles();
             Iterator<ChangeFile> iterator = files.iterator();
-            while (iterator.hasNext())
+            while ( iterator.hasNext() )
             {
                 ChangeFile changeFile = iterator.next();
                 String name = changeFile.getName();
-                if(!isIncluded(includes,name) || isExcluded(excludes, name))
+                if ( !isIncluded( includes, name ) || isExcluded( excludes, name ) )
                 {
                     iterator.remove();
                 }
             }
-            if(files.isEmpty())
+            if ( files.isEmpty() )
+            {
                 it.remove();
+            }
         }
     }
 
-    private boolean isExcluded(List<Pattern> excludes, String name)
+    private boolean isExcluded( List<Pattern> excludes, String name )
     {
-        if(excludes==null || excludes.isEmpty())
-            return false;
-        for (Pattern pattern : excludes)
+        if ( excludes == null || excludes.isEmpty() )
         {
-            if(pattern.matcher(name).matches())
+            return false;
+        }
+        for ( Pattern pattern : excludes )
+        {
+            if ( pattern.matcher( name ).matches() )
+            {
                 return true;
+            }
         }
         return false;
     }
 
-    private boolean isIncluded(List<Pattern> includes, String name)
+    private boolean isIncluded( List<Pattern> includes, String name )
     {
-        if(includes==null || includes.isEmpty())
-            return true;
-        for (Pattern pattern : includes)
+        if ( includes == null || includes.isEmpty() )
         {
-            if(pattern.matcher(name).matches())
+            return true;
+        }
+        for ( Pattern pattern : includes )
+        {
+            if ( pattern.matcher( name ).matches() )
+            {
                 return true;
+            }
         }
         return false;
     }
@@ -1020,9 +1045,8 @@
         {
             if ( dates == null )
             {
-                throw new MavenReportException(
-                    "The dates parameter is required when type=\"date\"."
-                    + " The value should be the absolute date for the start of the log." );
+                throw new MavenReportException( "The dates parameter is required when type=\"date\"."
+                                                    + " The value should be the absolute date for the start of the log." );
             }
         }
         else if ( "tag".equals( type ) )
@@ -1035,7 +1059,7 @@
         else
         {
             throw new MavenReportException( "The type parameter has an invalid value: " + type
-                + ".  The value should be \"range\", \"date\", or \"tag\"." );
+                                                + ".  The value should be \"range\", \"date\", or \"tag\"." );
         }
     }
 
@@ -1165,36 +1189,37 @@
                 sink.text( bundle.getString( "report.SetTagCreation" ) );
                 if ( set.getEndVersion() != null && set.getEndVersion().getName() != null )
                 {
-                    sink.text( " " + bundle.getString( "report.SetTagUntil" ) + " '" + set.getEndVersion() + "'" );
+                    sink.text( ' ' + bundle.getString( "report.SetTagUntil" ) + " '" + set.getEndVersion() + '\'' );
                 }
             }
             else if ( set.getEndVersion() == null || set.getEndVersion().getName() == null )
             {
                 sink.text( bundle.getString( "report.SetTagSince" ) );
-                sink.text( " '" + set.getStartVersion() + "'" );
+                sink.text( " '" + set.getStartVersion() + '\'' );
             }
             else
             {
                 sink.text( bundle.getString( "report.SetTagBetween" ) );
-                sink.text( " '" + set.getStartVersion() + "' " + bundle.getString( "report.And" ) + " '"
-                    + set.getEndVersion() + "'" );
+                sink.text(
+                    " '" + set.getStartVersion() + "' " + bundle.getString( "report.And" ) + " '" + set.getEndVersion()
+                        + '\'' );
             }
         }
-        else  if ( set.getStartDate() == null )
+        else if ( set.getStartDate() == null )
         {
             sink.text( bundle.getString( "report.SetRangeUnknown" ) );
         }
         else if ( set.getEndDate() == null )
         {
             sink.text( bundle.getString( "report.SetRangeSince" ) );
-            sink.text( " " + headingDateFormater.format( set.getStartDate() ) );
+            sink.text( ' ' + headingDateFormater.format( set.getStartDate() ) );
         }
         else
         {
             sink.text( bundle.getString( "report.SetRangeBetween" ) );
-            sink.text( " " + headingDateFormater.format( set.getStartDate() )
-                + " " + bundle.getString( "report.And" ) + " "
-                + headingDateFormater.format( set.getEndDate() ) );
+            sink.text(
+                ' ' + headingDateFormater.format( set.getStartDate() ) + ' ' + bundle.getString( "report.And" ) + ' '
+                    + headingDateFormater.format( set.getEndDate() ) );
         }
         sink.sectionTitle2_();
     }
@@ -1298,7 +1323,7 @@
 
         for ( ChangeSet entry : sortedEntries )
         {
-            doChangedSetDetail( entry, bundle, sink );
+            doChangedSetDetail( entry, sink );
         }
 
         sink.table_();
@@ -1307,16 +1332,15 @@
     /**
      * reports on the details of an SCM entry log
      *
-     * @param entry  an SCM entry to generate the report from
-     * @param bundle the resource bundle to retrieve report phrases from
-     * @param sink   the report formatting tool
+     * @param entry an SCM entry to generate the report from
+     * @param sink  the report formatting tool
      */
-    private void doChangedSetDetail( ChangeSet entry, ResourceBundle bundle, Sink sink )
+    private void doChangedSetDetail( ChangeSet entry, Sink sink )
     {
         sink.tableRow();
 
         sink.tableCell();
-        sink.text( entry.getDateFormatted() + " " + entry.getTimeFormatted() );
+        sink.text( entry.getDateFormatted() + ' ' + entry.getTimeFormatted() );
         sink.tableCell_();
 
         sink.tableCell();
@@ -1334,8 +1358,8 @@
         String line;
         try
         {
-            if ( ( issueIDRegexPattern != null && issueIDRegexPattern.length() > 0 )
-                && ( issueLinkUrl != null && issueLinkUrl.length() > 0 ) )
+            if ( ( issueIDRegexPattern != null && issueIDRegexPattern.length() > 0 ) && ( issueLinkUrl != null
+                && issueLinkUrl.length() > 0 ) )
             {
                 Pattern pattern = Pattern.compile( issueIDRegexPattern );
 
@@ -1414,7 +1438,7 @@
                 }
                 else
                 {
-                    link = issueLinkUrl + "/";
+                    link = issueLinkUrl + '/';
                 }
 
                 link += match;
@@ -1441,7 +1465,7 @@
      * link to the team members report, or alternatively, if the supplied
      * author is unknown, outputs the author's name as plain text.
      *
-     * @param sink Sink to use for outputting
+     * @param sink   Sink to use for outputting
      * @param author The author's name.
      */
     protected void sinkAuthorDetails( Sink sink, String author )
@@ -1482,9 +1506,9 @@
                 {
                     String rptTmpMultiRepoParam = scmUrl.substring( rptRepository.length() );
 
-                    rptOneRepoParam = "?" + rptTmpMultiRepoParam.substring( 1 );
+                    rptOneRepoParam = '?' + rptTmpMultiRepoParam.substring( 1 );
 
-                    rptMultiRepoParam = "&" + rptTmpMultiRepoParam.substring( 1 );
+                    rptMultiRepoParam = '&' + rptTmpMultiRepoParam.substring( 1 );
                 }
             }
             else
@@ -1576,13 +1600,13 @@
             if ( !linkFile.equals( scmUrl ) )
             {
                 String linkName = name;
-                if(encodeFileUri)
+                if ( encodeFileUri )
                 {
                     try
                     {
-                        linkName = URLEncoder.encode(linkName, "UTF-8");
+                        linkName = URLEncoder.encode( linkName, "UTF-8" );
                     }
-                    catch (UnsupportedEncodingException e)
+                    catch ( UnsupportedEncodingException e )
                     {
                         // UTF-8 is always supported
                     }
@@ -1599,12 +1623,12 @@
                     // This is here so that we are backwards compatible with the
                     // format used before the special token was introduced
 
-                    linkFile = linkFile + linkName;
+                    linkFile += linkName;
                 }
 
                 // Use the given URL to create links to the files
 
-                if (  revision != null && linkFile.indexOf( REV_TOKEN ) > 0 )
+                if ( revision != null && linkFile.indexOf( REV_TOKEN ) > 0 )
                 {
                     linkFile = linkFile.replaceAll( REV_TOKEN, revision );
                 }
@@ -1625,7 +1649,8 @@
             }
             else if ( connection.indexOf( "cvsmonitor.pl" ) > 0 )
             {
-                String module = rptOneRepoParam.replaceAll( "^.*(&amp;module=.*?(?:&amp;|$)).*$", "$1" );
+                Pattern cvsMonitorRegex = Pattern.compile( "^.*(&amp;module=.*?(?:&amp;|$)).*$" );
+                String module = cvsMonitorRegex.matcher( rptOneRepoParam ).replaceAll( "$1" );
                 linkFile = displayFileDetailUrl + "?cmd=viewBrowseFile" + module + "&file=" + name;
                 if ( revision != null )
                 {
@@ -1689,7 +1714,7 @@
      */
     private void sinkFileName( String name, Sink sink )
     {
-        name = name.replaceAll( "\\\\", "/" );
+        name = sinkFileNamePattern.matcher( name ).replaceAll( "/" );
         int pos = name.lastIndexOf( '/' );
 
         String head;
@@ -1701,7 +1726,7 @@
         }
         else
         {
-            head = name.substring( 0, pos ) + "/";
+            head = name.substring( 0, pos ) + '/';
             tail = name.substring( pos + 1 );
         }
 
@@ -1721,9 +1746,11 @@
     {
         String absPath = "";
 
-        StringTokenizer baseTokens = new StringTokenizer( base.replaceAll( "\\\\", "/" ), "/", true );
+        StringTokenizer baseTokens =
+            new StringTokenizer( sinkFileNamePattern.matcher( base ).replaceAll( "/" ), "/", true );
 
-        StringTokenizer targetTokens = new StringTokenizer( target.replaceAll( "\\\\", "/" ), "/" );
+        StringTokenizer targetTokens =
+            new StringTokenizer( sinkFileNamePattern.matcher( target ).replaceAll( "/" ), "/" );
 
         String targetRoot = targetTokens.nextToken();
 
@@ -1753,13 +1780,17 @@
         return absPath + newTarget;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected MavenProject getProject()
     {
         return project;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected String getOutputDirectory()
     {
         if ( !outputDirectory.isAbsolute() )
@@ -1780,25 +1811,33 @@
         return ( outputEncoding != null ) ? outputEncoding : ReaderFactory.UTF_8;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected Renderer getSiteRenderer()
     {
         return siteRenderer;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getDescription( Locale locale )
     {
         return getBundle( locale ).getString( "report.changelog.description" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getName( Locale locale )
     {
         return getBundle( locale ).getString( "report.changelog.name" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getOutputName()
     {
         return "changelog";
@@ -1813,7 +1852,9 @@
         return ResourceBundle.getBundle( "scm-activity", locale, this.getClass().getClassLoader() );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public boolean canGenerateReport()
     {
         if ( offline && !outputXML.exists() )
@@ -1821,11 +1862,7 @@
             return false;
         }
 
-        if ( skip )
-        {
-            return false;
-        }
+        return !skip;
 
-        return true;
     }
 }
diff --git a/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java b/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
index a22a591..47f4502 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/DeveloperActivityReport.java
@@ -38,7 +38,7 @@
  *
  * @version $Id$
  */
-@Mojo( name = "dev-activity" )
+@Mojo(name = "dev-activity")
 public class DeveloperActivityReport
     extends ChangeLogReport
 {
@@ -49,25 +49,33 @@
 
     private Map<String, Map<String, ChangeFile>> files;
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getDescription( Locale locale )
     {
         return getBundle( locale ).getString( "report.dev-activity.description" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getName( Locale locale )
     {
         return getBundle( locale ).getString( "report.dev-activity.name" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getOutputName()
     {
         return "dev-activity";
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void doGenerateEmptyReport( ResourceBundle bundle, Sink sink )
     {
         sink.head();
@@ -94,7 +102,9 @@
         sink.close();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void doGenerateReport( List<ChangeLogSet> changeLogSets, ResourceBundle bundle, Sink sink )
     {
         sink.head();
@@ -175,7 +185,7 @@
     {
         initDeveloperDetails( set );
 
-        for( Map.Entry<String, List<ChangeSet>> commit : commits.entrySet() )
+        for ( Map.Entry<String, List<ChangeSet>> commit : commits.entrySet() )
         {
             String author = commit.getKey();
 
diff --git a/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java b/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
index b1b930b..7158660 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/FileActivityComparator.java
@@ -116,7 +116,7 @@
 
         for ( ChangeFile file : list )
         {
-            if ( StringUtils.isNotBlank( latest) )
+            if ( StringUtils.isNotBlank( latest ) )
             {
                 latest = file.getRevision();
             }
diff --git a/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java b/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
index 8949d96..705130a 100644
--- a/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
+++ b/src/main/java/org/apache/maven/plugin/changelog/FileActivityReport.java
@@ -39,29 +39,37 @@
  *
  * @version $Id$
  */
-@Mojo( name = "file-activity" )
+@Mojo(name = "file-activity")
 public class FileActivityReport
     extends ChangeLogReport
 {
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getDescription( Locale locale )
     {
         return getBundle( locale ).getString( "report.file-activity.description" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getName( Locale locale )
     {
         return getBundle( locale ).getString( "report.file-activity.name" );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getOutputName()
     {
         return "file-activity";
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void doGenerateEmptyReport( ResourceBundle bundle, Sink sink )
     {
         sink.head();
@@ -88,7 +96,9 @@
         sink.close();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void doGenerateReport( List<ChangeLogSet> changeLogSets, ResourceBundle bundle, Sink sink )
     {
         sink.head();
diff --git a/src/site/site.xml b/src/site/site.xml
index ae9397c..5233bde 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -20,8 +20,8 @@
 -->
 
 <project xmlns="http://maven.apache.org/DECORATION/1.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/DECORATION/1.0.0 http://maven.apache.org/xsd/decoration-1.0.0.xsd">
   <body>
     <menu name="Overview">
       <item name="Introduction" href="index.html"/>
diff --git a/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java b/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java
index 6a6800b..482c658 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/AbstractChangeLogReportTest.java
@@ -19,10 +19,6 @@
  * under the License.
  */
 
-import java.io.File;
-import java.io.IOException;
-import java.io.Writer;
-
 import org.apache.maven.doxia.site.decoration.DecorationModel;
 import org.apache.maven.doxia.siterenderer.RendererException;
 import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
@@ -31,6 +27,10 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.WriterFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+
 /**
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @version $Id$
@@ -42,10 +42,10 @@
     /**
      * Renderer the sink from the report mojo.
      *
-     * @param mojo not null
+     * @param mojo       not null
      * @param outputHtml not null
      * @throws RendererException if any
-     * @throws IOException if any
+     * @throws IOException       if any
      */
     protected void renderer( ChangeLogReport mojo, File outputHtml )
         throws RendererException, IOException
@@ -60,8 +60,7 @@
             outputHtml.getParentFile().mkdirs();
             writer = WriterFactory.newXmlWriter( outputHtml );
 
-            mojo.getSiteRenderer().generateDocument( writer, (SiteRendererSink) mojo.getSink(),
-                                                           context );
+            mojo.getSiteRenderer().generateDocument( writer, (SiteRendererSink) mojo.getSink(), context );
         }
         finally
         {
diff --git a/src/test/java/org/apache/maven/plugin/changelog/ChangeLogReportTest.java b/src/test/java/org/apache/maven/plugin/changelog/ChangeLogReportTest.java
index 923e04a..1676a5c 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/ChangeLogReportTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/ChangeLogReportTest.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import org.apache.maven.plugin.changelog.stubs.ScmManagerStub;
-import org.apache.maven.plugin.changelog.stubs.FailedScmManagerStub;
-import org.apache.maven.plugin.changelog.stubs.ScmManagerWithHostStub;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.changelog.stubs.FailedScmManagerStub;
+import org.apache.maven.plugin.changelog.stubs.ScmManagerStub;
+import org.apache.maven.plugin.changelog.stubs.ScmManagerWithHostStub;
 import org.apache.maven.scm.manager.ScmManager;
 import org.codehaus.plexus.util.FileUtils;
 
@@ -37,7 +37,9 @@
 {
     private ScmManager scmManager;
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void setUp()
         throws Exception
     {
@@ -46,7 +48,9 @@
         scmManager = new ScmManagerStub();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void tearDown()
         throws Exception
     {
@@ -60,7 +64,7 @@
     {
         File pluginXmlFile = new File( getBasedir(), "src/test/plugin-configs/changelog/no-source-plugin-config.xml" );
 
-        ChangeLogReport mojo = (ChangeLogReport)lookupMojo( "changelog", pluginXmlFile );
+        ChangeLogReport mojo = (ChangeLogReport) lookupMojo( "changelog", pluginXmlFile );
 
         assertNotNull( "Mojo found.", mojo );
 
@@ -120,7 +124,8 @@
         }
         catch ( MojoExecutionException e )
         {
-            assertTrue( "Test thrown exception", e.getCause().getMessage().startsWith( "The type parameter has an invalid value: invalid." ) );
+            assertTrue( "Test thrown exception",
+                        e.getCause().getMessage().startsWith( "The type parameter has an invalid value: invalid." ) );
         }
     }
 
@@ -146,7 +151,7 @@
         catch ( MojoExecutionException e )
         {
             assertTrue( "Test thrown exception",
-                        e.getCause().getCause().getMessage().startsWith( "Please use this date pattern: ") );
+                        e.getCause().getCause().getMessage().startsWith( "Please use this date pattern: " ) );
         }
     }
 
@@ -197,7 +202,7 @@
     {
         File pluginXmlFile = new File( getBasedir(), "src/test/plugin-configs/changelog/" + pluginXml );
 
-        ChangeLogReport mojo = (ChangeLogReport)lookupMojo( "changelog", pluginXmlFile );
+        ChangeLogReport mojo = (ChangeLogReport) lookupMojo( "changelog", pluginXmlFile );
 
         assertNotNull( "Mojo found.", mojo );
 
@@ -214,7 +219,7 @@
         String changelogXml = FileUtils.fileRead( outputXML );
 
         assertTrue( "Test for xml header", changelogXml.startsWith( "<?xml version=\"1.0\" encoding=\"" +
-                    encoding + "\"?>" ) );
+                                                                        encoding + "\"?>" ) );
 
         assertTrue( "Test for xml footer", changelogXml.endsWith( "</changelog>" ) );
 
diff --git a/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java b/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
index d4866d0..d069363 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/ChangeLogTest.java
@@ -19,18 +19,17 @@
  * under the License.
  */
 
+import junit.framework.TestCase;
+import org.apache.maven.scm.ChangeFile;
+import org.apache.maven.scm.ChangeSet;
+import org.apache.maven.scm.command.changelog.ChangeLogSet;
+
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.text.SimpleDateFormat;
 import java.util.List;
 
-import junit.framework.TestCase;
-
-import org.apache.maven.scm.ChangeFile;
-import org.apache.maven.scm.ChangeSet;
-import org.apache.maven.scm.command.changelog.ChangeLogSet;
-
 /**
  * @author Edwin Punzalan
  * @version $Id$
@@ -53,7 +52,8 @@
 
         ChangeSet changeSet = changelogSets.getChangeSets().get( 0 );
 
-        assertEquals( "Test changelog 1 set 1 date/time", "1977-08-06 05:30:00", new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
+        assertEquals( "Test changelog 1 set 1 date/time", "1977-08-06 05:30:00",
+                      new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
 
         assertEquals( "Test changelog 1 set 1 author", "Edwin Punzalan", changeSet.getAuthor() );
 
@@ -67,10 +67,10 @@
 
         assertEquals( "Test changelog 1 set 1 file 1 revision", "1", changeFile.getRevision() );
 
-
         changeSet = changelogSets.getChangeSets().get( 1 );
 
-        assertEquals( "Test changelog 1 set 2 date/time", "2005-02-24 21:30:00", new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
+        assertEquals( "Test changelog 1 set 2 date/time", "2005-02-24 21:30:00",
+                      new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
 
         assertEquals( "Test changelog 1 set 2 author", "Edwin Punzalan", changeSet.getAuthor() );
 
@@ -90,15 +90,14 @@
 
         assertEquals( "Test changelog 1 set 2 file 2 revision", "2", changeFile.getRevision() );
 
-
-
         changelogSets = changedLogs.get( 1 );
 
         assertEquals( "Test number of revisions on changelog 2", 2, changelogSets.getChangeSets().size() );
 
         changeSet = changelogSets.getChangeSets().get( 0 );
 
-        assertEquals( "Test changelog 2 set 1 date/time", "2005-02-25 22:45:00", new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
+        assertEquals( "Test changelog 2 set 1 date/time", "2005-02-25 22:45:00",
+                      new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
 
         assertEquals( "Test changelog 2 set 1 author", "Keogh Edrich Punzalan", changeSet.getAuthor() );
 
@@ -112,10 +111,10 @@
 
         assertEquals( "Test changelog 2 set 1 file 1 revision", "3", changeFile.getRevision() );
 
-
         changeSet = changelogSets.getChangeSets().get( 1 );
 
-        assertEquals( "Test changelog 2 set 2 date/time", "2100-02-25 05:30:00", new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
+        assertEquals( "Test changelog 2 set 2 date/time", "2100-02-25 05:30:00",
+                      new SimpleDateFormat( "yyyy-MM-dd HH:mm:ss" ).format( changeSet.getDate() ) );
 
         assertEquals( "Test changelog 2 set 2 author", "Keogh Edrich Punzalan", changeSet.getAuthor() );
 
diff --git a/src/test/java/org/apache/maven/plugin/changelog/DeveloperActivityReportTest.java b/src/test/java/org/apache/maven/plugin/changelog/DeveloperActivityReportTest.java
index b524b83..854427c 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/DeveloperActivityReportTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/DeveloperActivityReportTest.java
@@ -34,7 +34,9 @@
 {
     private ScmManager scmManager;
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void setUp()
         throws Exception
     {
@@ -43,7 +45,9 @@
         scmManager = new ScmManagerStub();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void tearDown()
         throws Exception
     {
@@ -55,8 +59,8 @@
     public void testNoSource()
         throws Exception
     {
-        File pluginXmlFile = new File( getBasedir(),
-                                       "src/test/plugin-configs/dev-activity/no-source-plugin-config.xml" );
+        File pluginXmlFile =
+            new File( getBasedir(), "src/test/plugin-configs/dev-activity/no-source-plugin-config.xml" );
 
         DeveloperActivityReport mojo = (DeveloperActivityReport) lookupMojo( "dev-activity", pluginXmlFile );
 
@@ -93,7 +97,7 @@
     {
         File pluginXmlFile = new File( getBasedir(), "src/test/plugin-configs/dev-activity/" + pluginXml );
 
-        DeveloperActivityReport mojo = (DeveloperActivityReport)lookupMojo( "dev-activity", pluginXmlFile );
+        DeveloperActivityReport mojo = (DeveloperActivityReport) lookupMojo( "dev-activity", pluginXmlFile );
 
         assertNotNull( "Mojo found.", mojo );
 
@@ -110,7 +114,7 @@
         String changelogXml = FileUtils.fileRead( outputXML );
 
         assertTrue( "Test for xml header", changelogXml.startsWith( "<?xml version=\"1.0\" encoding=\"" +
-                    encoding + "\"?>" ) );
+                                                                        encoding + "\"?>" ) );
 
         assertTrue( "Test for xml footer", changelogXml.endsWith( "</changelog>" ) );
 
diff --git a/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java b/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
index 95b1b6c..790cae7 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/FileActivityComparatorTest.java
@@ -34,7 +34,9 @@
 {
     private FileActivityComparator comparator;
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void setUp()
         throws Exception
     {
@@ -55,7 +57,7 @@
 
         list2 = new ArrayList<ChangeFile>();
         list2.add( new ChangeFile( "one thing" ) );
-        list2.add( new ChangeFile( "something") );
+        list2.add( new ChangeFile( "something" ) );
 
         assertTrue( "Test compare by commits, greater than", comparator.compare( list1, list2 ) > 0 );
     }
diff --git a/src/test/java/org/apache/maven/plugin/changelog/FileActivityReportTest.java b/src/test/java/org/apache/maven/plugin/changelog/FileActivityReportTest.java
index 0d9a281..ccb1c64 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/FileActivityReportTest.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/FileActivityReportTest.java
@@ -19,12 +19,12 @@
  * under the License.
  */
 
-import java.io.File;
-
 import org.apache.maven.plugin.changelog.stubs.ScmManagerStub;
 import org.apache.maven.scm.manager.ScmManager;
 import org.codehaus.plexus.util.FileUtils;
 
+import java.io.File;
+
 /**
  * @author Edwin Punzalan
  * @version $Id$
@@ -34,7 +34,9 @@
 {
     private ScmManager scmManager;
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void setUp()
         throws Exception
     {
@@ -43,7 +45,9 @@
         scmManager = new ScmManagerStub();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected void tearDown()
         throws Exception
     {
@@ -109,8 +113,8 @@
 
         String changelogXml = FileUtils.fileRead( outputXML );
 
-        assertTrue( "Test for xml header", changelogXml.startsWith( "<?xml version=\"1.0\" encoding=\"" + encoding
-            + "\"?>" ) );
+        assertTrue( "Test for xml header",
+                    changelogXml.startsWith( "<?xml version=\"1.0\" encoding=\"" + encoding + "\"?>" ) );
 
         assertTrue( "Test for xml footer", changelogXml.endsWith( "</changelog>" ) );
 
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java
index bd4fb8e..9d8e789 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/ChangeLogScmResultStub.java
@@ -42,9 +42,11 @@
         super( "", "", "", true );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogSet getChangeLog()
     {
-        return new ChangeLogSet( Collections.<ChangeSet> emptyList(), new Date( 360 ), new Date( 720 ) );
+        return new ChangeLogSet( Collections.<ChangeSet>emptyList(), new Date( 360 ), new Date( 720 ) );
     }
 }
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/FailedScmManagerStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/FailedScmManagerStub.java
index e9ed8a3..14ad3ec 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/FailedScmManagerStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/FailedScmManagerStub.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
+import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
+import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.manager.NoSuchScmProviderException;
-import org.apache.maven.scm.command.changelog.ChangeLogScmResult;
 
 /**
  * @author Edwin Punzalan
@@ -31,7 +31,9 @@
 public class FailedScmManagerStub
     extends ScmManagerStub
 {
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmProvider getProviderByRepository( ScmRepository scmRepository )
         throws NoSuchScmProviderException
     {
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/MavenProjectStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/MavenProjectStub.java
index 4f5f313..59befa6 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/MavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/MavenProjectStub.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import org.codehaus.plexus.PlexusTestCase;
 import org.apache.maven.model.Scm;
+import org.codehaus.plexus.PlexusTestCase;
 
 import java.io.File;
 
@@ -40,7 +40,9 @@
         testCounter++;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public Scm getScm()
     {
         Scm scm = new Scm();
@@ -50,7 +52,9 @@
         return scm;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public File getBasedir()
     {
         return new File( PlexusTestCase.getBasedir(), "target/test-harness/" + testCounter );
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java
index 3b2f35f..46cd5f5 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerStub.java
@@ -61,41 +61,53 @@
 {
     private ScmProvider scmProvider;
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmProvider getProviderByType( String string )
         throws NoSuchScmProviderException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmProvider getProviderByUrl( String string )
         throws ScmRepositoryException, NoSuchScmProviderException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmRepository makeProviderScmRepository( String string, File file )
         throws ScmRepositoryException, UnknownRepositoryStructure, NoSuchScmProviderException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmRepository makeScmRepository( String string )
         throws ScmRepositoryException, NoSuchScmProviderException
     {
         return new ScmRepositoryStub();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public List<String> validateScmRepository( String string )
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmProvider getProviderByRepository( ScmRepository scmRepository )
         throws NoSuchScmProviderException
     {
@@ -112,41 +124,53 @@
         return scmProvider;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void setScmProvider( String providerType, ScmProvider provider )
     {
         setScmProvider( provider );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public AddScmResult add( ScmRepository repository, ScmFileSet fileSet )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).add( repository, fileSet );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public AddScmResult add( ScmRepository repository, ScmFileSet fileSet, String message )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).add( repository, fileSet, message );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public BranchScmResult branch( ScmRepository repository, ScmFileSet fileSet, String branchName )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public BranchScmResult branch( ScmRepository repository, ScmFileSet fileSet, String branchName, String message )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).branch( repository, fileSet, branchName, message );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, Date startDate, Date endDate,
                                          int numDays, ScmBranch branch )
         throws ScmException
@@ -155,7 +179,9 @@
                                                                      branch );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, Date startDate, Date endDate,
                                          int numDays, ScmBranch branch, String datePattern )
         throws ScmException
@@ -164,7 +190,9 @@
                                                                      branch, datePattern );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, ScmVersion startVersion,
                                          ScmVersion endVersion )
         throws ScmException
@@ -172,7 +200,9 @@
         return this.getProviderByRepository( repository ).changeLog( repository, fileSet, startVersion, endVersion );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository repository, ScmFileSet fileSet, ScmVersion startRevision,
                                          ScmVersion endRevision, String datePattern )
         throws ScmException
@@ -181,42 +211,54 @@
                                                                      datePattern );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckInScmResult checkIn( ScmRepository repository, ScmFileSet fileSet, String message )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).checkIn( repository, fileSet, message );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckInScmResult checkIn( ScmRepository repository, ScmFileSet fileSet, ScmVersion revision, String message )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).checkIn( repository, fileSet, revision, message );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).checkOut( repository, fileSet );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, ScmVersion version )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).checkOut( repository, fileSet, version );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, boolean recursive )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).checkOut( repository, fileSet, recursive );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository repository, ScmFileSet fileSet, ScmVersion version,
                                        boolean recursive )
         throws ScmException
@@ -224,7 +266,9 @@
         return this.getProviderByRepository( repository ).checkOut( repository, fileSet, version, recursive );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public DiffScmResult diff( ScmRepository repository, ScmFileSet fileSet, ScmVersion startVersion,
                                ScmVersion endVersion )
         throws ScmException
@@ -232,35 +276,45 @@
         return this.getProviderByRepository( repository ).diff( repository, fileSet, startVersion, endVersion );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public EditScmResult edit( ScmRepository repository, ScmFileSet fileSet )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).edit( repository, fileSet );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).export( repository, fileSet );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet, ScmVersion version )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).export( repository, fileSet, version );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet, String outputDirectory )
         throws ScmException
     {
         return this.export( repository, fileSet, outputDirectory );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository repository, ScmFileSet fileSet, ScmVersion version,
                                    String outputDirectory )
         throws ScmException
@@ -268,70 +322,90 @@
         return this.getProviderByRepository( repository ).export( repository, fileSet, version, outputDirectory );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ListScmResult list( ScmRepository repository, ScmFileSet fileSet, boolean recursive, ScmVersion version )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).list( repository, fileSet, recursive, version );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public RemoveScmResult remove( ScmRepository repository, ScmFileSet fileSet, String message )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).remove( repository, fileSet, message );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public StatusScmResult status( ScmRepository repository, ScmFileSet fileSet )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).status( repository, fileSet );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tagName )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).tag( repository, fileSet, tagName );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public TagScmResult tag( ScmRepository repository, ScmFileSet fileSet, String tagName, String message )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).tag( repository, fileSet, tagName, message );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UnEditScmResult unedit( ScmRepository repository, ScmFileSet fileSet )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).unedit( repository, fileSet );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).update( repository, fileSet );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).update( repository, fileSet, version );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, boolean runChangelog )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).update( repository, fileSet, runChangelog );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version,
                                    boolean runChangelog )
         throws ScmException
@@ -339,14 +413,18 @@
         return this.getProviderByRepository( repository ).update( repository, fileSet, version, runChangelog );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, String datePattern )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).update( repository, fileSet, (ScmVersion) null, datePattern );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version,
                                    String datePattern )
         throws ScmException
@@ -354,21 +432,27 @@
         return this.getProviderByRepository( repository ).update( repository, fileSet, version, datePattern );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, Date lastUpdate )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).update( repository, fileSet, (ScmVersion) null, lastUpdate );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, Date lastUpdate )
         throws ScmException
     {
         return this.getProviderByRepository( repository ).update( repository, fileSet, version, lastUpdate );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, Date lastUpdate, String datePattern )
         throws ScmException
     {
@@ -376,7 +460,9 @@
                                                                   datePattern );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository repository, ScmFileSet fileSet, ScmVersion version, Date lastUpdate,
                                    String datePattern )
         throws ScmException
@@ -385,25 +471,33 @@
                                                                   datePattern );
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void setScmProviderImplementation( String providerType, String providerImplementation )
     {
         // nop
     }
 
-    /** {@inheritDoc} */
-	public BlameScmResult blame(ScmRepository arg0, ScmFileSet arg1, String arg2)
-			throws ScmException {
+    /**
+     * {@inheritDoc}
+     */
+    public BlameScmResult blame( ScmRepository arg0, ScmFileSet arg1, String arg2 )
+        throws ScmException
+    {
 
-		return this.getProviderByRepository( arg0 ).blame(arg0, arg1, arg2);
-	}
+        return this.getProviderByRepository( arg0 ).blame( arg0, arg1, arg2 );
+    }
 
-	/** {@inheritDoc} */
-	public MkdirScmResult mkdir(ScmRepository arg0, ScmFileSet arg1,
-			String arg2, boolean arg3) throws ScmException {
+    /**
+     * {@inheritDoc}
+     */
+    public MkdirScmResult mkdir( ScmRepository arg0, ScmFileSet arg1, String arg2, boolean arg3 )
+        throws ScmException
+    {
 
-		return this.getProviderByRepository(arg0).mkdir(arg0, arg1, arg2, arg3);
-	}
+        return this.getProviderByRepository( arg0 ).mkdir( arg0, arg1, arg2, arg3 );
+    }
 
     public ChangeLogScmResult changeLog( ChangeLogScmRequest scmRequest )
         throws ScmException
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerWithHostStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerWithHostStub.java
index b63b5f7..9f3167f 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerWithHostStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmManagerWithHostStub.java
@@ -19,10 +19,10 @@
  * under the License.
  */
 
-import org.apache.maven.scm.repository.ScmRepository;
-import org.apache.maven.scm.repository.ScmRepositoryException;
 import org.apache.maven.scm.manager.NoSuchScmProviderException;
 import org.apache.maven.scm.provider.ScmProviderRepositoryWithHost;
+import org.apache.maven.scm.repository.ScmRepository;
+import org.apache.maven.scm.repository.ScmRepositoryException;
 
 /**
  * @author Edwin Punzalan
@@ -31,7 +31,9 @@
 public class ScmManagerWithHostStub
     extends ScmManagerStub
 {
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmRepository makeScmRepository( String string )
         throws ScmRepositoryException, NoSuchScmProviderException
     {
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java
index e17b325..5d7149d 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmProviderStub.java
@@ -36,6 +36,7 @@
 import org.apache.maven.scm.command.checkout.CheckOutScmResult;
 import org.apache.maven.scm.command.diff.DiffScmResult;
 import org.apache.maven.scm.command.edit.EditScmResult;
+import org.apache.maven.scm.command.export.ExportScmResult;
 import org.apache.maven.scm.command.info.InfoScmResult;
 import org.apache.maven.scm.command.list.ListScmResult;
 import org.apache.maven.scm.command.mkdir.MkdirScmResult;
@@ -45,7 +46,6 @@
 import org.apache.maven.scm.command.tag.TagScmResult;
 import org.apache.maven.scm.command.unedit.UnEditScmResult;
 import org.apache.maven.scm.command.update.UpdateScmResult;
-import org.apache.maven.scm.command.export.ExportScmResult;
 import org.apache.maven.scm.log.ScmLogger;
 import org.apache.maven.scm.provider.ScmProvider;
 import org.apache.maven.scm.provider.ScmProviderRepository;
@@ -64,72 +64,94 @@
 public class ScmProviderStub
     implements ScmProvider
 {
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public AddScmResult add( ScmRepository scmRepository, ScmFileSet scmFileSet )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public void addListener( ScmLogger scmLogger )
     {
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getScmSpecificFilename()
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String getScmType()
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmProviderRepository makeProviderScmRepository( File file )
         throws ScmRepositoryException, UnknownRepositoryStructure
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ScmProviderRepository makeProviderScmRepository( String string, char c )
         throws ScmRepositoryException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public AddScmResult add( ScmRepository scmRepository, ScmFileSet scmFileSet, String message )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public BranchScmResult branch( ScmRepository scmRepository, ScmFileSet scmFileSet, String string )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public BranchScmResult branch( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1 )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     protected ChangeLogScmResult getChangeLogScmResult()
     {
         return new ChangeLogScmResultStub();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1,
                                          int i, String string )
         throws ScmException
@@ -137,7 +159,9 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1,
                                          int i, String string, String string1 )
         throws ScmException
@@ -145,7 +169,9 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, String string,
                                          String string1 )
         throws ScmException
@@ -153,7 +179,9 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, String string,
                                          String string1, String string2 )
         throws ScmException
@@ -161,7 +189,9 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1,
                                          int i, ScmBranch scmBranch )
         throws ScmException
@@ -169,7 +199,9 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, Date date, Date date1,
                                          int i, ScmBranch scmBranch, String string )
         throws ScmException
@@ -177,7 +209,9 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                          ScmVersion scmVersion1 )
         throws ScmException
@@ -185,7 +219,9 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ChangeLogScmResult changeLog( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                          ScmVersion scmVersion1, String string )
         throws ScmException
@@ -193,21 +229,27 @@
         return getChangeLogScmResult();
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckInScmResult checkIn( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1 )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckInScmResult checkIn( ScmRepository scmRepository, ScmFileSet scmFileSet, String string )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckInScmResult checkIn( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                      String string )
         throws ScmException
@@ -215,42 +257,54 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository scmRepository, ScmFileSet scmFileSet, String string )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository scmRepository, ScmFileSet scmFileSet )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, boolean b )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public CheckOutScmResult checkOut( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                        boolean b )
         throws ScmException
@@ -258,14 +312,18 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public DiffScmResult diff( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1 )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public DiffScmResult diff( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                ScmVersion scmVersion1 )
         throws ScmException
@@ -273,42 +331,54 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public EditScmResult edit( ScmRepository scmRepository, ScmFileSet scmFileSet )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository scmRepository, ScmFileSet scmFileSet, String string )
         throws ScmException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository scmRepository, ScmFileSet scmFileSet )
         throws ScmException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion )
         throws ScmException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1 )
         throws ScmException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ExportScmResult export( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                    String string )
         throws ScmException
@@ -316,76 +386,98 @@
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ListScmResult list( ScmRepository repository, ScmFileSet fileSet, boolean recursive, String tag )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public ListScmResult list( ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b, ScmVersion scmVersion )
         throws ScmException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public RemoveScmResult remove( ScmRepository scmRepository, ScmFileSet scmFileSet, String string )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public boolean requiresEditMode()
     {
         return false;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public StatusScmResult status( ScmRepository scmRepository, ScmFileSet scmFileSet )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public TagScmResult tag( ScmRepository scmRepository, ScmFileSet scmFileSet, String string )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public TagScmResult tag( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1 )
         throws ScmException
     {
         return null;  //To change body of implemented methods use File | Settings | File Templates.
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UnEditScmResult unedit( ScmRepository scmRepository, ScmFileSet scmFileSet )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, String string )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, Date date )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, Date date,
                                    String string1 )
         throws ScmException
@@ -393,7 +485,9 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, String string, String string1 )
         throws ScmException
     {
@@ -421,14 +515,18 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, boolean b )
         throws ScmException
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                    boolean b )
         throws ScmException
@@ -436,7 +534,9 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                    String string )
         throws ScmException
@@ -444,7 +544,9 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion,
                                    Date date )
         throws ScmException
@@ -452,7 +554,9 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public UpdateScmResult update( ScmRepository scmRepository, ScmFileSet scmFileSet, ScmVersion scmVersion, Date date,
                                    String string )
         throws ScmException
@@ -460,25 +564,33 @@
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public List<String> validateScmUrl( String string, char c )
     {
         return null;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public String sanitizeTagName( String tag )
     {
         return tag;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public boolean validateTagName( String tag )
     {
         return true;
     }
 
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public TagScmResult tag( ScmRepository arg0, ScmFileSet arg1, String arg2, ScmTagParameters arg3 )
         throws ScmException
     {
@@ -491,17 +603,19 @@
         return null;
     }
 
-	public BlameScmResult blame(ScmRepository arg0, ScmFileSet arg1, String arg2)
-			throws ScmException {
+    public BlameScmResult blame( ScmRepository arg0, ScmFileSet arg1, String arg2 )
+        throws ScmException
+    {
 
-		return null;
-	}
+        return null;
+    }
 
-	public MkdirScmResult mkdir(ScmRepository arg0, ScmFileSet arg1,
-			String arg2, boolean arg3) throws ScmException {
+    public MkdirScmResult mkdir( ScmRepository arg0, ScmFileSet arg1, String arg2, boolean arg3 )
+        throws ScmException
+    {
 
-		return null;
-	}
+        return null;
+    }
 
     public InfoScmResult info( ScmProviderRepository scmProviderRepository, ScmFileSet scmFileSet,
                                CommandParameters commandParameters )
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmRepositoryStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmRepositoryStub.java
index 8e6222f..3c0d625 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmRepositoryStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/ScmRepositoryStub.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import org.apache.maven.scm.repository.ScmRepository;
 import org.apache.maven.scm.provider.ScmProviderRepository;
+import org.apache.maven.scm.repository.ScmRepository;
 
 /**
  * @author Edwin Punzalan
diff --git a/src/test/java/org/apache/maven/plugin/changelog/stubs/SettingsStub.java b/src/test/java/org/apache/maven/plugin/changelog/stubs/SettingsStub.java
index 4541e96..5595299 100644
--- a/src/test/java/org/apache/maven/plugin/changelog/stubs/SettingsStub.java
+++ b/src/test/java/org/apache/maven/plugin/changelog/stubs/SettingsStub.java
@@ -19,8 +19,8 @@
  * under the License.
  */
 
-import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
 
 /**
  * @author Edwin Punzalan
@@ -29,7 +29,9 @@
 public class SettingsStub
     extends Settings
 {
-    /** {@inheritDoc} */
+    /**
+     * {@inheritDoc}
+     */
     public Server getServer( String serverId )
     {
         return new Server()