diff --git a/maven-core/src/main/java/org/apache/maven/Maven.java b/maven-core/src/main/java/org/apache/maven/Maven.java
index e3db808757..424d2b8367 100644
--- a/maven-core/src/main/java/org/apache/maven/Maven.java
+++ b/maven-core/src/main/java/org/apache/maven/Maven.java
@@ -24,7 +24,7 @@
import org.apache.maven.execution.ReactorManager;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public interface Maven
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
index a41e8d67a0..e5b69b5f2a 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutionException.java
@@ -28,7 +28,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class LifecycleExecutionException
diff --git a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
index 4b0a8921e3..13df2855fa 100644
--- a/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
+++ b/maven-core/src/main/java/org/apache/maven/lifecycle/LifecycleExecutor.java
@@ -33,7 +33,7 @@
* that may occur during this process, and directing the behavior of the build
* according to what's specified in {@link MavenExecutionRequest#getReactorFailureBehavior()}.
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @author jdcasey
* @version $Id$
*/
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java
index 3fb538721d..466beb5e39 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java
@@ -25,7 +25,7 @@
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class PluginConfigurationException
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
index 0625099770..b6a69f7510 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
@@ -32,7 +32,7 @@
import org.apache.maven.reporting.MavenReport;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public interface PluginManager
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
index 1cb8cd3498..82526c9da6 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/PluginParameterExpressionEvaluator.java
@@ -35,7 +35,7 @@
import java.util.Properties;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
* @todo belong in MavenSession, so it only gets created once?
*/
diff --git a/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java b/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
index ee5bfe381d..fa3f880cf9 100644
--- a/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
+++ b/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java
@@ -26,7 +26,7 @@
import java.io.IOException;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class MavenExecutionException
diff --git a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
index b229b072d4..bbd965b5d7 100644
--- a/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
+++ b/maven-core/src/test/java/org/apache/maven/plugin/PluginParameterExpressionEvaluatorTest.java
@@ -50,7 +50,7 @@
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id: PluginParameterExpressionEvaluatorTest.java,v 1.5 2005/03/08
* 06:06:21 jdcasey Exp $
*/
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java
index ed1d0d5242..d722ea04a3 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderException.java
@@ -20,7 +20,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class MavenEmbedderException
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java
index 21fdfa0145..dbe4bdc421 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLogger.java
@@ -20,7 +20,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public interface MavenEmbedderLogger
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
index ac27e86b95..e77a3b38de 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/MavenEmbedderLoggerManager.java
@@ -38,7 +38,7 @@
*
*
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @author Trygve Laugstøl
* @version $Id$
*/
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java b/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java
index b2b5d27129..6561e92602 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/PlexusLoggerAdapter.java
@@ -20,7 +20,7 @@
*/
import org.codehaus.plexus.logging.Logger;/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class PlexusLoggerAdapter
diff --git a/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java b/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java
index fd2063e016..bed01df1ed 100644
--- a/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java
+++ b/maven-embedder/src/main/java/org/apache/maven/embedder/SummaryPluginDescriptor.java
@@ -18,7 +18,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class SummaryPluginDescriptor
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java
index a2d919affa..9936226cb5 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/Mojo.java
@@ -31,7 +31,7 @@
* Also included is the setLog(...)
method, which simply allows Maven to inject a logging mechanism which will
* allow the Mojo to communicate to the outside world through standard Maven channels.
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public interface Mojo
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java
index 9988436e4a..c1a2fe106b 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/InvalidParameterException.java
@@ -20,7 +20,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id: InvalidParameterException.java,v 1.1 2005/02/20 16:25:21
* jdcasey Exp $
*/
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
index ecb61f2cf0..1b06b0a5a8 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/Parameter.java
@@ -20,7 +20,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class Parameter
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
index 9dbaabcce9..05e0b2628b 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptor.java
@@ -41,7 +41,7 @@
import java.util.Set;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class PluginDescriptor
diff --git a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
index dec99a6710..97e6a94065 100644
--- a/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
+++ b/maven-plugin-api/src/main/java/org/apache/maven/plugin/descriptor/PluginDescriptorBuilder.java
@@ -33,7 +33,7 @@
import java.util.List;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class PluginDescriptorBuilder
diff --git a/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java b/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
index e17d30584f..6f0d5d7c97 100644
--- a/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
+++ b/maven-project/src/main/java/org/apache/maven/project/ProjectBuildingException.java
@@ -32,7 +32,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class ProjectBuildingException
diff --git a/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java b/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
index b3c7f20f5e..eeb5204815 100644
--- a/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
+++ b/maven-project/src/main/java/org/apache/maven/project/inheritance/DefaultModelInheritanceAssembler.java
@@ -43,7 +43,7 @@
import java.util.TreeMap;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id: DefaultModelInheritanceAssembler.java,v 1.4 2004/08/23 20:24:54
* jdcasey Exp $
* @todo generate this with modello to keep it in sync with changes in the model.
diff --git a/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java b/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
index 76d00b169a..aafe60f762 100644
--- a/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
+++ b/maven-project/src/main/java/org/apache/maven/project/inheritance/ModelInheritanceAssembler.java
@@ -22,7 +22,7 @@
import org.apache.maven.model.Model;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public interface ModelInheritanceAssembler
diff --git a/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java b/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
index 366e6b8929..99a289639e 100644
--- a/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
+++ b/maven-project/src/main/java/org/apache/maven/project/path/PathTranslator.java
@@ -24,7 +24,7 @@
import java.io.File;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public interface PathTranslator
diff --git a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
index 489afe2dcb..2007e75953 100644
--- a/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
+++ b/maven-project/src/test/java/org/apache/maven/project/AbstractMavenProjectTestCase.java
@@ -35,7 +35,7 @@
import java.util.Properties;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public abstract class AbstractMavenProjectTestCase
diff --git a/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java b/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
index b7aea4247d..2f2313b3ab 100644
--- a/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.java
@@ -30,7 +30,7 @@
import java.util.List;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class CanonicalProjectBuilderTest
diff --git a/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java b/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
index ea8045ac4c..a2defbf22d 100644
--- a/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
+++ b/maven-project/src/test/java/org/apache/maven/project/imports/AbstractProjectImportsTestCase.java
@@ -24,7 +24,7 @@
import java.io.File;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public abstract class AbstractProjectImportsTestCase
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
index efba8d9304..956ab07fb4 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/AbstractProjectInheritanceTestCase.java
@@ -24,7 +24,7 @@
import java.io.File;
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public abstract class AbstractProjectInheritanceTestCase
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
index 996272844b..d3f4fae3c7 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t00/ProjectInheritanceTest.java
@@ -32,7 +32,7 @@
* anywhere else in the lineage. We are just making sure that values
* down in the lineage are bubbling up where they should.
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class ProjectInheritanceTest
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
index e334c18c2f..1bab201c44 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t01/ProjectInheritanceTest.java
@@ -27,7 +27,7 @@
* we are testing to make sure that elements stated in a model are
* not clobbered by the same elements elsewhere in the lineage.
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class ProjectInheritanceTest
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
index 72adb8de99..1ec187f6ef 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t02/ProjectInheritanceTest.java
@@ -40,7 +40,7 @@
* anywhere else in the lineage. We are just making sure that values
* down in the lineage are bubbling up where they should.
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class ProjectInheritanceTest
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
index 2be3f7da05..32ae778f7b 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t03/ProjectInheritanceTest.java
@@ -33,7 +33,7 @@
* anywhere else in the lineage. We are just making sure that values
* down in the lineage are bubbling up where they should.
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class ProjectInheritanceTest
diff --git a/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java b/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
index 56f0ea2284..beba71e422 100644
--- a/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
+++ b/maven-project/src/test/java/org/apache/maven/project/inheritance/t07/ProjectInheritanceTest.java
@@ -30,7 +30,7 @@
/**
* A test which demonstrates maven's dependency management
*
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @version $Id$
*/
public class ProjectInheritanceTest
diff --git a/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java b/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
index a15e3f8a0a..6471460985 100644
--- a/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
+++ b/maven-reporting-api/src/main/java/org/apache/maven/reporting/MavenReportRenderer.java
@@ -20,7 +20,7 @@
*/
/**
- * @author Jason van Zyl
+ * @author Jason van Zyl
* @author Emmanuel Venisse
* @version $Id$
* @todo Later it may be appropriate to create something like a VelocityMavenReportRenderer that could take a velocity template and pipe that through Doxia rather than coding them up like this.