diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
index 29a5c5b..85586f6 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
@@ -66,7 +66,7 @@
 /**
  * Base abstract class for Checkstyle reports.
  *
- * @version $Id$
+ *
  */
 public abstract class AbstractCheckstyleReport
     extends AbstractMavenReport
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
index 6ca886a..d2981d7 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
@@ -33,7 +33,7 @@
  * HTML report on the violations that Checkstyle finds in a multi-module reactor
  * build.
  *
- * @version $Id$
+ *
  */
 @Mojo( name = "checkstyle-aggregate", aggregator = true, requiresDependencyResolution = ResolutionScope.COMPILE,
        threadSafe = true )
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
index 1313688..5c2c57e 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
@@ -37,7 +37,7 @@
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
  * @author <a href="mailto:joakim@erdfelt.com">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Mojo( name = "checkstyle", requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true )
 public class CheckstyleReport
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java
index 9e4892f..a443998 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java
@@ -43,7 +43,7 @@
 /**
  * Generate a report based on CheckstyleResults.
  *
- * @version $Id$
+ *
  */
 public class CheckstyleReportGenerator
 {
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
index 44840b7..404cce7 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
@@ -71,7 +71,7 @@
  * It can also be configured to re-use an earlier analysis.
  *
  * @author <a href="mailto:joakim@erdfelt.net">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 @Mojo( name = "check", defaultPhase = LifecyclePhase.VERIFY, requiresDependencyResolution = ResolutionScope.NONE,
        threadSafe = true )
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java b/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java
index b022b17..4cb930c 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java
@@ -29,7 +29,7 @@
  * Generic Report Resource management.
  *
  * @author <a href="mailto:joakim@erdfelt.net">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 public class ReportResource
 {
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java
index e6fade5..f612a7a 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java
@@ -37,7 +37,7 @@
  *
  * @author <a href="mailto:evenisse@apache.org">Emmanuel Venisse</a>
  * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
- * @version $Id$
+ *
  */
 public class CheckstyleCheckerListener
     extends AutomaticBean
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java
index 3661ee3..ba7e19e 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java
@@ -25,7 +25,7 @@
 /**
  * @author Olivier Lamy
  * @since 2.5
- * @version $Id$
+ *
  */
 public interface CheckstyleExecutor
 {
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java
index 648843a..f60a4af 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java
@@ -22,7 +22,7 @@
 /**
  * @author Olivier Lamy
  * @since 2.5
- * @version $Id$
+ *
  */
 public class CheckstyleExecutorException
     extends Exception
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java
index 36e2cfd..39c9f94 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java
@@ -34,7 +34,7 @@
 /**
  * @author Olivier Lamy
  * @since 2.5
- * @version $Id$
+ *
  */
 public class CheckstyleExecutorRequest
 {
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java
index ce2a4a6..a82870f 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java
@@ -33,7 +33,7 @@
  * TODO: provide fallback to disk based storage if too many results.
  *
  * @author <a href="mailto:joakim@erdfelt.net">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 public class CheckstyleResults
 {
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java b/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java
index 9a35945..5afbd10 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java
@@ -69,7 +69,7 @@
 /**
  * @author Olivier Lamy
  * @since 2.5
- * @version $Id$
+ *
  */
 @Component( role = CheckstyleExecutor.class, hint = "default", instantiationStrategy = "per-lookup" )
 public class DefaultCheckstyleExecutor
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java b/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java
index bb335a1..a25090b 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java
@@ -47,7 +47,7 @@
  * </pre>
  *
  * @author <a href="mailto:joakim@erdfelt.net">Joakim Erdfelt</a>
- * @version $Id$
+ *
  */
 public class VelocityTemplate
 {
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java
index 5b5a687..c238093 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java
@@ -41,7 +41,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class CheckstyleReportTest
     extends AbstractMojoTestCase
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java
index 73d3dc6..984e86f 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java
@@ -33,7 +33,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class CheckstyleViolationCheckMojoTest
     extends AbstractMojoTestCase
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java
index 42fe52a..57cffd3 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java
@@ -28,7 +28,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class ReportResourceTest
     extends TestCase
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
index ff48bc5..d88cd74 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
@@ -34,7 +34,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class CheckstyleReportListenerTest
     extends TestCase
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
index ab1f276..f4e58ac 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
@@ -36,7 +36,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class CheckstyleResultsTest
     extends TestCase
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java
index 9191f09..6779908 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java
@@ -26,7 +26,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class MavenProjectWithExceptionsStub
     extends MinMavenProjectStub
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java
index 0a525fa..1c5c2f2 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java
@@ -26,7 +26,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class MavenProjectWithNoJxrPluginStub
     extends MinMavenProjectStub
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java
index fda51e3..795b835 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java
@@ -32,7 +32,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class MinMavenProjectStub
     extends org.apache.maven.plugin.testing.stubs.MavenProjectStub
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java
index 5963d5e..71debc5 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java
@@ -32,7 +32,7 @@
 
 /**
  * @author Edwin Punzalan
- * @version $Id$
+ *
  */
 public class ModuleMavenProjectStub
     extends org.apache.maven.plugin.testing.stubs.MavenProjectStub
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java
index f6b219c..5c415a7 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java
@@ -31,7 +31,7 @@
 import org.codehaus.plexus.PlexusTestCase;
 
 /**
- * @version $Id$
+ *
  */
 public class MultiMavenProjectStub
     extends org.apache.maven.plugin.testing.stubs.MavenProjectStub