diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
index 3e79753947..2f0455fbd3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0024MultipleGoalExecutionsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-172.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0024MultipleGoalExecutionsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
index 7a0b720e84..6b2ebe4476 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0025MultipleExecutionLevelConfigsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-172.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0025MultipleExecutionLevelConfigsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
index 1ab014a186..23948e75d1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0036ReleasePomTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-607.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0036ReleasePomTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
index 5a4799aa7b..82dddd3c5c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0037AlternatePomFileSameDirTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-607.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0037AlternatePomFileSameDirTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
index e6936aed85..05f846844f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0038AlternatePomFileDifferentDirTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-607.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0038AlternatePomFileDifferentDirTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
index 743dc0a33b..e459c2a11f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0039ReleasePomInReactorTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-607.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0039ReleasePomInReactorTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
index ccf8993db8..e52a7ac6b4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0040PackagingFromPluginExtensionTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-598.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenIT0040PackagingFromPluginExtensionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
index 32db3f5ee1..6a8261f802 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0041ArtifactTypeFromPluginExtensionTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-598.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenIT0041ArtifactTypeFromPluginExtensionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
index 5be1a9153f..bf8600d435 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0071PluginConfigWithDottedPropertyTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-885.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0071PluginConfigWithDottedPropertyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
index da2c8995a7..f725cabd09 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0072InterpolationWithDottedPropertyTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-885.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0072InterpolationWithDottedPropertyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
index 3992d93834..a60afc4f77 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0086PluginRealmTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1898.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0086PluginRealmTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
index 4dd6e0d0f2..572d3f0911 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0087PluginRealmWithProjectLevelDepsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1898.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenIT0087PluginRealmWithProjectLevelDepsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
index fdf36e57e8..af1f889e7f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0130CleanLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0130CleanLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
index d63fad5602..bf3a1cae07 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0131SiteLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0131SiteLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
index a50ceabaa8..ffc116553d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0132PomLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0132PomLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
index d936a5543f..fb6893f9a2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0133JarLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0133JarLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
index 389c3e3c6c..b434ca8153 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0134WarLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0134WarLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
index bfa13d31d8..e496161570 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0135EjbLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0135EjbLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
index f765ba1d98..6bfd6236bf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0136RarLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0136RarLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
index 6e4d7bae47..3febff5ae7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0137EarLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0137EarLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
index 7c7c914691..293841980c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0138PluginLifecycleTest.java
@@ -27,7 +27,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0138PluginLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
index 30eec8eb03..9f58f55976 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0139InterpolationWithProjectPrefixTest.java
@@ -28,7 +28,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0139InterpolationWithProjectPrefixTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
index db2964d1df..2df4b04a3e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0140InterpolationWithPomPrefixTest.java
@@ -28,7 +28,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0140InterpolationWithPomPrefixTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
index 157ea9e730..dd96bd3ac7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0142DirectDependencyScopesTest.java
@@ -29,7 +29,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0142DirectDependencyScopesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
index 2f8d75300b..28d1bf5e84 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0143TransitiveDependencyScopesTest.java
@@ -29,7 +29,7 @@
/**
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0143TransitiveDependencyScopesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
index cedd8d5727..01a573a833 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0144LifecycleExecutionOrderTest.java
@@ -28,7 +28,7 @@
/**
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenIT0144LifecycleExecutionOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
index 9b4c6276f1..8a0286c896 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITBootstrapTest.java
@@ -29,7 +29,7 @@
* ITs run without downloading anything later.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITBootstrapTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
index 61c38d7e1e..57aab46144 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0095ReactorFailureBehaviorTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-95.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0095ReactorFailureBehaviorTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
index c7f049d676..2838cfc2d4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0249ResolveDepsFromReactorTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-249.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0249ResolveDepsFromReactorTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
index c10d0158c2..1d33246469 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0282NonReactorExecWhenProjectIndependentTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-282.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0282NonReactorExecWhenProjectIndependentTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
index 8a8418cfdc..f9caae745b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0294MergeGlobalAndUserSettingsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-294.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0294MergeGlobalAndUserSettingsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
index 9ccdcaff5e..59c7708884 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0377PluginLookupFromPrefixTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-377.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0377PluginLookupFromPrefixTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
index fe20eff10a..c522cd7124 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0449PluginVersionResolutionTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-449.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng0449PluginVersionResolutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
index 954bdf8fce..0feec2aaf3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0469ReportConfigTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-469.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng0469ReportConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
index f8d713f5c8..2eb3908906 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0471CustomLifecycleTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-471.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0471CustomLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
index ac79481f78..b781bae9c9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0479OverrideCentralRepoTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-479.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng0479OverrideCentralRepoTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
index 46e8043dee..63ea1456c4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0496IgnoreUnknownPluginParametersTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-496.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0496IgnoreUnknownPluginParametersTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
index 1b44a17480..c52c977a85 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0505VersionRangeTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-505.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0505VersionRangeTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
index 397b561331..c4b2419176 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0507ArtifactRelocationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-507.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0507ArtifactRelocationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
index ad2da373a9..10b2d75e57 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0522InheritedPluginMgmtConfigTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-522.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0522InheritedPluginMgmtConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
index f49a13bbe8..9e9926eef4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0557UserSettingsCliOptionTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-557.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0557UserSettingsCliOptionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
index 118d3d2f0e..4b254a346e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0612NewestConflictResolverTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-612.
*
* @author Mark Hobson
- * @version $Id$
+ *
*/
public class MavenITmng0612NewestConflictResolverTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
index 2c9609ac42..1cbb4c7c0a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0666IgnoreLegacyPomTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-666.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0666IgnoreLegacyPomTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
index 7cfe4684c6..d9cb9630e7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0674PluginParameterAliasTest.java
@@ -30,7 +30,7 @@
* MNG-4997.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0674PluginParameterAliasTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
index f79bde2ec2..411a5ea8bc 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0680ParentBasedirTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-680.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0680ParentBasedirTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
index 3377035876..0cba5f004a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0731LegacyRepoLayoutTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-731.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0731LegacyRepoLayoutTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
index 1126c59c9d..730ff9fbbd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0761MissingSnapshotDistRepoTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-761.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0761MissingSnapshotDistRepoTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
index 26d3681a59..35658a2a5c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0768OfflineModeTest.java
@@ -40,7 +40,7 @@
* This is a test set for MNG-768.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0768OfflineModeTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
index ae7c88f49b..a05c4c39cf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0773SettingsProfileReactorPollutionTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-773.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0773SettingsProfileReactorPollutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
index b9b7e8a0bb..2da7e85952 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0781PluginConfigVsExecConfigTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-781.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0781PluginConfigVsExecConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
index bf3b0d9d00..51dc2caa9e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0786ProfileAwareReactorTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-786.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0786ProfileAwareReactorTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
index e978995177..476f6d08bb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0814ExplicitProfileActivationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-814.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0814ExplicitProfileActivationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
index 80b86a0ded..070969199c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0818WarDepsNotTransitiveTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-818.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0818WarDepsNotTransitiveTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
index feec60997d..342038db76 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0820ConflictResolutionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-820.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0820ConflictResolutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
index 6e54e4c121..a190083c58 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0823MojoContextPassingTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-823.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0823MojoContextPassingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
index e7c4687fed..59f3eced26 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0836PluginParentResolutionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-836.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng0836PluginParentResolutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
index 671d633ccc..07ada98135 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0848SystemPropOverridesDefaultValueTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-848.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng0848SystemPropOverridesDefaultValueTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
index 225e4863e9..521acfd956 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0866EvaluateDefaultValueTest.java
@@ -30,7 +30,7 @@
* MNG-160.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng0866EvaluateDefaultValueTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
index 8c63f94e3b..d7dc6da648 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0870ReactorAwarePluginDiscoveryTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-870.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng0870ReactorAwarePluginDiscoveryTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
index c3d35e5048..9776f39f6a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-956.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng0956ComponentInjectionViaProjectLevelPluginDepTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
index 6cba6e71c3..74f6af027b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0985NonExecutedPluginMngtGoalsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-985.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng0985NonExecutedPluginMngtGoalsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
index 15a0cfcbb5..4228a8eb6f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1021EqualAttachmentBuildNumberTest.java
@@ -27,7 +27,7 @@
* This is a test set for MNG-1021.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng1021EqualAttachmentBuildNumberTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
index 3718aa717e..3e8e4a5c59 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1052PluginMngtConfigTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-1052.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng1052PluginMngtConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
index 8392bb2637..f4c80bf2b6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1088ReactorPluginResolutionTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-1088.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng1088ReactorPluginResolutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
index 31ab051400..780c1d206c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1233WarDepWithProvidedScopeTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1233.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng1233WarDepWithProvidedScopeTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
index 688d294557..d334f67080 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1323AntrunDependenciesTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1323.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng1323AntrunDependenciesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
index 57f75bf62a..4503a67798 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1349ChecksumFormatsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-1349.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng1349ChecksumFormatsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
index e15ba45916..2f0fbe36c6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1415QuotedSystemPropertiesTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-1415.
*
- * @version $Id$
+ *
*/
public class MavenITmng1415QuotedSystemPropertiesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
index 197af94e11..7c24af0506 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1491ReactorArtifactIdCollisionTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-1491.
*
- * @version $Id$
+ *
*/
public class MavenITmng1491ReactorArtifactIdCollisionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
index 9ede76dcc6..cc2c0eaeba 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1493NonStandardModulePomNamesTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-1493.
*
- * @version $Id$
+ *
*/
public class MavenITmng1493NonStandardModulePomNamesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
index 9652921815..5dbfeebe6d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1703PluginMgmtDepInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1703.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng1703PluginMgmtDepInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
index 8122cf93a2..20a42b6638 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1908LegacySnapshotUpdateTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-1908.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng1908LegacySnapshotUpdateTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
index 3cd0de08c6..af0c15b485 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1957JdkActivationWithVersionRangeTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1957.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng1957JdkActivationWithVersionRangeTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
index 38731ab8dc..b99b54f515 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1992SystemPropOverridesPomPropTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1992.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng1992SystemPropOverridesPomPropTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
index 56080be93c..2a6b5c190a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1995InterpolateBooleanModelElementsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1995.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng1995InterpolateBooleanModelElementsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
index 8d93f68b0e..2c05d07d3e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1999DefaultReportsInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-1999.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng1999DefaultReportsInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
index 470a89803e..dbdd2a66f0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2006ChildPathAwareUrlInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2006.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2006ChildPathAwareUrlInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
index ef8592508f..77677d571b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2052InterpolateWithSettingsProfilePropertiesTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-2052.
*
- * @version $Id$
+ *
*/
public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
index f8b81ab570..6538c2ee47 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2054PluginExecutionInheritanceTest.java
@@ -29,7 +29,7 @@
/**
* This is a test set for MNG-2054.
*
- * @version $Id$
+ *
*/
public class MavenITmng2054PluginExecutionInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
index 4bfc7293d7..99d105cb80 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2136ActiveByDefaultProfileTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-2136.
*
- * @version $Id$
+ *
*/
public class MavenITmng2136ActiveByDefaultProfileTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
index 10811aae57..9d49af6dc3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2174PluginDepsManagedByParentProfileTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2174.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2174PluginDepsManagedByParentProfileTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
index 9c0d825372..00bf1cfaa0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2201PluginConfigInterpolationTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-2201.
*
- * @version $Id$
+ *
*/
public class MavenITmng2201PluginConfigInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
index c2ac7da5dd..2dd72ffadf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2228ComponentInjectionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2228.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2228ComponentInjectionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
index fc55732743..35a6b814fb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2277AggregatorAndResolutionPluginsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-2277.
*
* @author Brian Fox
- * @version $Id$
+ *
*/
public class MavenITmng2277AggregatorAndResolutionPluginsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
index 441ea36fce..8d00147f4a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2293CustomPluginParamImplTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-2293.
*
- * @version $Id$
+ *
*/
public class MavenITmng2293CustomPluginParamImplTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
index a13feacf44..d1ca958cb7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2309ProfileInjectionOrderTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2309.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2309ProfileInjectionOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
index 8625f21cb7..b7e8e8b56f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2318LocalParentResolutionTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-2318.
*
- * @version $Id$
+ *
*/
public class MavenITmng2318LocalParentResolutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
index f09f3d2dff..7c086290af 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2339BadProjectInterpolationTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-2339.
*
- * @version $Id$
+ *
*/
public class MavenITmng2339BadProjectInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
index e6d28cb80a..3597ef6a61 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2387InactiveProxyTest.java
@@ -35,7 +35,7 @@
* This is a test set for MNG-2387.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng2387InactiveProxyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
index 6912907cc5..fbaa79b280 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2432PluginPrefixOrderTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-2432
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2432PluginPrefixOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
index 125e848429..86481ac573 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2539PluginDependenciesComeFromPluginReposTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-2539.
*
- * @version $Id$
+ *
*/
public class MavenITmng2539PluginDependenciesComeFromPluginReposTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
index be1395e5e7..2fe5e80fea 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562Timestamp322Test.java
@@ -30,7 +30,7 @@
/**
* This is a test set for MNG-2562.
*
- * @version $Id$
+ *
*/
public class MavenITmng2562Timestamp322Test
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
index a41b1ca18b..1d607008e5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2562TimestampTest.java
@@ -30,7 +30,7 @@
/**
* This is a test set for MNG-2562.
*
- * @version $Id$
+ *
*/
public class MavenITmng2562TimestampTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
index 003a1b9989..09653e8fbd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2591MergeInheritedPluginConfigTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2591.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2591MergeInheritedPluginConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
index 65058de60a..6f022d1add 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2605BogusProfileActivationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2605.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2605BogusProfileActivationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
index e88a8d3569..1cc54b3cce 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2668UsePluginDependenciesForSortingTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-2668.
*
- * @version $Id$
+ *
*/
public class MavenITmng2668UsePluginDependenciesForSortingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
index ae9e169f0c..68028028a5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2741PluginMetadataResolutionErrorMessageTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-2741.
*
- * @version $Id$
+ *
*/
public class MavenITmng2741PluginMetadataResolutionErrorMessageTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
index 228a6d0dd7..05237b4792 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2744checksumVerificationTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-2744.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2744checksumVerificationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
index 22b6786f3e..f58c77dea0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2749ExtensionAvailableToPluginTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2749.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2749ExtensionAvailableToPluginTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
index cc6af099be..3100b34eb1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2771PomExtensionComponentOverrideTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-2771
*
* @author Mark Hobson
- * @version $Id$
+ *
*/
public class MavenITmng2771PomExtensionComponentOverrideTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
index f2c1690cc6..5576edc48a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2790LastUpdatedMetadataTest.java
@@ -31,7 +31,7 @@
* This is a test set for MNG-2790.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2790LastUpdatedMetadataTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
index 2e31152fbb..cb7ceb550a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-2831.
*
- * @version $Id$
+ *
*/
public class MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
index 66c86c5898..5c8697226c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2843PluginConfigPropertiesInjectionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2843.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2843PluginConfigPropertiesInjectionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
index 2882cee6cb..66d98d7a68 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2861RelocationsAndRangesTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-2861.
*
- * @version $Id$
+ *
*/
public class MavenITmng2861RelocationsAndRangesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
index 3e9ce46de4..fd9df07880 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2865MirrorWildcardTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2865.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2865MirrorWildcardTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
index de185d4edb..a48355d9d0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2871PrePackageSubartifactResolutionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2871.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2871PrePackageSubartifactResolutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
index abd6776713..52ffc1f20f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2878DefaultReportXmlImportTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2878.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2878DefaultReportXmlImportTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
index 0759944961..a7c2fe319d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2892HideCorePlexusUtilsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2892.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2892HideCorePlexusUtilsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
index f8e8c16416..5144b0b87f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2921ActiveAttachedArtifactsTest.java
@@ -31,7 +31,7 @@
* too weak to prevent this issue.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2921ActiveAttachedArtifactsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
index 0f23c1fcdc..981d0a8c89 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2926PluginPrefixOrderTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-2926
*
* @author Brian Fox
- * @version $Id$
+ *
*/
public class MavenITmng2926PluginPrefixOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
index 9fb8f4d262..4235e8d85f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2972OverridePluginDependencyTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-2972.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng2972OverridePluginDependencyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
index c676465eec..b9917016f5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2994SnapshotRangeRepositoryTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-2994
*
* @author Mark Hobson
- * @version $Id$
+ *
*/
public class MavenITmng2994SnapshotRangeRepositoryTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
index 3ffe9d1515..751570aadd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3004ReactorFailureBehaviorMultithreadedTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3004.
*
* @author Dan Fabulich
- * @version $Id$
+ *
*/
public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
index c145646f70..e5e0b2caac 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3012CoreClassImportTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3012.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3012CoreClassImportTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
index 7895a8e0ed..da2de369e0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3023ReactorDependencyResolutionTest.java
@@ -29,7 +29,7 @@
*
* @author Mark Hobson
* @author jdcasey
- * @version $Id$
+ *
*/
public class MavenITmng3023ReactorDependencyResolutionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
index b5e657e3fe..f8b915582d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3038TransitiveDepManVersionTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3038
*
* @author Joakim Erdfelt
- * @version $Id$
+ *
*/
public class MavenITmng3038TransitiveDepManVersionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
index e232de7bf3..9e32fec730 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3122ActiveProfilesNoDuplicatesTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3122.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3122ActiveProfilesNoDuplicatesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
index 23b5798db2..2504f68689 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3139.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
index a01aa33122..8b8377f7d6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3217InterPluginDependencyTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3217.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3217InterPluginDependencyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
index fa40e58058..e5bdccd431 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3220ImportScopeTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3220.
*
- * @version $Id$
+ *
*/
public class MavenITmng3220ImportScopeTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
index 496ef8dd2b..b298c7aac7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3221InfiniteForkingTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3221.
*
- * @version $Id$
+ *
*/
public class MavenITmng3221InfiniteForkingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
index 4b86412dac..b149ff4ed3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3259DepsDroppedInMultiModuleBuildTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3259.
*
- * @version $Id$
+ *
*/
public class MavenITmng3259DepsDroppedInMultiModuleBuildTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
index 06caec0ce5..51541ffd43 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3268MultipleHyphenPCommandLineTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3268.
*
- * @version $Id$
+ *
*/
public class MavenITmng3268MultipleHyphenPCommandLineTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
index e2b7840358..4d75c53499 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3271DefaultReportsSuppressionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3271.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3271DefaultReportsSuppressionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
index 8cae9d5f69..b720765951 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3355TranslatedPathInterpolationTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3355.
*
- * @version $Id$
+ *
*/
public class MavenITmng3355TranslatedPathInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
index 22efbc9788..1e7da3daf4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3372DirectInvocationOfPluginsTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-3372.
*
- * @version $Id$
+ *
*/
public class MavenITmng3372DirectInvocationOfPluginsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
index 84cb21ebb1..47057d62bf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3379ParallelArtifactDownloadsTest.java
@@ -27,7 +27,7 @@
* This is a test set for MNG-3379.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3379ParallelArtifactDownloadsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
index 138d2c5c22..df99ec8a5d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3380ManagedRelocatedTransdepsTest.java
@@ -35,7 +35,7 @@
* org.apache.maven.its.mng3380.other:a:jar:1:compile
* org.apache.maven.its.mng3380.other:b:jar:1:compile
*
- * @version $Id$
+ *
*/
public class MavenITmng3380ManagedRelocatedTransdepsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
index 263d8398f6..ff959c0aae 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3396DependencyManagementForOverConstrainedRangesTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3396.
*
- * @version $Id$
+ *
*/
public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
index a92e4c15af..e92b2d27d7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3415JunkRepositoryMetadataTest.java
@@ -38,7 +38,7 @@
/**
* This is a test set for MNG-3415.
*
- * @version $Id$
+ *
*/
public class MavenITmng3415JunkRepositoryMetadataTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
index 382ce37f3b..afb714fa53 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3422ActiveComponentCollectionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3422.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3422ActiveComponentCollectionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
index 644538aa97..a9e77f4330 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest.java
@@ -32,7 +32,7 @@
/**
* This is a test set for MNG-3441.
*
- * @version $Id$
+ *
*/
public class MavenITmng3441MetadataUpdatedFromDeploymentRepositoryTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
index ffc6dc9af3..0cb4bd3b68 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3461MirrorMatchingTest.java
@@ -36,7 +36,7 @@
* This is a test set for MNG-3461.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3461MirrorMatchingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
index aae6111113..50aad2cb61 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3475BaseAlignedDirTest.java
@@ -31,7 +31,7 @@
* MNG-1927.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3475BaseAlignedDirTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
index 94c9153b4c..f43ce1104a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3477DependencyResolutionErrorMessageTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-3477.
*
- * @version $Id$
+ *
*/
public class MavenITmng3477DependencyResolutionErrorMessageTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
index 50d94b37b2..4f5cb319d1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3485OverrideWagonExtensionTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3485.
*
- * @version $Id$
+ *
*/
public class MavenITmng3485OverrideWagonExtensionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
index 5d56ad82c9..d17f458b7c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3506ArtifactHandlersFromPluginsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3506.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng3506ArtifactHandlersFromPluginsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
index 3ad82e5e7a..cb2c1b2e05 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3535SelfReferentialPropertiesTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3535.
*
- * @version $Id$
+ *
*/
public class MavenITmng3535SelfReferentialPropertiesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
index f58f19597f..d30becaedd 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3536AppendedAbsolutePathsTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3536.
*
- * @version $Id$
+ *
*/
public class MavenITmng3536AppendedAbsolutePathsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
index 0455a6e4d7..15353f9802 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3581PluginUsesWagonDependencyTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3581.
*
- * @version $Id$
+ *
*/
public class MavenITmng3581PluginUsesWagonDependencyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
index 965124e529..fdc796beb0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3586SystemScopePluginDependencyTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3586.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3586SystemScopePluginDependencyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
index 3b65f86780..0091814d80 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVMk2Test.java
@@ -37,7 +37,7 @@
*
* @author Brett Porter
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng3599useHttpProxyForWebDAVMk2Test
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
index 42de235654..38af749d2b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3599useHttpProxyForWebDAVTest.java
@@ -39,7 +39,7 @@
*
* @author Brett Porter
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng3599useHttpProxyForWebDAVTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
index 8d9c8d0d8d..3a644f0890 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3600DeploymentModeDefaultsTest.java
@@ -28,7 +28,7 @@
/**
* This is a test set for MNG-3600.
*
- * @version $Id$
+ *
*/
public class MavenITmng3600DeploymentModeDefaultsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
index da8dac06bc..f78bd28482 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3607ClassLoadersUseValidUrlsTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3607.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3607ClassLoadersUseValidUrlsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
index 9e29308db7..166de36f44 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3621UNCInheritedPathsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3621.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng3621UNCInheritedPathsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
index bed88a2e0d..355006115b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3652UserAgentHeaderTest.java
@@ -35,7 +35,7 @@
/**
* This is a test set for MNG-3652.
*
- * @version $Id$
+ *
*/
public class MavenITmng3652UserAgentHeaderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
index 9866771e30..aa6724fbfb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3701ImplicitProfileIdTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3701.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3701ImplicitProfileIdTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
index f7a6f4f3fe..6a8dd313eb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3714ToolchainsCliOptionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3714.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng3714ToolchainsCliOptionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
index 6e6b706288..b2cd6a9c6f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3719PomExecutionOrderingTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3719.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng3719PomExecutionOrderingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
index 0865dfec0d..bdf95f62be 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3732ActiveProfilesTest.java
@@ -32,7 +32,7 @@
* This is a test set for MNG-3732.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3732ActiveProfilesTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
index 41163308df..1d717755e5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3760BaseUriPropertyTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3760.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng3760BaseUriPropertyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
index fdd572831d..1e1abe3eb9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3769ExclusionRelocatedTransdepsTest.java
@@ -29,7 +29,7 @@
/**
* This is a test set for MNG-3769.
*
- * @version $Id$
+ *
*/
public class MavenITmng3769ExclusionRelocatedTransdepsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
index dd1db13af3..80c7dc1319 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3796ClassImportInconsistencyTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3796.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3796ClassImportInconsistencyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
index c08ec92107..3264c02a21 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3805ExtensionClassPathOrderingTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3805.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3805ExtensionClassPathOrderingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
index 8fcea70cd1..eec5a755f2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3807PluginConfigExpressionEvaluationTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-3807.
*
- * @version $Id$
+ *
*/
public class MavenITmng3807PluginConfigExpressionEvaluationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
index 8ef669d7fc..4d1aa0b322 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3808ReportInheritenceOrderingTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3808.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng3808ReportInheritenceOrderingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
index 6000b7366b..a8b10e1d46 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3810BadProfileActivationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3810.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng3810BadProfileActivationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
index 6fb28dcaa5..61a2d44db4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3811ReportingPluginConfigurationInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3811.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng3811ReportingPluginConfigurationInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
index 18df210730..0b248ccf38 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3813PluginClassPathOrderingTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3813.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3813PluginClassPathOrderingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
index 68fdb758b5..1adc223ec5 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3814BogusProjectCycleTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3814.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3814BogusProjectCycleTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
index 8b6e35106c..47ff8a2fb7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3819PluginDepPlexusUtilsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3819.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3819PluginDepPlexusUtilsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
index e9c2311db2..2e4c5c717a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3821EqualPluginExecIdsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3821.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3821EqualPluginExecIdsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
index 6a84b42dfa..e7766e229d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3822BasedirAlignedInterpolationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3822.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3822BasedirAlignedInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
index 94583e21df..c2dad16bc3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3827PluginConfigTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3827.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3827PluginConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
index 93f8eabd8a..069ac198f9 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3831PomInterpolationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3831.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3831PomInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
index a3fd2d7c1b..5de2332a20 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3833PomInterpolationDataFlowChainTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3833.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3833PomInterpolationDataFlowChainTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
index 9f5a5777e0..ba1e321d2c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3836PluginConfigInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3836.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3836PluginConfigInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
index 4c31b01ee9..1968f4531d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3838EqualPluginDepsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3838.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3838EqualPluginDepsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
index 06c5305aa4..7f56b974e6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3839PomParsingCoalesceTextTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3839.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3839PomParsingCoalesceTextTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
index b6e7fd1b9f..ac235d379a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3843PomInheritanceTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3843.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3843PomInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
index 72390a006c..d55a942fea 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3845LimitedPomInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3845.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3845LimitedPomInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
index abba78821a..4b9590e9f2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3846PomInheritanceUrlAdjustmentTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3846.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3846PomInheritanceUrlAdjustmentTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
index c24885877c..10d5c95056 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3852PluginConfigWithHeterogeneousListTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3852.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3852PluginConfigWithHeterogeneousListTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
index 41b443d40a..708d337459 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3853ProfileInjectedDistReposTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3853.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3853ProfileInjectedDistReposTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
index 5a37349317..57c1b72d9d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3863AutoPluginGroupIdTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3863.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3863AutoPluginGroupIdTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
index a7607b9266..d1f3ec802e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3864PerExecPluginConfigTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3864.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3864PerExecPluginConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
index c6c3f23a8c..7a0e073c16 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3866PluginConfigInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3866.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3866PluginConfigInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
index 60b8c1d739..90027522e7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3873MultipleExecutionGoalsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3873.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3873MultipleExecutionGoalsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
index dd368b43b5..14df5196c6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3877BasedirAlignedModelTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3877.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3877BasedirAlignedModelTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
index 119c047a8b..6f011d75e7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3885UniqueVersionFromParentProfileTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3885.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3885UniqueVersionFromParentProfileTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
index 21703c7ed8..e3f1daa286 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3886ExecutionGoalsOrderTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3886.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3886ExecutionGoalsOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
index 2dea9badbb..919d24c1e1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3887PluginExecutionOrderTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3887.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3887PluginExecutionOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
index 8db40be835..77a051a0ce 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3890TransitiveDependencyScopeUpdateTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3890.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3890TransitiveDependencyScopeUpdateTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
index db4f596584..120b8f73e6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3892ReleaseDeploymentTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3892.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3892ReleaseDeploymentTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
index e53bed8b4e..47a6404dad 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3899ExtensionInheritanceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3899.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3899ExtensionInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
index bb7897f8fd..dd93836f9d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3900ProfilePropertiesInterpolationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3900.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3900ProfilePropertiesInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
index f6c6aefbbd..c003799dc8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3904NestedBuildDirInterpolationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3904.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3904NestedBuildDirInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
index 4f25e3e3c6..af3e69a674 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3906MergedPluginClassPathOrderingTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3906.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3906MergedPluginClassPathOrderingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
index 1a75e50157..3c07c76f71 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3916PluginExecutionInheritanceTest.java
@@ -31,7 +31,7 @@
* This is a test set for MNG-3916.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3916PluginExecutionInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
index d785f9f90c..d232d322b7 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3924XmlMarkupInterpolationTest.java
@@ -30,7 +30,7 @@
* MNG-3662
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3924XmlMarkupInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
index 0aac529364..4b0e956848 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3925MergedPluginExecutionOrderTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3925.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3925MergedPluginExecutionOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
index afe8af6e4e..a88787f7a3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3927PluginDefaultExecutionConfigTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3927.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3927PluginDefaultExecutionConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
index de213f80db..eecdb57254 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3933ProfilesXmlActivationTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3933.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3933ProfilesXmlActivationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
index 4ce1989fbb..32041d028a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3937MergedPluginExecutionGoalsTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3937.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3937MergedPluginExecutionGoalsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
index ffb150c143..d42e43ca93 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3938MergePluginExecutionsTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-3938.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3938MergePluginExecutionsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
index 1fafe11ca7..48597498af 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3940EnvVarInterpolationTest.java
@@ -31,7 +31,7 @@
* This is a test set for MNG-3940.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3940EnvVarInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
index ba16010d31..0035e41b70 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3943PluginExecutionInheritanceTest.java
@@ -31,7 +31,7 @@
* This is a test set for MNG-3943.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3943PluginExecutionInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
index 9e03058d31..5c8b6f1da6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3944BasedirInterpolationTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3944.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3944BasedirInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
index 7a31c2bd28..526cb92bdf 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3947PluginDefaultExecutionConfigTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3947.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3947PluginDefaultExecutionConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
index d1840a1f19..374797b52e 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3948ParentResolutionFromProfileReposTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3948.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3948ParentResolutionFromProfileReposTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
index 6f4d9b68c1..5d801c61b6 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3951AbsolutePathsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3951.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3951AbsolutePathsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
index fef5e6fbe1..167054897d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3953AuthenticatedDeploymentTest.java
@@ -45,7 +45,7 @@
* This is a test set for MNG-3953.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3953AuthenticatedDeploymentTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
index bc9d9dcfc4..6fe4e308d4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3955EffectiveSettingsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-3955.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3955EffectiveSettingsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
index 7ce756da35..e7d7a577d0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3970DepResolutionFromProfileReposTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3970.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3970DepResolutionFromProfileReposTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
index ebe5436cfd..29768cd827 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3974MirrorOrderingTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3974.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3974MirrorOrderingTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
index 0bedfa61a0..50568a4e49 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3979ElementJoinTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3979.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3979ElementJoinTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
index 834e6cf495..ec5bf12e45 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3983PluginResolutionFromProfileReposTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3983.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3983PluginResolutionFromProfileReposTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
index 785d69981c..b86a2d632b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3998PluginExecutionConfigTest.java
@@ -31,7 +31,7 @@
* This is a test set for MNG-3998.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng3998PluginExecutionConfigTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
index ba8ffe69a9..b6c302d35b 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4000MultiPluginExecutionsTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-4000.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4000MultiPluginExecutionsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
index bee861caa1..7021d303cb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4007PlatformFileSeparatorTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4007.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4007PlatformFileSeparatorTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
index 7ca5619339..9bcc84997d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4008MergedFilterOrderTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4008.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4008MergedFilterOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
index b77435fe48..8e072e2dd1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4009InheritProfileEffectsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4009.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4009InheritProfileEffectsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
index a46e9fb774..c7ad8653af 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4016PrefixedPropertyInterpolationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4016.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4016PrefixedPropertyInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
index 92e65f7dba..877cd93ba8 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4023ParentProfileOneTimeInjectionTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4023.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4023ParentProfileOneTimeInjectionTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
index bb628ca83e..427ce66787 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4026ReactorDependenciesOrderTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4026.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4026ReactorDependenciesOrderTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
index 4de2c347ae..7f1e2f9833 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4034ManagedProfileDependencyTest.java
@@ -31,7 +31,7 @@
* This is a test set for MNG-4034.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4034ManagedProfileDependencyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
index e5c8f2de17..5992fc1d9d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4068AuthenticatedMirrorTest.java
@@ -43,7 +43,7 @@
* This is a test set for MNG-4068.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4068AuthenticatedMirrorTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
index 099639da41..1f6f30d862 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4102InheritedPropertyInterpolationTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4102.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4102InheritedPropertyInterpolationTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
index 84d69cedc0..22af1cb2ec 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4106InterpolationUsesDominantProfileTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4106.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4106InterpolationUsesDominantProfileTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
index 2a416397c3..749230d237 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4107InterpolationUsesDominantProfileSourceTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4107.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4107InterpolationUsesDominantProfileSourceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
index 70a4a2afe3..862f9ed801 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4116UndecodedUrlsTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4116.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4116UndecodedUrlsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
index ae517d709a..11e6634f43 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4126ParentProfilesXmlTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4126.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4126ParentProfilesXmlTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
index 7b272b64d8..c164e11a15 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4129PluginExecutionInheritanceTest.java
@@ -31,7 +31,7 @@
* This is a test set for MNG-4129.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4129PluginExecutionInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
index 91b6da0149..1d10bdd6d0 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4150VersionRangeTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-505.
*
* @author Brett Porter
- * @version $Id$
+ *
*/
public class MavenITmng4150VersionRangeTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
index 1dedf1e1fb..40a9852d76 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4166HideCoreCommonsCliTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4166.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4166HideCoreCommonsCliTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
index 37fe061bcf..b228792971 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4189UniqueVersionSnapshotTest.java
@@ -27,7 +27,7 @@
/**
* This is a test set for MNG-4189.
*
- * @version $Id$
+ *
* @author Maria Odea Ching
*/
public class MavenITmng4189UniqueVersionSnapshotTest
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
index dc21e35fc8..9398f29192 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4196ExclusionOnPluginDepTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4196.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng4196ExclusionOnPluginDepTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
index cdfc86b81b..fdcf23cadb 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4199CompileMeetsRuntimeScopeTest.java
@@ -30,7 +30,7 @@
* This is a test set for MNG-4199.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4199CompileMeetsRuntimeScopeTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
index 9597d40c5a..6f726a5147 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4235HttpAuthDeploymentChecksumsTest.java
@@ -55,7 +55,7 @@
* This is a test set for MNG-4235.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4235HttpAuthDeploymentChecksumsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
index dbd3ccc043..1f1badd121 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4238ArtifactHandlerExtensionUsageTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-3506.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng4238ArtifactHandlerExtensionUsageTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
index 82abc56239..cb1a479bd4 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4254SelectableWagonProvidersTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4254.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng4254SelectableWagonProvidersTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
index ea99c85574..41053f9ff1 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4270ArtifactHandlersFromPluginDepsTest.java
@@ -28,7 +28,7 @@
* This is a test set for MNG-4270.
*
* @author John Casey
- * @version $Id$
+ *
*/
public class MavenITmng4270ArtifactHandlersFromPluginDepsTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
index 8505a8c07b..153985da67 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4343MissingReleaseUpdatePolicyTest.java
@@ -45,7 +45,7 @@
* This is a test set for MNG-4343.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4343MissingReleaseUpdatePolicyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
index 5e5d57d160..0d480f47ed 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4348NoUnnecessaryRepositoryAccessTest.java
@@ -38,7 +38,7 @@
* This is a test set for MNG-4348.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4348NoUnnecessaryRepositoryAccessTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
index 4726380191..db290be2ed 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4349RelocatedArtifactWithInvalidPomTest.java
@@ -29,7 +29,7 @@
* This is a test set for MNG-4349.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4349RelocatedArtifactWithInvalidPomTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
index b800314b31..a2c6d73f2f 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4360WebDavSupportTest.java
@@ -38,7 +38,7 @@
* This is a test set for MNG-4360.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4360WebDavSupportTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
index 455f8fd1f3..2374f7edab 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4428FollowHttpRedirectTest.java
@@ -46,7 +46,7 @@
* This is a test set for MNG-4428.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4428FollowHttpRedirectTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
index 04a43af6f5..ec26dee3fa 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4469AuthenticatedDeploymentToCustomRepoTest.java
@@ -45,7 +45,7 @@
* This is a test set for MNG-4469.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4469AuthenticatedDeploymentToCustomRepoTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
index b9746012f2..10d05bb03d 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4470AuthenticatedDeploymentToProxyTest.java
@@ -52,7 +52,7 @@
* This is a test set for MNG-4470.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng4470AuthenticatedDeploymentToProxyTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
index 53e8de1552..8403e5f0a3 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4633DualCompilerExecutionsWeaveModeTest.java
@@ -26,7 +26,7 @@
/**
* This is a test set for MNG-4633.
*
- * @version $Id$
+ *
* @author Kristian Rosenvold
*/
public class MavenITmng4633DualCompilerExecutionsWeaveModeTest
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
index a66270e6f0..d55b09de20 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5000ChildPathAwareUrlInheritanceTest.java
@@ -30,7 +30,7 @@
* variation and not a duplicate of the test for MNG-2006.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class MavenITmng5000ChildPathAwareUrlInheritanceTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
index 45a615e2ec..f163f70ca2 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5175WagonHttpTest.java
@@ -37,7 +37,7 @@
* This is a test set for MNG-5175.
* test correct integration of wagon http: read time out configuration from settings.xml
*
- * @version $Id$
+ *
*/
public class MavenITmng5175WagonHttpTest
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
index 700062cfad..f6f52df419 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5224InjectedSettings.java
@@ -32,7 +32,7 @@
* This is a test set for MNG-5175.
* test correct injection of settings with profiles in ${settings} in mojo
*
- * @version $Id$
+ *
*/
public class MavenITmng5224InjectedSettings
extends AbstractMavenIntegrationTestCase
diff --git a/its/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java b/its/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
index 52cde76d3e..5d18e2908e 100644
--- a/its/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-0870/plugin/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
@@ -35,7 +35,7 @@
* @phase validate
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class LoadMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AbstractRepoMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AbstractRepoMojo.java
index efb19b5b1f..0cfc74ef4f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AbstractRepoMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AbstractRepoMojo.java
@@ -30,7 +30,7 @@
* Provides common code for the install and deploy mojos.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public abstract class AbstractRepoMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java
index 7a69e1839d..c48498836f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class AttachMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java
index b3ecc0a967..2867080099 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/AttachPomMojo.java
@@ -35,7 +35,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class AttachPomMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java
index a82a639d74..54d3315eaa 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/CollectMojo.java
@@ -38,7 +38,7 @@
* Collects user-specified artifacts. This mimics in part the Maven Assembly Plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal collect
*/
public class CollectMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java
index baad6a4fba..2591d92da7 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployFileMojo.java
@@ -38,7 +38,7 @@
* @requiresProject false
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class DeployFileMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
index 4f4e3767bc..2b67299dcf 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
@@ -28,7 +28,7 @@
* Deploys the project artifacts to the distribution repository. This is the essence of the Maven Deploy Plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal deploy
* @phase deploy
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java
index 6d822b7bdd..789674fd59 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallCustomMojo.java
@@ -30,7 +30,7 @@
* @goal install-custom
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class InstallCustomMojo
extends InstallMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
index 28e1ded987..be07137e45 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
@@ -27,7 +27,7 @@
* Installs the project artifacts into the local repository. This is the essence of the Maven Install Plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal install
* @phase install
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ReleaseMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ReleaseMojo.java
index 1713675c01..5e51f25736 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ReleaseMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ReleaseMojo.java
@@ -32,7 +32,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ReleaseMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
index af762795a4..09fa9658aa 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/ResolveMojo.java
@@ -37,7 +37,7 @@
* Resolves user-specified artifacts. This mimics in part the Maven Dependency Plugin and the Maven Surefire Plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal resolve
*/
public class ResolveMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java
index 05dc4a671f..acabcf72d1 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/SetMojo.java
@@ -35,7 +35,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class SetMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/ClassA.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/ClassA.java
index c262cc1272..39490c5288 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/ClassA.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/ClassA.java
@@ -23,7 +23,7 @@
* A test class that is unique to this artifact.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ClassA
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java
index 4b30f4a8cf..ce1f091706 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-a/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java
@@ -24,7 +24,7 @@
* class (with different members) to check class path ordering of dependencies.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class SomeClass
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/ClassB.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/ClassB.java
index 4d0531fc66..e3625eb7c2 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/ClassB.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/ClassB.java
@@ -23,7 +23,7 @@
* A test class that is unique to this artifact.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ClassB
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java
index 5dcdadac77..624dab1832 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/dep-b/src/main/java/org/apache/maven/plugin/coreit/SomeClass.java
@@ -24,7 +24,7 @@
* class (with different members) to check class path ordering of dependencies.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class SomeClass
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java
index 82750240c3..7d0d5c608a 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/AbstractLoadMojo.java
@@ -37,7 +37,7 @@
* Loads classes and/or resources from a class loader and records the results in a properties file.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public abstract class AbstractLoadMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java
index 8acd60fd86..34f5f9da22 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java
@@ -31,7 +31,7 @@
* Assists in evaluating expressions.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
class ExpressionUtil
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java
index 253a84df4f..08748537cc 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/InstanceofMojo.java
@@ -34,7 +34,7 @@
* loader. In other words, checks that types shared with the core realm are imported into the plugin realm.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal instanceof
* @phase initialize
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java
index a714952a7d..bea3e2237e 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadDependenciesMojo.java
@@ -36,7 +36,7 @@
* @requiresDependencyResolution compile
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class LoadDependenciesMojo
extends AbstractLoadMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
index a793cc57ad..f323f059fe 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/LoadMojo.java
@@ -30,7 +30,7 @@
* @phase initialize
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class LoadMojo
extends AbstractLoadMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
index 21cc25fd14..332dcc759b 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/main/java/org/apache/maven/plugin/coreit/PropertiesUtil.java
@@ -31,7 +31,7 @@
* Assists in handling properties.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
class PropertiesUtil
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java
index 6459cd3c36..53c5e97a97 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-class-loader/maven-it-plugin-class-loader/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java
@@ -28,7 +28,7 @@
/**
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ExpressionUtilTest
extends TestCase
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java
index c8b1694b4e..b96b602dac 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/AppendConfigMojo.java
@@ -35,7 +35,7 @@
* @phase validate
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class AppendConfigMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/Bean.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/Bean.java
index 93428f4463..3f2303468e 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/Bean.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/Bean.java
@@ -23,7 +23,7 @@
* A bean to receive mojo configuration.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class Bean
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java
index 21667ecff1..a295c68ec1 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CliConfigMojo.java
@@ -34,7 +34,7 @@
* @phase validate
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class CliConfigMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
index 9d61d6b087..53d450e8cf 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/ConfigMojo.java
@@ -36,7 +36,7 @@
* Dumps this mojo's configuration into a properties file.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal config
* @phase validate
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java
index a304b0a8d4..3fc60eea74 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomConfigMojo.java
@@ -36,7 +36,7 @@
* @configurator coreit
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class CustomConfigMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java
index cd8433fe14..62fbb2dc2a 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-clean-plugin/src/main/java/org/apache/maven/plugin/coreit/CleanMojo.java
@@ -34,7 +34,7 @@
* @phase clean
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class CleanMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
index 1a6952566a..118f0080ff 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
@@ -34,7 +34,7 @@
* @phase compile
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class CompileMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java
index bbfdef91a3..cc0d78d606 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/coreit/TestCompileMojo.java
@@ -34,7 +34,7 @@
* @phase test-compile
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class TestCompileMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
index d6a647faed..04ac241645 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-deploy-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
@@ -34,7 +34,7 @@
* @phase deploy
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class DeployMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java
index fb76c4698b..4e8281a5c6 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/EarMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class EarMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java
index 29a68cbed3..81ef45c2c3 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ear-plugin/src/main/java/org/apache/maven/plugin/coreit/GenerateApplicationXmlMojo.java
@@ -34,7 +34,7 @@
* @phase generate-resources
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class GenerateApplicationXmlMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java
index 2167862083..adf31ec6dc 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-ejb-plugin/src/main/java/org/apache/maven/plugin/coreit/EjbMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class EjbMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
index 829b60e39b..9b07897ca0 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-install-plugin/src/main/java/org/apache/maven/plugin/coreit/InstallMojo.java
@@ -34,7 +34,7 @@
* @phase install
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class InstallMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
index 1410b4a1fc..ba7dba3b84 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-jar-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class JarMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
index 62692026d2..dfde4677bc 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-javadoc-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class JarMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java
index 50e0a41cbf..30e54e6c48 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/AddPluginArtifactMetadataMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class AddPluginArtifactMetadataMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java
index a7ed586812..599571a8fe 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/DescriptorMojo.java
@@ -34,7 +34,7 @@
* @phase generate-resources
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class DescriptorMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java
index fcd19a5c63..ae5e7dd645 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/coreit/UpdateRegistryMojo.java
@@ -34,7 +34,7 @@
* @phase install
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class UpdateRegistryMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java
index 672affe668..ab06615726 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-rar-plugin/src/main/java/org/apache/maven/plugin/coreit/RarMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class RarMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
index ab4d2ac061..89b7dd46af 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/ResourcesMojo.java
@@ -33,7 +33,7 @@
* Creates a text file in the project base directory.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal resources
* @phase process-resources
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java
index d9ff850224..bd8964a3db 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-resources-plugin/src/main/java/org/apache/maven/plugin/coreit/TestResourcesMojo.java
@@ -34,7 +34,7 @@
* @phase process-test-resources
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class TestResourcesMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java
index de5d830834..6e21b0d851 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/AttachDescriptorMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class AttachDescriptorMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
index 93dbc24505..953c4ba41c 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/DeployMojo.java
@@ -34,7 +34,7 @@
* @phase site-deploy
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class DeployMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java
index 1ccc673712..da770a6c11 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-site-plugin/src/main/java/org/apache/maven/plugin/coreit/SiteMojo.java
@@ -34,7 +34,7 @@
* @phase site
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class SiteMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
index caebec5b18..e94854b058 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-source-plugin/src/main/java/org/apache/maven/plugin/coreit/JarMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class JarMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
index 408dbbe002..e70d52d708 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
@@ -34,7 +34,7 @@
* @phase test
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class TestMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java
index 211ee23c87..7399694698 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-core-stubs/maven-war-plugin/src/main/java/org/apache/maven/plugin/coreit/WarMojo.java
@@ -34,7 +34,7 @@
* @phase package
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class WarMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
index 8b4e9ee17f..2e4124c838 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
@@ -35,7 +35,7 @@
* Provides common services for all mojos of this plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public abstract class AbstractDependencyMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
index 7f85416c5b..e570d1e515 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
@@ -31,7 +31,7 @@
* dependencies are dumped.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal aggregate-test
* @requiresDependencyCollection test
* @aggregator true
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
index 3ca9d8c5e6..055eb312a8 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
@@ -29,7 +29,7 @@
* @requiresDependencyCollection compile
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class CompileMojo
extends AbstractDependencyMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
index b76dfd4331..466721f2e8 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
@@ -29,7 +29,7 @@
* @requiresDependencyCollection runtime
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class RuntimeMojo
extends AbstractDependencyMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
index 80e618adf4..e470848e48 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-collection/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
@@ -29,7 +29,7 @@
* @requiresDependencyCollection test
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class TestMojo
extends AbstractDependencyMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
index 3ecf9b23bf..0bbd86ba28 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AbstractDependencyMojo.java
@@ -40,7 +40,7 @@
* Provides common services for all mojos of this plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public abstract class AbstractDependencyMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
index 38e8a8c784..f52bee98cf 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/AggregateTestMojo.java
@@ -31,7 +31,7 @@
* dependencies are dumped.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal aggregate-test
* @requiresDependencyResolution test
* @aggregator true
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
index 6d81bdbc2b..e0b6021ab3 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileMojo.java
@@ -31,7 +31,7 @@
* @requiresDependencyResolution compile
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class CompileMojo
extends AbstractDependencyMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
index 229e62e56b..da2f1e5def 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/CompileRuntimeMojo.java
@@ -31,7 +31,7 @@
* @requiresDependencyResolution compile+runtime
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class CompileRuntimeMojo
extends AbstractDependencyMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ForkTestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ForkTestMojo.java
index e99bf0fa0f..6ff2d707fe 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ForkTestMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ForkTestMojo.java
@@ -29,7 +29,7 @@
* @execute goal="test"
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ForkTestMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/InjectMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/InjectMojo.java
index 1f21b3c733..56841ce9f0 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/InjectMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/InjectMojo.java
@@ -34,7 +34,7 @@
* Injects artifacts from the plugin into the dependency artifacts of the project.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal inject
*/
public class InjectMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java
index cc58125ffa..b99b9e7a4f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/ResolveOneDependencyMojo.java
@@ -39,7 +39,7 @@
* Attempts to resolve a single artifact from dependencies, and logs the results for the Verifier to look at.
*
* @author bimargulies
- * @version $Id$
+ *
* @goal resolve-one-dependency
* @requiresDependencyResolution runtime
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
index 0343267a3f..0d15522f87 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/RuntimeMojo.java
@@ -31,7 +31,7 @@
* @requiresDependencyResolution runtime
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class RuntimeMojo
extends AbstractDependencyMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
index 9af4a35020..8dbb18c6ed 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-dependency-resolution/src/main/java/org/apache/maven/plugin/coreit/TestMojo.java
@@ -31,7 +31,7 @@
* @requiresDependencyResolution test
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class TestMojo
extends AbstractDependencyMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
index 8d3ca7590d..db26472827 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/EvalMojo.java
@@ -54,7 +54,7 @@
* null
. For collections and arrays, the special index "*" can be used to iterate all elements.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal eval
* @phase initialize
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java
index 7c561b510f..6e5738b3bf 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/ExpressionUtil.java
@@ -34,7 +34,7 @@
* Assists in evaluating expressions.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
class ExpressionUtil
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/PropertyUtil.java b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/PropertyUtil.java
index 39293750cc..becb865cb1 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/PropertyUtil.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/main/java/org/apache/maven/plugin/coreit/PropertyUtil.java
@@ -37,7 +37,7 @@
* Assists in serializing primitives and beans into properties for later inspection/verification.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
class PropertyUtil
{
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java
index 88f5bff557..cc5dd52585 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/ExpressionUtilTest.java
@@ -28,7 +28,7 @@
/**
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ExpressionUtilTest
extends TestCase
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java
index 8b46cabc03..df39b3e095 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-expression/src/test/java/org/apache/maven/plugin/coreit/PropertyUtilTest.java
@@ -28,7 +28,7 @@
/**
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class PropertyUtilTest
extends TestCase
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java
index d4472b7449..585b552835 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/AbstractLogMojo.java
@@ -33,7 +33,7 @@
* Provides common services for the mojos of this plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public abstract class AbstractLogMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java
index 8cc7ee78aa..684d4f74fc 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogSeparatorMojo.java
@@ -25,7 +25,7 @@
* Appends a separator line to the log file.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal log-separator
* @phase initialize
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java
index 0f67b56006..ddba423a88 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/LogStringMojo.java
@@ -28,7 +28,7 @@
* @phase initialize
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class LogStringMojo
extends AbstractLogMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/ResetMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/ResetMojo.java
index 6faf425b5c..a9ebe19bba 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/ResetMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-log-file/src/main/java/org/apache/maven/plugin/coreit/ResetMojo.java
@@ -28,7 +28,7 @@
* @phase initialize
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ResetMojo
extends AbstractLogMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
index 5f74d1a6ea..0bffe919da 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-log4j/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
@@ -36,7 +36,7 @@
* @goal it
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ItMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
index cd81f583a7..01f0555f21 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
@@ -31,7 +31,7 @@
* Requires a component with a non-default role hint and dumps this hint to a properties file.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal it
* @phase initialize
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-optional-mojos/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-optional-mojos/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
index 161c752bac..0dc49ea173 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-optional-mojos/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-optional-mojos/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
@@ -28,7 +28,7 @@
/**
* Creates an empty file to prove this goal was executed.
*
- * @version $Id$
+ *
* @goal touch
*/
public class TouchMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
index 197b7f4f9c..bbe4427237 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-packaging/src/main/java/org/apache/maven/plugin/coreit/PackagingMojo.java
@@ -29,7 +29,7 @@
* Creates an empty file to prove this goal was executed.
*
* @author Brett Porter
- * @version $Id$
+ *
* @goal package
*/
public class PackagingMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
index ca335f5930..98cd5ef5b7 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-project/src/main/java/org/apache/maven/plugin/coreit/BuildRemotePomMojo.java
@@ -34,7 +34,7 @@
* Builds the remote POMs of user-specified artifacts. This mimics in part the Maven Remote Resources Plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal remote-pom
*/
public class BuildRemotePomMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
index a26a23ac29..e58c2d12cb 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/ItMojo.java
@@ -33,7 +33,7 @@
* Requires a singleton component in various ways and dumps the ids to a properties file.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal it
* @phase initialize
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java
index a733de1e47..2fa822b235 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/GenerateMojo.java
@@ -36,7 +36,7 @@
* Generates the available/configured reports.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal generate
* @phase site
* @requiresReports true
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java
index c89052a422..74149db4c6 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/InfoReport.java
@@ -40,7 +40,7 @@
* @goal info
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class InfoReport
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java
index 4b980cb769..3d7933716b 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-site/src/main/java/org/apache/maven/plugin/coreit/ListMojo.java
@@ -38,7 +38,7 @@
* @requiresReports true
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class ListMojo
extends AbstractMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
index 8efdb9ba98..eb829e2e03 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpAuthMojo.java
@@ -35,7 +35,7 @@
* Dumps the authentication info registered with the wagon manager for a server to a properties file.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal dump-auth
* @phase validate
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
index 62161b42c3..4b140a33ce 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LoadResourceMojo.java
@@ -39,7 +39,7 @@
* class loader it came from which is otherwise not accessible to a plugin.
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
* @goal load-resource
* @phase validate
*/
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java
index 850e534702..8ebf3de051 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/LookupWagonMojo.java
@@ -40,7 +40,7 @@
* @phase validate
*
* @author Benjamin Bentmann
- * @version $Id$
+ *
*/
public class LookupWagonMojo
extends AbstractMojo
diff --git a/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java b/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java
index 420ce00514..f8026864d4 100644
--- a/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java
+++ b/its/core-it-support/maven-it-sample/src/test/java/org/apache/maven/it/MavenITmngXXXXDescriptionOfProblemTest.java
@@ -37,7 +37,7 @@
* phases. See more information inline in the code.
*
* @author Brian Fox
- * @version $Id$
+ *
*/
public class MavenITmngXXXXDescriptionOfProblemTest
extends AbstractMavenIntegrationTestCase