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 2f0455fbd3..3145ecbb7b 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-172. - * + * * @author John Casey * */ 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 6b2ebe4476..fadb8b829c 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-172. - * + * * @author John Casey * */ 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 23948e75d1..c0007e2cfd 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-607. - * + * * @author John Casey * */ 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 82dddd3c5c..662346eea2 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-607. - * + * * @author John Casey * */ 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 05f846844f..6501be7fa0 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-607. - * + * * @author John Casey * */ 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 e459c2a11f..149faf4053 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-607. - * + * * @author John Casey * */ 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 e52a7ac6b4..ed00423188 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-598. - * + * * @author Brett Porter * */ 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 6a8261f802..5424220946 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-598. - * + * * @author Brett Porter * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java index feb260e98a..ad951d3f16 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0051ReleaseProfileTest.java @@ -28,10 +28,10 @@ public class MavenIT0051ReleaseProfileTest extends AbstractMavenIntegrationTestCase { - public MavenIT0051ReleaseProfileTest() - { + public MavenIT0051ReleaseProfileTest() + { super( "(2.0.2,)" ); - } + } /** * Test source attachment when -DperformRelease=true is specified. diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java index 816d9e85ca..965ecdf939 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0063SystemScopeDependencyTest.java @@ -51,7 +51,7 @@ public class MavenIT0063SystemScopeDependencyTest List lines = verifier.loadLines( "target/compile.txt", "UTF-8" ); assertEquals( 2, lines.size() ); - assertEquals( new File( testDir, "jdk/lib/tools.jar").getCanonicalFile(), + assertEquals( new File( testDir, "jdk/lib/tools.jar").getCanonicalFile(), new File( (String) lines.get(1) ).getCanonicalFile() ); } 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 bf8600d435..d2e04b8703 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-885. - * + * * @author John Casey * */ 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 f725cabd09..f79fd36549 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-885. - * + * * @author John Casey * */ 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 a60afc4f77..26c96d0176 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1898. - * + * * @author John Casey * */ 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 572d3f0911..8cae967c69 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1898. - * + * * @author John Casey * */ 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 af1f889e7f..6f9ff1b908 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 bf3a1cae07..300754be2b 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 ffc116553d..ae801c5036 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 fb6893f9a2..42557cf002 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 b434ca8153..efb579d24a 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 e496161570..f2633746f1 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 6bfd6236bf..2927e2c25b 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 3febff5ae7..d077d2c33a 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 293841980c..3f940a9d40 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann * */ 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 9f58f55976..807b91ae35 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 @@ -26,7 +26,7 @@ import java.io.File; import java.util.Properties; /** - * + * * @author Benjamin Bentmann * */ @@ -53,7 +53,7 @@ public class MavenIT0139InterpolationWithProjectPrefixTest verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + Properties props = verifier.loadProperties( "target/interpolated.properties" ); String prefix = "project.properties."; 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 2df4b04a3e..6e60d52452 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 @@ -26,7 +26,7 @@ import java.io.File; import java.util.Properties; /** - * + * * @author Benjamin Bentmann * */ @@ -53,7 +53,7 @@ public class MavenIT0140InterpolationWithPomPrefixTest verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + Properties props = verifier.loadProperties( "target/interpolated.properties" ); String prefix = "project.properties."; 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 dd96bd3ac7..ef668229cb 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 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Properties; /** - * + * * @author Benjamin Bentmann * */ 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 28d1bf5e84..408aad12b9 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 @@ -27,7 +27,7 @@ import java.util.List; import java.util.Properties; /** - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java index 43e00948f1..472dc31775 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenIT0145ReactorWithIncludesExcludesTest.java @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * + * * @author Benjamin Bentmann */ public class MavenIT0145ReactorWithIncludesExcludesTest 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 57aab46144..bb2478bb92 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-95. - * + * * @author John Casey * */ 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 2838cfc2d4..4251b7e884 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-249. - * + * * @author Brett Porter * */ 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 1d33246469..fb0d31c6c1 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-282. - * + * * @author John Casey * */ 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 f9caae745b..ee438989c2 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-294. - * + * * @author John Casey * */ 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 59c7708884..653f011a99 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-377. - * + * * @author John Casey * */ 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 c522cd7124..af546e60ce 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-449. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java index 44f70a07b2..2139a9d0e3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0461TolerateMissingDependencyPomTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-461. - * + * * @author Benjamin Bentmann */ public class MavenITmng0461TolerateMissingDependencyPomTest 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 0feec2aaf3..833486583c 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-469. - * + * * @author Benjamin Bentmann * */ 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 2eb3908906..bd845280b9 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-471. - * + * * @author Brett Porter * */ 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 b781bae9c9..0c3d0c793b 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-479. - * + * * @author Benjamin Bentmann * */ 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 63ea1456c4..ac858e0b69 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-496. - * + * * @author John Casey * */ 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 c52c977a85..74e4d64f0c 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 @@ -27,7 +27,7 @@ import java.util.Collection; /** * This is a test set for MNG-505. - * + * * @author Brett Porter * */ @@ -35,7 +35,7 @@ public class MavenITmng0505VersionRangeTest extends AbstractMavenIntegrationTestCase { /** - * Oleg 2009.04.30: the same functionality but simpler - no multiple ranges - syntax + * Oleg 2009.04.30: the same functionality but simpler - no multiple ranges - syntax * is tested in MNG-4150 */ public MavenITmng0505VersionRangeTest() 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 c4b2419176..b4be99c744 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-507. - * + * * @author Brett Porter * */ 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 10b2d75e57..16ec86d6ed 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-522. - * + * * @author John Casey * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java index 6a0698c011..128f839ef1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng0553SettingsAuthzEncryptionTest.java @@ -44,7 +44,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-553. - * + * * @author Benjamin Bentmann */ public class MavenITmng0553SettingsAuthzEncryptionTest @@ -164,7 +164,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest verifier.filterFile( "security-template.xml", "settings~security.xml", "UTF-8", filterProps ); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps ); - verifier.getSystemProperties().setProperty( "settings.security", + verifier.getSystemProperties().setProperty( "settings.security", new File( testDir, "settings~security.xml" ).getAbsolutePath() ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); @@ -222,7 +222,7 @@ public class MavenITmng0553SettingsAuthzEncryptionTest return line; } } - + return null; } 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 9e9926eef4..3a02ef4e88 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-557. - * + * * @author John Casey * */ 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 4b254a346e..843fbd3448 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-612. - * + * * @author Mark Hobson * */ 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 1cbb4c7c0a..88ca63813f 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-666. - * + * * @author John Casey * */ 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 d9cb9630e7..59c78740c3 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 @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-674 and * MNG-4997. - * + * * @author John Casey * */ 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 411a5ea8bc..869ed68dde 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-680. - * + * * @author Brett Porter * */ 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 0cba5f004a..3e1111ef0e 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-731. - * + * * @author John Casey * */ 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 730ff9fbbd..2816a1f54b 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-761. - * + * * @author Brett Porter * */ 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 35658a2a5c..ab314c7e74 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 @@ -38,7 +38,7 @@ import java.util.Properties; /** * This is a test set for MNG-768. - * + * * @author John Casey * */ 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 a05c4c39cf..982488f5a5 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-773. - * + * * @author John Casey * */ 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 2da7e85952..9b4d8cc0ae 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-781. - * + * * @author John Casey * */ 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 51dc2caa9e..806aa83fbf 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-786. - * + * * @author John Casey * */ 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 476f6d08bb..772cf84c3c 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-814. - * + * * @author John Casey * */ 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 070969199c..8b5ffcc7bb 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 @@ -28,7 +28,7 @@ import java.util.Collections; /** * This is a test set for MNG-818. - * + * * @author Brett Porter * */ 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 342038db76..061acf425b 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 @@ -27,7 +27,7 @@ import java.util.Collection; /** * This is a test set for MNG-820. - * + * * @author Brett Porter * */ 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 a190083c58..5b896c8b68 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-823. - * + * * @author John Casey * */ 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 59f3eced26..33d9ce85a9 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 @@ -27,7 +27,7 @@ import java.io.File; /** * This is a test set for MNG-836. - * + * * @author Benjamin Bentmann * */ 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 07ada98135..8bde6f3e25 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-848. - * + * * @author Benjamin Bentmann * */ 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 521acfd956..49e72c470b 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 @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-866 and * MNG-160. - * + * * @author Benjamin Bentmann * */ 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 d7dc6da648..247683e55e 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-870. - * + * * @author Benjamin Bentmann * */ 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 9776f39f6a..f5578c9f68 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-956. - * + * * @author Brett Porter * */ 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 74f6af027b..26fa397bcf 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-985. - * + * * @author John Casey * */ 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 3e8e4a5c59..527167d482 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-1052. - * + * * @author John Casey * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java index 2046c9dd12..e826378b80 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1073AggregatorForksReactorTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-1073. - * + * * @author Benjamin Bentmann */ public class MavenITmng1073AggregatorForksReactorTest 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 f4c80bf2b6..a5c97f8627 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-1088. - * + * * @author Brett Porter * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java index 235f1e041e..4acc22f5ed 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1142VersionRangeIntersectionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-1142. - * + * * @author Benjamin Bentmann */ public class MavenITmng1142VersionRangeIntersectionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java index 3e6c9a40d1..4de23cb1ea 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1144MultipleDefaultGoalsTest.java @@ -27,7 +27,7 @@ import java.util.Collections; /** * This is a test set for MNG-1144. - * + * * @author Benjamin Bentmann */ public class MavenITmng1144MultipleDefaultGoalsTest 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 780c1d206c..25ad39d79c 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 @@ -27,7 +27,7 @@ import java.util.Collection; /** * This is a test set for MNG-1233. - * + * * @author Brett Porter * */ @@ -59,15 +59,15 @@ public class MavenITmng1233WarDepWithProvidedScopeTest verifier.resetStreams(); Collection compileArtifacts = verifier.loadLines( "target/compile.txt", "UTF-8" ); - assertTrue( compileArtifacts.toString(), + assertTrue( compileArtifacts.toString(), compileArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" ) ); - assertTrue( compileArtifacts.toString(), + assertTrue( compileArtifacts.toString(), compileArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" ) ); Collection runtimeArtifacts = verifier.loadLines( "target/runtime.txt", "UTF-8" ); - assertTrue( runtimeArtifacts.toString(), + assertTrue( runtimeArtifacts.toString(), runtimeArtifacts.contains( "org.apache.maven.its.it0083:direct-dep:jar:0.1" ) ); - assertFalse( runtimeArtifacts.toString(), + assertFalse( runtimeArtifacts.toString(), runtimeArtifacts.contains( "org.apache.maven.its.it0083:trans-dep:jar:0.1" ) ); } 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 d334f67080..764e8a5764 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-1323. - * + * * @author Benjamin Bentmann * */ @@ -59,7 +59,7 @@ public class MavenITmng1323AntrunDependenciesTest verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); - verifier.executeGoal( "validate" ); + verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); 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 4503a67798..784aa86866 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-1349. - * + * * @author Benjamin Bentmann * */ 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 2f0fbe36c6..37148ed608 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1415. - * + * * */ public class MavenITmng1415QuotedSystemPropertiesTest 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 7c24af0506..b69f0c070b 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 @@ -27,7 +27,7 @@ import java.io.File; /** * This is a test set for MNG-1491. - * + * * */ public class MavenITmng1491ReactorArtifactIdCollisionTest 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 cc2c0eaeba..fa71adf75d 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-1493. - * + * * */ public class MavenITmng1493NonStandardModulePomNamesTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java index 27751a2b5f..62eb5a0052 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1701DuplicatePluginTest.java @@ -51,7 +51,7 @@ public class MavenITmng1701DuplicatePluginTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + List lines = verifier.loadLines( verifier.getLogFileName(), "UTF-8" ); boolean foundWarning = false; for ( String line : lines ) @@ -62,7 +62,7 @@ public class MavenITmng1701DuplicatePluginTest foundWarning = true; } } - + assertTrue( "Duplicate plugin warning wasn't generated.", foundWarning ); } 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 5dbfeebe6d..0ec07948df 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1703. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java index 9f9199634d..62e1bb4e9c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1830ShowVersionTest.java @@ -28,7 +28,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-1830. - * + * * @author Brett Porter * @version $Id: ba3c28edf533dba3dfa60e384a670575e0cd6901 $ */ @@ -60,8 +60,8 @@ public class MavenITmng1830ShowVersionTest List lines = verifier.loadFile( verifier.getBasedir(), verifier.getLogFileName(), false ); for( String line : lines ) { - if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" ) - || line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" ) + if ( line.matches( "^Apache Maven (.*?) \\(r[0-9]+; .*\\)$" ) + || line.matches( "^Apache Maven (.*?) \\(rNON-CANONICAL_[-_0-9]+.+?; .*\\)$" ) || line.matches( "^Apache Maven (.*?) \\([0-9a-z]{5,41}; .*\\)$" ) ) { apacheVersionInTheRightFormatWasFound = true; @@ -73,7 +73,7 @@ public class MavenITmng1830ShowVersionTest break; } } - + assertTrue( apacheVersionInTheRightFormatWasFound ); - } + } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java index b3166f5879..61cc281058 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng1895ScopeConflictResolutionTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-1895. - * + * * @author Benjamin Bentmann */ public class MavenITmng1895ScopeConflictResolutionTest 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 20a42b6638..223878b5e4 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-1908. - * + * * @author Brett Porter * */ @@ -39,7 +39,7 @@ public class MavenITmng1908LegacySnapshotUpdateTest // legacy layout no longer supported in Maven 3.x (see MNG-4204) super( "[2.0,3.0-alpha-3)" ); } - + /** * Test that legacy repositories with legacy snapshots (i.e. without metadata) download correctly. */ 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 af0c15b485..8993b41565 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1957. - * + * * @author Benjamin Bentmann * */ 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 b99b54f515..b54ac70712 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1992. - * + * * @author Benjamin Bentmann * */ 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 2a6b5c190a..debc08fb83 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1995. - * + * * @author Benjamin Bentmann * */ 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 2c05d07d3e..fa36ca8ff1 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-1999. - * + * * @author Benjamin Bentmann * */ 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 dbdd2a66f0..9725d9b183 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2006. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java index 7cdf7c3428..2168b09163 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2045testJarDependenciesBrokenInReactorTest.java @@ -27,15 +27,15 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2045: - * Simple IT test invoking maven in a reactor with 2 projects -- - * first project produces a test-jar, which is required to - * compile second project. + * Simple IT test invoking maven in a reactor with 2 projects -- + * first project produces a test-jar, which is required to + * compile second project. * * @author Brian Fox * @author mikko.koponen@ri.fi */ public class MavenITmng2045testJarDependenciesBrokenInReactorTest - extends AbstractMavenIntegrationTestCase + extends AbstractMavenIntegrationTestCase { public MavenITmng2045testJarDependenciesBrokenInReactorTest() @@ -75,7 +75,7 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest * Different Maven versions use the test-classes directory or the assembled test JAR but all that matters here * is merely that we have the test classes on the classpath. */ - assertTrue( "test classes missing in " + classpath, + assertTrue( "test classes missing in " + classpath, classpath.contains( "test" ) || classpath.contains( "test.jar" ) || classpath.contains( "test-jar-0.1-SNAPSHOT-tests.jar" ) ); } @@ -83,7 +83,7 @@ public class MavenITmng2045testJarDependenciesBrokenInReactorTest private void assertNotMainClasses( List classpath ) { // When depending on the test JAR of some module, we shouldn't get its main classes - assertFalse( "main classes present in " + classpath, + assertFalse( "main classes present in " + classpath, classpath.contains( "main" ) ); } 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 77677d571b..8c2a0db885 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2052. - * + * * */ public class MavenITmng2052InterpolateWithSettingsProfilePropertiesTest 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 6538c2ee47..f198cca4ea 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 @@ -28,7 +28,7 @@ import java.util.Arrays; /** * This is a test set for MNG-2054. - * + * * */ public class MavenITmng2054PluginExecutionInheritanceTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java index c45aedcc92..b4c9ce5cff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2068ReactorRelativeParentsTest.java @@ -30,9 +30,9 @@ import org.apache.maven.it.util.ResourceExtractor; * Verify that a multimodule build, built from the middle node in an inheritance hierarchy, * can find all parent POMs necessary to build each project in the reactor using ONLY the * relativePath from the parent specification (in this case, the implied one of '../pom.xml'). - * + * * @author jdcasey - * + * */ public class MavenITmng2068ReactorRelativeParentsTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java index c9c8fef007..34227a1320 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2098. - * + * * @author Benjamin Bentmann */ public class MavenITmng2098VersionRangeSatisfiedFromWrongRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java index 1332aca3c0..85e24aac72 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2103PluginExecutionInheritanceTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-2103. - * + * * @author Benjamin Bentmann */ public class MavenITmng2103PluginExecutionInheritanceTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java index 7d1767edef..4360fe8e00 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2123VersionRangeDependencyTest.java @@ -31,12 +31,12 @@ import org.apache.maven.it.util.ResourceExtractor; public class MavenITmng2123VersionRangeDependencyTest extends AbstractMavenIntegrationTestCase { - + public MavenITmng2123VersionRangeDependencyTest() { super( "(2.0.8,)" ); } - + public void testitMNG2123() throws Exception { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java index 4f448c9273..9c3acf5837 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2124PomInterpolationWithParentValuesTest.java @@ -51,7 +51,7 @@ public class MavenITmng2124PomInterpolationWithParentValuesTest verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + Properties props = verifier.loadProperties( "target/parent.properties" ); assertEquals( "parent, child, parent, child", props.getProperty( "project.description" ) ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java index b1894eb395..c98e61228d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2135PluginBuildInReactorTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2135. - * + * * @author Benjamin Bentmann */ public class MavenITmng2135PluginBuildInReactorTest 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 99d105cb80..a35cf6f2c4 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2136. - * + * * */ public class MavenITmng2136ActiveByDefaultProfileTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java index 6acc952957..a3a2c3db1c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2140ReactorAwareDepResolutionWhenForkTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-2140. - * + * * @author Benjamin Bentmann */ public class MavenITmng2140ReactorAwareDepResolutionWhenForkTest 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 9d49af6dc3..cdba802551 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2174. - * + * * @author Benjamin Bentmann * */ 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 00bf1cfaa0..4a72f3eebf 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2201. - * + * * */ public class MavenITmng2201PluginConfigInterpolationTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java index bef67a745d..8843aa3d0c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2222OutputDirectoryReactorResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-2222. - * + * * @author Benjamin Bentmann */ public class MavenITmng2222OutputDirectoryReactorResolutionTest 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 2dd72ffadf..c25838c317 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2228. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java index a5a9c036cb..260e6b8783 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2254PomEncodingTest.java @@ -28,9 +28,9 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2254: * it tests that pom.xml encoding is properly detected. - * + * * @author Hervé Boutemy - * + * */ public class MavenITmng2254PomEncodingTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java index ae0283d62a..221fbfceab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2276ProfileActivationBySettingsPropertyTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2276. - * + * * @author Benjamin Bentmann */ public class MavenITmng2276ProfileActivationBySettingsPropertyTest 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 35a6b814fb..525ff61a9b 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2277. - * + * * @author Brian Fox * */ 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 8d00147f4a..c28b406871 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2293. - * + * * */ public class MavenITmng2293CustomPluginParamImplTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java index 1cdc65363c..8582ad0b62 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java @@ -45,7 +45,7 @@ import static org.eclipse.jetty.http.HttpVersion.HTTP_1_1; /** * This is a test set for MNG-2305. - * + * * @author Benjamin Bentmann */ public class MavenITmng2305MultipleProxiesTest 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 d1ca958cb7..2f46491b15 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2309. - * + * * @author Benjamin Bentmann * */ 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 b7e8e8b56f..93716785df 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2318. - * + * * */ public class MavenITmng2318LocalParentResolutionTest 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 7c086290af..3b210964e7 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2339. - * + * * */ public class MavenITmng2339BadProjectInterpolationTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java index 8066defd6a..4620bde44e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2363BasedirAwareFileActivatorTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2363. - * + * * @author Benjamin Bentmann */ public class MavenITmng2363BasedirAwareFileActivatorTest 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 3597ef6a61..e5ed71e4a3 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 @@ -33,7 +33,7 @@ import java.util.Properties; /** * This is a test set for MNG-2387. - * + * * @author Brett Porter * */ @@ -117,8 +117,8 @@ public class MavenITmng2387InactiveProxyTest throws Exception { Verifier verifier = newVerifier( testDir.getAbsolutePath() ); - - Properties properties = verifier.newDefaultFilterProperties(); + + Properties properties = verifier.newDefaultFilterProperties(); properties.setProperty( "@host@", InetAddress.getLocalHost().getCanonicalHostName() ); properties.setProperty( "@port@", Integer.toString( port ) ); properties.setProperty( "@proxyPort@", Integer.toString( proxyPort ) ); 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 fbaa79b280..3803d21978 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2432 - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java index 31ab65b66d..2e9b295ae0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2486TimestampedDependencyVersionInterpolationTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-2486. - * + * * @author Benjamin Bentmann */ public class MavenITmng2486TimestampedDependencyVersionInterpolationTest 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 86481ac573..807d3ac8e2 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2539. - * + * * */ public class MavenITmng2539PluginDependenciesComeFromPluginReposTest 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 2fe5e80fea..551b3fae7d 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 @@ -29,7 +29,7 @@ import java.text.SimpleDateFormat; /** * This is a test set for MNG-2562. - * + * * */ public class MavenITmng2562Timestamp322Test 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 1d607008e5..94476d3fab 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 @@ -29,13 +29,13 @@ import java.text.SimpleDateFormat; /** * This is a test set for MNG-2562. - * + * * */ public class MavenITmng2562TimestampTest extends AbstractMavenIntegrationTestCase { - + public MavenITmng2562TimestampTest() { super( "[2.1.0-M1,3.2.2)" ); // 2.1.0+ only diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java index fcc01136ab..853e162993 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2576MakeLikeReactorTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2576. - * + * * @author Benjamin Bentmann */ public class MavenITmng2576MakeLikeReactorTest @@ -35,7 +35,7 @@ public class MavenITmng2576MakeLikeReactorTest public MavenITmng2576MakeLikeReactorTest() { - super( "[2.1.0,)" ); + super( "[2.1.0,)" ); } private void clean( Verifier verifier ) @@ -186,7 +186,7 @@ public class MavenITmng2576MakeLikeReactorTest { // as per MNG-5230 requiresMavenVersion( "[3.2,)" ); - + File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-2576" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java index fd8c88fea5..4031424553 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2577SettingsXmlInterpolationTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2577. - * + * * @author Benjamin Bentmann */ public class MavenITmng2577SettingsXmlInterpolationTest 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 09653e8fbd..61177902bd 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2591. - * + * * @author Benjamin Bentmann * */ 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 6f022d1add..f717e6d632 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2605. - * + * * @author Benjamin Bentmann * */ 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 1cc54b3cce..fb81bf1b1e 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2668. - * + * * */ public class MavenITmng2668UsePluginDependenciesForSortingTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java index 149c04e3cc..fa21ebd5b8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2690MojoLoadingErrorsTest.java @@ -30,11 +30,11 @@ import junit.framework.TestCase; /** * This is a test set for MNG-2690. - * + * * It checks, at the most basic level possible, that the plugin manager is intercepting things like * {@link NoClassDefFoundError} and ComponntLookupException, then throwing user-friendly errors when loading and * configuring a mojo. - * + * * @author jdcasey */ public class MavenITmng2690MojoLoadingErrorsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java index 7f52451ae7..447e2c16c3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2693SitePluginRealmTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2693. - * + * * @author Benjamin Bentmann */ public class MavenITmng2693SitePluginRealmTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java index 49c36083d9..fe5d460905 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2720SiblingClasspathArtifactsTest.java @@ -26,7 +26,7 @@ import java.util.List; /** * This is a test set for MNG-2720. - * + * * This test will ensure that running the 'package' phase on a multimodule build with child * interdependency will result in one child using the JAR of the other child in its compile * classpath, NOT the target/classes directory. This is critical, since sibling projects might @@ -35,7 +35,7 @@ import java.util.List; * sibling were built on its own. * * @author jdcasey - * + * */ public class MavenITmng2720SiblingClasspathArtifactsTest extends AbstractMavenIntegrationTestCase @@ -58,7 +58,7 @@ public class MavenITmng2720SiblingClasspathArtifactsTest verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + List classPath; classPath = verifier.loadLines( "child2/target/compile.txt", "UTF-8" ); @@ -69,7 +69,7 @@ public class MavenITmng2720SiblingClasspathArtifactsTest classPath = verifier.loadLines( "child2/target/test.txt", "UTF-8" ); assertMainJar( classPath ); - + classPath = verifier.loadLines( "child3/target/compile.txt", "UTF-8" ); assertTestJar( classPath ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java index 43cb23ccc2..2d8fd3eb15 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2738ProfileIdCollidesWithCliOptionTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2738. - * + * * @author Benjamin Bentmann */ public class MavenITmng2738ProfileIdCollidesWithCliOptionTest 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 05237b4792..4f4054282e 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2744. - * + * * @author Benjamin Bentmann * */ 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 f58c77dea0..fc220a341d 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2749. - * + * * @author Benjamin Bentmann * */ 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 3100b34eb1..cf84dade2c 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2771 - * + * * @author Mark Hobson * */ 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 5576edc48a..9e48f1f382 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 @@ -29,7 +29,7 @@ import org.apache.maven.shared.utils.io.FileUtils; /** * This is a test set for MNG-2790. - * + * * @author Benjamin Bentmann * */ @@ -71,7 +71,7 @@ public class MavenITmng2790LastUpdatedMetadataTest Date artifactLastUpdated1 = getLastUpdated( metadataArtifactFile ); // sanity check: timestamps shouldn't differ by more than 10 min from now (i.e. timezone is UTC) - assertTrue( artifactVersionLastUpdated1 + " ~ " + now, + assertTrue( artifactVersionLastUpdated1 + " ~ " + now, Math.abs( artifactVersionLastUpdated1.getTime() - now.getTime() ) < 10 * 60 * 1000 ); assertTrue( artifactLastUpdated1 + " ~ " + now, Math.abs( artifactLastUpdated1.getTime() - now.getTime() ) < 10 * 60 * 1000 ); @@ -92,9 +92,9 @@ public class MavenITmng2790LastUpdatedMetadataTest Date artifactLastUpdated2 = getLastUpdated( metadataArtifactFile ); // check that new timestamps are strictly later than from original install - assertTrue( artifactVersionLastUpdated1 + " < " + artifactVersionLastUpdated2, + assertTrue( artifactVersionLastUpdated1 + " < " + artifactVersionLastUpdated2, artifactVersionLastUpdated2.after( artifactVersionLastUpdated1 ) ); - assertTrue( artifactLastUpdated1 + " < " + artifactLastUpdated2, + assertTrue( artifactLastUpdated1 + " < " + artifactLastUpdated2, artifactLastUpdated2.after( artifactLastUpdated1 ) ); } 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 cb7ceb550a..c7c90f9f8d 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2831. - * + * * */ public class MavenITmng2831CustomArtifactHandlerAndCustomLifecycleTest 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 5c8697226c..58b787bb05 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2843. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java index 4e042b38ff..12d48d11d2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2848ProfileActivationByEnvironmentVariableTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2848. - * + * * @author Benjamin Bentmann */ public class MavenITmng2848ProfileActivationByEnvironmentVariableTest 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 66d98d7a68..d826095293 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-2861. - * + * * */ public class MavenITmng2861RelocationsAndRangesTest 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 fd9df07880..464372a8d1 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2865. - * + * * @author Benjamin Bentmann * */ 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 a48355d9d0..d8c272f1a0 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-2871. - * + * * @author Benjamin Bentmann * */ @@ -57,7 +57,7 @@ public class MavenITmng2871PrePackageSubartifactResolutionTest List compileClassPath = verifier.loadLines( "consumer/target/compile.txt", "UTF-8" ); assertEquals( 2, compileClassPath.size() ); - assertEquals( new File( testDir, "ejbs/target/classes" ).getCanonicalFile(), + assertEquals( new File( testDir, "ejbs/target/classes" ).getCanonicalFile(), new File( compileClassPath.get( 1 ).toString() ).getCanonicalFile() ); } 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 52ffc1f20f..45c108fcbf 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2878. - * + * * @author Benjamin Bentmann * */ 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 a7c2fe319d..ded5641bca 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2892. - * + * * @author Benjamin Bentmann * */ 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 5144b0b87f..256dc01d36 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 @@ -29,7 +29,7 @@ import java.util.Collection; * This is a test set for MNG-2921. It naturally includes the * test for the related issue MNG-2877 whose original test was * too weak to prevent this issue. - * + * * @author Benjamin Bentmann * */ 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 981d0a8c89..b7e9f2ba68 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-2926 - * + * * @author Brian Fox * */ @@ -65,7 +65,7 @@ public class MavenITmng2926PluginPrefixOrderTest verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.setLogFileName( "log-default.txt" ); - verifier.filterFile( "settings-default-template.xml", "settings-default.xml", "UTF-8", + verifier.filterFile( "settings-default-template.xml", "settings-default.xml", "UTF-8", verifier.newDefaultFilterProperties() ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings-default.xml" ); @@ -76,7 +76,7 @@ public class MavenITmng2926PluginPrefixOrderTest verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.setLogFileName( "log-custom.txt" ); - verifier.filterFile( "settings-custom-template.xml", "settings-custom.xml", "UTF-8", + verifier.filterFile( "settings-custom-template.xml", "settings-custom.xml", "UTF-8", verifier.newDefaultFilterProperties() ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings-custom.xml" ); 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 4235e8d85f..44fd767be9 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-2972. - * + * * @author Benjamin Bentmann * */ 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 b9917016f5..4bb218c614 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-2994 - * + * * @author Mark Hobson * */ 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 751570aadd..4b5d7b500f 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3004. - * + * * @author Dan Fabulich * */ @@ -136,7 +136,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest verifier.assertFilePresent( "subproject2/target/touch.txt" ); verifier.assertFileNotPresent( "subproject3/target/touch.txt" ); } - + /** * Test fail-never reactor behavior. Forces an exception to be thrown in * the first module, but checks that the second & third module is built and the overall build succeeds. @@ -199,7 +199,7 @@ public class MavenITmng3004ReactorFailureBehaviorMultithreadedTest verifier.assertFilePresent( "subproject2/target/touch.txt" ); verifier.assertFileNotPresent( "subproject3/target/touch.txt" ); } - + // DGF not testing fail fast with multiple real threads since that's a "best effort" attempt to halt the build // The whole build could have finished by the time you try to halt. 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 e5e0b2caac..826f572ae1 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3012. - * + * * @author Benjamin Bentmann * */ 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 da2de369e0..aea26f1f35 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3023 - * + * * @author Mark Hobson * @author jdcasey * @@ -42,7 +42,7 @@ public class MavenITmng3023ReactorDependencyResolutionTest /** * Test that reactor projects are included in dependency resolution. - * + * * In this pass, the dependency artifact should be missing from the local repository, and since the 'compile' phase * has not been called, i.e. the output directory for the compiled classes has not been created yet, the * dependency project artifact should not have a file associated with it. Therefore, the dependency artifact @@ -56,10 +56,10 @@ public class MavenITmng3023ReactorDependencyResolutionTest Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.setLogFileName( "log-a.txt" ); - + verifier.deleteDirectory( "dependency/dependency-classes" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3023" ); - + try { verifier.executeGoal( "validate" ); @@ -77,7 +77,7 @@ public class MavenITmng3023ReactorDependencyResolutionTest /** * Test that reactor projects are included in dependency resolution. - * + * * I this pass, the dependency artifact should have the file $(basedir)/dependency/dependency-classes * (a directory) associated with it, since the 'compile' phase has run. This location should be * present in the compile classpath output from the maven-it-plugin-dependency-resolution:compile @@ -95,7 +95,7 @@ public class MavenITmng3023ReactorDependencyResolutionTest new File( testDir, "dependency/dependency-classes" ).mkdirs(); verifier.deleteDirectory( "consumer/target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3023" ); - + verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); @@ -107,12 +107,12 @@ public class MavenITmng3023ReactorDependencyResolutionTest /** * Test that reactor projects are included in dependency resolution. - * + * * I this pass, the dependency should have been installed, so the dependency artifact should have - * a file of .../dependency-1.jar associated with it, since the 'install' phase has run. This - * location should be present in the compile classpath output from the + * a file of .../dependency-1.jar associated with it, since the 'install' phase has run. This + * location should be present in the compile classpath output from the * maven-it-plugin-dependency-resolution:compile mojo execution. - * + * * Afterwards, the projects are cleaned and a separate Maven call to the 'initialize' phase should succeed, since * the dependency artifact has been installed locally. This second execution should use the jar file * from the local repository in its classpath output. @@ -124,9 +124,9 @@ public class MavenITmng3023ReactorDependencyResolutionTest Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); - + verifier.deleteArtifacts( "org.apache.maven.its.mng3023" ); - + verifier.deleteDirectory( "consumer/target" ); verifier.setLogFileName( "log-c-1.txt" ); verifier.executeGoal( "generate-sources" ); @@ -143,7 +143,7 @@ public class MavenITmng3023ReactorDependencyResolutionTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + compileClassPath = verifier.loadLines( "consumer/target/compile.classpath", "UTF-8" ); assertTrue( compileClassPath.toString(), compileClassPath.contains( "dependency-1.jar" ) ); assertFalse( compileClassPath.toString(), compileClassPath.contains( "dependency-classes" ) ); 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 f8b915582d..8c3cdabac9 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 @@ -28,7 +28,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3038 - * + * * @author Joakim Erdfelt * */ @@ -39,7 +39,7 @@ public class MavenITmng3038TransitiveDepManVersionTest { super( ALL_MAVEN_VERSIONS ); } - + public void testitMNG3038() throws Exception { @@ -49,7 +49,7 @@ public class MavenITmng3038TransitiveDepManVersionTest compileDDep( testDirBase, "D2", "2.0" ); File testProjectDir = new File( testDirBase, "test-project" ); - + Verifier verifier = newVerifier( testProjectDir.getAbsolutePath() ); verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0", "pom" ); verifier.deleteArtifact( "org.apache.maven.its.it0121", "A", "1.0", "jar" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java index 7542ad71cb..3b3efef85b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3043BestEffortReactorResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-3043. - * + * * @author Benjamin Bentmann */ public class MavenITmng3043BestEffortReactorResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java index 36df972e8e..c52e154f9b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3052DepRepoAggregationTest.java @@ -58,7 +58,7 @@ public class MavenITmng3052DepRepoAggregationTest verifier.deleteArtifacts( "org.apache.maven.its.mng3052" ); Properties filterProps = verifier.newDefaultFilterProperties(); verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", filterProps ); - verifier.filterFile( "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom", + verifier.filterFile( "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/template.pom", "repo-d/org/apache/maven/its/mng3052/direct/0.1-SNAPSHOT/direct-0.1-20090517.133956-1.pom", "UTF-8", filterProps ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java index f37c1f5c89..c836803e4a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3057VersionExprTransformationsTest.java @@ -33,10 +33,10 @@ import org.codehaus.plexus.util.xml.pull.XmlPullParserException; * This is a test set for MNG-3057. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3057VersionExprTransformationsTest extends AbstractMavenIntegrationTestCase @@ -53,7 +53,7 @@ public class MavenITmng3057VersionExprTransformationsTest requiresJavaVersion( "[1.5,)" ); File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3057" ); - + File remoteRepo = new File( testDir, "target/deployment" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); @@ -62,7 +62,7 @@ public class MavenITmng3057VersionExprTransformationsTest verifier.deleteDirectory( "level2/target" ); verifier.deleteDirectory( "level2/level3/target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng3057" ); - + Properties properties = verifier.newDefaultFilterProperties(); properties.setProperty( "@deployTo@", remoteRepo.toURI().toURL().toExternalForm() ); @@ -79,7 +79,7 @@ public class MavenITmng3057VersionExprTransformationsTest assertVersions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "mng-3057", "1", "pom" ) ), "1", null ); assertVersions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "level2", "1", "pom" ) ), "1", "1" ); assertVersions( new File( verifier.getArtifactPath( "org.apache.maven.its.mng3057", "level3", "1", "pom" ) ), "1", "1" ); - + assertVersions( new File( remoteRepo, "org/apache/maven/its/mng3057/mng-3057/1/mng-3057-1.pom" ), "1", null ); assertVersions( new File( remoteRepo, "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ), "1", "1" ); assertVersions( new File( remoteRepo, "org/apache/maven/its/mng3057/level2/1/level2-1.pom" ), "1", "1" ); @@ -88,7 +88,7 @@ public class MavenITmng3057VersionExprTransformationsTest private void assertVersions( File file, String version, String parentVersion ) throws XmlPullParserException, IOException { - Xpp3Dom dom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( file ) ); + Xpp3Dom dom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( file ) ); assertEquals( version, dom.getChild( "version" ).getValue() ); Xpp3Dom parent = dom.getChild( "parent" ); if ( parentVersion != null ) @@ -100,6 +100,6 @@ public class MavenITmng3057VersionExprTransformationsTest { assertNull( parent ); } - } + } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java index cb06f30cf3..6daf08383f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3092SnapshotsExcludedFromVersionRangeTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-3092. - * + * * @author Benjamin Bentmann */ public class MavenITmng3092SnapshotsExcludedFromVersionRangeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java index d17d3ae5b0..64ca615e6f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3106ProfileMultipleActivatorsTest.java @@ -26,9 +26,9 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3106: - * it tests that profiles with multiple activators are activated + * it tests that profiles with multiple activators are activated * when any of the activators are on. - * + * */ public class MavenITmng3106ProfileMultipleActivatorsTest extends AbstractMavenIntegrationTestCase @@ -40,9 +40,9 @@ public class MavenITmng3106ProfileMultipleActivatorsTest /** * Test build with two profiles, each with more than one activator. - * The profiles should be activated even though only one of the activators + * The profiles should be activated even though only one of the activators * returns true. - * + * */ public void testProfilesWithMultipleActivators() throws Exception 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 9e32fec730..b7d3143b30 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3122. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java index a0d13b432f..d6fc35f500 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3133UrlNormalizationNotBeforeInterpolationTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3133. - * + * * @author Benjamin Bentmann */ public class MavenITmng3133UrlNormalizationNotBeforeInterpolationTest 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 2504f68689..74dca3fe62 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 @@ -27,7 +27,7 @@ import java.util.Collections; /** * This is a test set for MNG-3139. - * + * * @author Benjamin Bentmann * */ @@ -67,7 +67,7 @@ public class MavenITmng3139UseCachedMetadataOfBlacklistedRepoTest verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); - verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", Collections.singletonMap( "@baseurl@", "http://localhost:63412" ) ); verifier.setLogFileName( "log2.txt" ); verifier.addCliOption( "--settings" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java index 5ac27a37e1..3bd90b400b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3183LoggingToFileTest.java @@ -29,7 +29,7 @@ import java.util.List; /** * This is a test set for MNG-3183. - * + * * @author Benjamin Bentmann */ public class MavenITmng3183LoggingToFileTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java index 18fd1e0a14..2a881f7a8b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3203DefaultLifecycleExecIdTest.java @@ -29,10 +29,10 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3203. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3203DefaultLifecycleExecIdTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java index d1767a79d1..caf4388768 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3208ProfileAwareReactorSortingTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-3208. - * + * * @author Benjamin Bentmann */ public class MavenITmng3208ProfileAwareReactorSortingTest 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 8b8377f7d6..30f742acbe 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3217. - * + * * @author Benjamin Bentmann * */ 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 b298c7aac7..8744bb8910 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3221. - * + * * */ public class MavenITmng3221InfiniteForkingTest 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 b149ff4ed3..061a7f3e23 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3259. - * + * * */ public class MavenITmng3259DepsDroppedInMultiModuleBuildTest 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 4d75c53499..6b27586622 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3271. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java index 0b569636de..51e3610664 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3284UsingCachedPluginsTest.java @@ -34,7 +34,7 @@ public class MavenITmng3284UsingCachedPluginsTest public MavenITmng3284UsingCachedPluginsTest() { - super( "[2.1.0-M2,)" ); + super( "[2.1.0-M2,)" ); } /** @@ -71,7 +71,7 @@ public class MavenITmng3284UsingCachedPluginsTest verifier.deleteDirectory( "mod-b/target" ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); - verifier.executeGoal( "validate" ); + verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java index cff7ece569..fad5ae34a3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3288SystemScopeDirTest.java @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test for MNG-3288. - * + * * @author Benjamin Bentmann */ public class MavenITmng3288SystemScopeDirTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java index 8508a3c36c..680ff24ef2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3297DependenciesNotLeakedToMojoTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-3297. - * + * * @author Benjamin Bentmann */ public class MavenITmng3297DependenciesNotLeakedToMojoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java index 63460ad802..fe05192fa5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3331ModulePathNormalizationTest.java @@ -26,9 +26,9 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3331. - * + * * @author Brian Fox - * + * */ public class MavenITmng3331ModulePathNormalizationTest 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 b720765951..84ca042e1c 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3355. - * + * * */ public class MavenITmng3355TranslatedPathInterpolationTest 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 1e7da3daf4..2798305bf4 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 @@ -27,7 +27,7 @@ import java.util.Arrays; /** * This is a test set for MNG-3372. - * + * * */ public class MavenITmng3372DirectInvocationOfPluginsTest 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 1f1306f11f..eaf0c89cf3 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 @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3379. - * + * * @author Benjamin Bentmann * */ @@ -74,7 +74,7 @@ public class MavenITmng3379ParallelArtifactDownloadsTest "4d96e09f7e93870685a317c574f851b407224415" ); assertMetadata( verifier, gid + "a", "x", "0.2-SNAPSHOT", "e1cfc3a77657fc46bb624dee25c61b290e5b4dd7" ); - + assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "", "jar", "efb7c4046565774cd7e44645e02f06ecdf91098d" ); assertArtifact( verifier, gid + "b", "x", "0.2-SNAPSHOT", "", "pom", 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 df99ec8a5d..cb73756a86 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-3380. - * + * * expected project.getArtifacts() results: * * org.apache.maven.its.mng3380:direct:jar:1:compile @@ -50,7 +50,7 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest * Verify that dependency resolution considers dependency management also for relocated artifacts. */ public void testitMNG3380() - throws Exception + throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3380" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java index f29b591d69..150f90ded8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3394POMPluginVersionDominanceTest.java @@ -46,7 +46,7 @@ public class MavenITmng3394POMPluginVersionDominanceTest public void testitMNG3394a () throws Exception { - //testShouldUsePluginVersionFromPluginMgmtForLifecycleMojoWhenNotInBuildPlugins + //testShouldUsePluginVersionFromPluginMgmtForLifecycleMojoWhenNotInBuildPlugins File testDir = ResourceExtractor.simpleExtractResources( getClass(), BASEDIR_PREFIX + "lifecycleMojoVersionInPluginMgmt" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); 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 ff959c0aae..65cf19a229 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3396. - * + * * */ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest @@ -38,7 +38,7 @@ public class MavenITmng3396DependencyManagementForOverConstrainedRangesTest { super( "(2.0.8,)" ); // 2.0.9+ } - + public void testitMNG3396() throws Exception { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java index f8930e6ce1..7b42182cb4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3401CLIDefaultExecIdTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3401. - * + * * @author Brian Fox * @author jdcasey */ 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 afb714fa53..1b6094cf60 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3422. - * + * * @author Benjamin Bentmann * */ 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 0cb4bd3b68..b1d49b4392 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 @@ -34,7 +34,7 @@ import java.util.Properties; /** * This is a test set for MNG-3461. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java index 54bffa277e..a6d48c09ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3470StrictCheckumVerificationOfDependencyPomTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3740. - * + * * @author Benjamin Bentmann */ public class MavenITmng3470StrictCheckumVerificationOfDependencyPomTest 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 50aad2cb61..c199ed75bd 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 @@ -29,7 +29,7 @@ import java.util.Properties; /** * This is a test set for MNG-3475 and * MNG-1927. - * + * * @author Benjamin Bentmann * */ 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 f43ce1104a..38a02f9399 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-3477. - * + * * */ public class MavenITmng3477DependencyResolutionErrorMessageTest 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 4f5cb319d1..2776d41f73 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3485. - * + * * */ public class MavenITmng3485OverrideWagonExtensionTest 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 d17f458b7c..5c6695abd3 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 @@ -26,7 +26,7 @@ import java.io.IOException; /** * This is a test set for MNG-3506. - * + * * @author John Casey * */ @@ -45,51 +45,51 @@ public class MavenITmng3506ArtifactHandlersFromPluginsTest { super( "(2.2.0,)" ); } - + public void testProjectPackagingUsage() throws IOException, VerificationException { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/" + AID ); Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); - + verifier.deleteArtifacts( GID ); - + verifier.executeGoal( "install" ); - + verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + // Now, if everything worked, we have .pom and a .jar in the local repo for each child, and a pom for the parent. // IF IT DIDN'T, we have a .pom and a .coreit-1 for child 1 AND/OR .pom and .coreit-2 for child 2 in the local repo... - + // Parent POM String path = verifier.getArtifactPath( GID, AID, VERSION, "pom" ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + // Child 1 path = verifier.getArtifactPath( GID, AID + ".1", VERSION, TYPE ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID + ".1", VERSION, "pom" ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID + ".1", VERSION, BAD_TYPE1 ); assertFalse( path + " should NOT have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID + ".1", VERSION, BAD_TYPE2 ); assertFalse( path + " should _NEVER_ be installed!!!", new File( path ).exists() ); - + // Child 2 path = verifier.getArtifactPath( GID, AID + ".2", VERSION, TYPE ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID + ".2", VERSION, "pom" ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID + ".2", VERSION, BAD_TYPE1 ); assertFalse( path + " should _NEVER_ be installed!!!", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID + ".2", VERSION, BAD_TYPE2 ); assertFalse( path + " should NOT have been installed.", new File( path ).exists() ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java index 6ce799560d..b1825f7389 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3529QuotedCliArgTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3529. - * + * * @author Benjamin Bentmann */ public class MavenITmng3529QuotedCliArgTest 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 cb2c1b2e05..84703f1014 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3535. - * + * * */ public class MavenITmng3535SelfReferentialPropertiesTest @@ -70,7 +70,7 @@ public class MavenITmng3535SelfReferentialPropertiesTest try { verifier.executeGoal( "verify" ); - + verifier.verifyErrorFreeLog(); fail( "There is a self-referential property in this build; it should fail." ); } @@ -78,7 +78,7 @@ public class MavenITmng3535SelfReferentialPropertiesTest { // should fail this verification, because there truly is a self-referential property. } - + verifier.resetStreams(); } } 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 d30becaedd..7509feedb3 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 @@ -26,13 +26,13 @@ import java.io.File; /** * This is a test set for MNG-3536. - * + * * */ public class MavenITmng3536AppendedAbsolutePathsTest extends AbstractMavenIntegrationTestCase { - + public MavenITmng3536AppendedAbsolutePathsTest() { super( "[2.1.0-M1,)"); // 2.1.0+ only diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java index 2b65780e9b..e35684dcce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3545ProfileDeactivationTest.java @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3545: * it tests activation and deactivation of profiles. - * + * */ public class MavenITmng3545ProfileDeactivationTest extends AbstractMavenIntegrationTestCase @@ -40,7 +40,7 @@ public class MavenITmng3545ProfileDeactivationTest /** * Test build with two active by default profiles - * + * */ public void testBasicBuildWithDefaultProfiles() throws Exception @@ -66,7 +66,7 @@ public class MavenITmng3545ProfileDeactivationTest /** * Test command line deactivation of active by default profiles. - * + * */ public void testDeactivateDefaultProfilesHyphen() throws Exception @@ -115,7 +115,7 @@ public class MavenITmng3545ProfileDeactivationTest /** * Test command line deactivation of a profile that was activated * by a property - * + * */ public void testDeactivateActivatedByProp() throws Exception @@ -145,7 +145,7 @@ public class MavenITmng3545ProfileDeactivationTest /** * Test that deactivating from the command line takes priority over * activating from the command line. - * + * */ public void testActivateThenDeactivate() throws Exception @@ -175,7 +175,7 @@ public class MavenITmng3545ProfileDeactivationTest /** * Test that default profiles are deactivated when another profile is * activated. - * + * */ public void testDefaultProfileAutoDeactivation() throws Exception 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 15353f9802..318db306dc 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3581. - * + * * */ public class MavenITmng3581PluginUsesWagonDependencyTest 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 fdc796beb0..45bfa847d8 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3586. - * + * * @author Benjamin Bentmann * */ 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 3a644f0890..5b79047707 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3600. - * + * * */ public class MavenITmng3600DeploymentModeDefaultsTest 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 f78bd28482..e15a686dca 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 @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-3607. - * + * * @author Benjamin Bentmann * */ 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 166de36f44..99adf5d94a 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3621. - * + * * @author Brett Porter * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java index ae435600f5..7619dabfd9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3642DynamicResourcesTest.java @@ -28,10 +28,10 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3642. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3642DynamicResourcesTest 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 355006115b..d5f392b614 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 @@ -34,7 +34,7 @@ import java.util.List; /** * This is a test set for MNG-3652. - * + * * */ public class MavenITmng3652UserAgentHeaderTest @@ -45,7 +45,7 @@ public class MavenITmng3652UserAgentHeaderTest private int port; private String userAgent; - + private String customHeader; public MavenITmng3652UserAgentHeaderTest() @@ -65,11 +65,11 @@ public class MavenITmng3652UserAgentHeaderTest throws IOException { System.out.println( "Handling URL: '" + request.getRequestURL() + "'" ); - + userAgent = request.getHeader( "User-Agent" ); - + customHeader = request.getHeader( "Custom-Header" ); - + System.out.println( "Got User-Agent: '" + userAgent + "'" ); response.setContentType( "text/plain" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java index 5d3ec7dcb6..4b09cf675e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3667ResolveDepsWithBadPomVersionTest.java @@ -27,10 +27,10 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3667. - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3667ResolveDepsWithBadPomVersionTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java index 0f69d1799d..3c4b2a3758 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3671PluginLevelDepInterpolationTest.java @@ -27,13 +27,13 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3671. * - * Tests to make sure that custom plugin dependencies (defined in your local POM) have - * their information interpolated before they are injected into the plugin descriptor + * Tests to make sure that custom plugin dependencies (defined in your local POM) have + * their information interpolated before they are injected into the plugin descriptor * for eventual resolution and inclusion in the plugin classpath. Otherwise, resolution * errors will occur and the plugin will fail to initialize. - * + * * @author jdcasey - * + * */ public class MavenITmng3671PluginLevelDepInterpolationTest extends AbstractMavenIntegrationTestCase diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java index a84cf7d104..614925bb47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3679PluginExecIdInterpolationTest.java @@ -26,9 +26,9 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3679: - * it checks that a plugin execution with an id that contains an expression will + * it checks that a plugin execution with an id that contains an expression will * still execute without a problem. - * + * * @author jdcasey */ public class MavenITmng3679PluginExecIdInterpolationTest @@ -51,7 +51,7 @@ public class MavenITmng3679PluginExecIdInterpolationTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier.assertFilePresent( "target/check.txt" ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java index 09a041ac9e..ec43f089e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3680InvalidDependencyPOMTest.java @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3680. - * + * * @author jdcasey */ public class MavenITmng3680InvalidDependencyPOMTest @@ -46,7 +46,7 @@ public class MavenITmng3680InvalidDependencyPOMTest throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3680" ); - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java index 1a7e1af643..ab1148af36 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3684BuildPluginParameterTest.java @@ -28,7 +28,7 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3684: * Verify that the Build instance injected as a plugin parameter contains * interpolated values for things like the various build paths, etc. - * + * * @author jdcasey */ public class MavenITmng3684BuildPluginParameterTest @@ -38,7 +38,7 @@ public class MavenITmng3684BuildPluginParameterTest { super( "(2.0.9,)" ); } - + public void testitMNG3684 () throws Exception { @@ -48,17 +48,17 @@ public class MavenITmng3684BuildPluginParameterTest Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" ); verifier.executeGoal( "install" ); - + verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectDir.getAbsolutePath(), "remote" ); verifier.setLogFileName( "log-validate.txt" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier.setLogFileName( "log-site.txt" ); verifier.executeGoal( "site" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java index 91757501db..e9e9f5de4c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3693PomFileBasedirChangeTest.java @@ -30,7 +30,7 @@ import org.apache.maven.shared.utils.io.FileUtils; * doesn't affect the basedir of the project instance for using that project's classes directory * in the classpath of another project's build...this happens when both projects are * built in the same reactor, and one project depends on the other. - * + * * @author jdcasey */ public class MavenITmng3693PomFileBasedirChangeTest @@ -45,17 +45,17 @@ public class MavenITmng3693PomFileBasedirChangeTest throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3693" ); - + File pluginDir = new File( testDir, "maven-mng3693-plugin" ); File projectsDir = new File( testDir, "projects" ); Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" ); - + verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + String depPath = verifier.getArtifactPath( "org.apache.maven.its.mng3693", "dep", "1", "pom" ); File dep = new File( depPath ); @@ -65,7 +65,7 @@ public class MavenITmng3693PomFileBasedirChangeTest FileUtils.deleteDirectory( dep ); verifier = newVerifier( projectsDir.getAbsolutePath() ); - + verifier.executeGoal( "package" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java index 806f96961f..b6c838fdab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3694ReactorProjectsDynamismTest.java @@ -28,7 +28,7 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3694: * Verify that any plugin injecting reactorProjects gets project instances that * have their concrete state calculated. - * + * * @author jdcasey */ public class MavenITmng3694ReactorProjectsDynamismTest @@ -46,13 +46,13 @@ public class MavenITmng3694ReactorProjectsDynamismTest File pluginDir = new File( testDir, "maven-mng3694-plugin" ); File projectDir = new File( testDir, "projects" ); - + Verifier verifier = newVerifier( pluginDir.getAbsolutePath(), "remote" ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectDir.getAbsolutePath() ); verifier.executeGoal( "validate" ); 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 aa6724fbfb..30702bba42 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3701. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java index 2a533cddb0..66d7c2777a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3703ExecutionProjectWithRelativePathsTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3703. - * + * * @todo Fill in a better description of what this test verifies! * @author Brian Fox * @author jdcasey diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java index 5cdb97008f..0909f6fb16 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3704LifecycleExecutorWrapperTest.java @@ -28,10 +28,10 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3704. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3704LifecycleExecutorWrapperTest extends AbstractMavenIntegrationTestCase @@ -55,7 +55,7 @@ public class MavenITmng3704LifecycleExecutorWrapperTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectDir.getAbsolutePath(), "remote" ); verifier.executeGoal( "package" ); 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 6a8dd313eb..a6182d9990 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3714. - * + * * @author Brett Porter * */ @@ -52,7 +52,7 @@ public class MavenITmng3714ToolchainsCliOptionTest new File( javaHome, "bin" ).mkdirs(); new File( javaHome, "bin/javac").createNewFile(); new File( javaHome, "bin/javac.exe").createNewFile(); - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); Properties properties = verifier.newDefaultFilterProperties(); properties.setProperty( "@javaHome@", javaHome.getAbsolutePath() ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java index 31d6667f3e..f8d864fa42 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3716AggregatorForkingTest.java @@ -28,10 +28,10 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3716. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3716AggregatorForkingTest extends AbstractMavenIntegrationTestCase @@ -55,7 +55,7 @@ public class MavenITmng3716AggregatorForkingTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectsDir.getAbsolutePath() ); verifier.executeGoal( "org.apache.maven.its.mng3716:mavenit-mng3716-plugin:1:run" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java index 1097d2d124..3930d00924 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3723ConcreteParentProjectTest.java @@ -27,14 +27,14 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3723. * - * Tests that the parent MavenProject instance of the current project has been + * Tests that the parent MavenProject instance of the current project has been * transitioned into a concrete state before a mojo is executed. If this is true, * then injecting ${project} into the mojo and traversing to project.getParent().getBasedir() - * should retrieve a File instance that is interpolated and exists (since we're + * should retrieve a File instance that is interpolated and exists (since we're * going to be using a parent-child project set in the projects directory). - * + * * @author jdcasey - * + * */ public class MavenITmng3723ConcreteParentProjectTest extends AbstractMavenIntegrationTestCase @@ -60,7 +60,7 @@ public class MavenITmng3723ConcreteParentProjectTest verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectDir.getAbsolutePath() ); verifier.executeGoal( "validate" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java index 854df2cdaa..57e8daa959 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3724ExecutionProjectSyncTest.java @@ -28,10 +28,10 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3724. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3724ExecutionProjectSyncTest extends AbstractMavenIntegrationTestCase @@ -55,7 +55,7 @@ public class MavenITmng3724ExecutionProjectSyncTest verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectDir.getAbsolutePath() ); verifier.executeGoal( "package" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java index 4d4017269b..001e893279 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3729MultiForkAggregatorsTest.java @@ -43,7 +43,7 @@ import org.apache.maven.it.util.ResourceExtractor; * dependencies for the current project. This happened in 2.0.10-RC11 (which was the predecessor to 2.1.0-RC12, since * the version was renamed while the release process was in mid-execution). It did not happen in 2.0.9, and was fixed in * 2.1.0-RC12. - * + * * @author Brian Fox * @author jdcasey */ @@ -69,7 +69,7 @@ public class MavenITmng3729MultiForkAggregatorsTest verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectDir.getAbsolutePath() ); verifier.executeGoal( "package" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java index 35935739f8..da833538ef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3740SelfReferentialReactorProjectsTest.java @@ -31,9 +31,9 @@ import org.apache.maven.it.util.ResourceExtractor; * doesn't result in a StackOverflowError as a result of trying to calculate * a concrete state for its project references, which includes itself because of * this plugin configuration in the POM. - * + * * @author jdcasey - * + * */ public class MavenITmng3740SelfReferentialReactorProjectsTest extends AbstractMavenIntegrationTestCase @@ -56,11 +56,11 @@ public class MavenITmng3740SelfReferentialReactorProjectsTest verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( v2.getAbsolutePath() ); verifier.executeGoal( "package" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java index 20f0a3923b..5810a28d04 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3743ForkWithPluginManagementTest.java @@ -28,10 +28,10 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3743. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3743ForkWithPluginManagementTest extends AbstractMavenIntegrationTestCase @@ -53,7 +53,7 @@ public class MavenITmng3743ForkWithPluginManagementTest verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + verifier = newVerifier( projectDir.getAbsolutePath(), "remote" ); verifier.executeGoal( "site" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java index fb412966b0..44fe78e815 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3746POMPropertyOverrideTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3746. - * + * * @todo Fill in a better description of what this test verifies! * @author Brian Fox * @author jdcasey @@ -82,11 +82,11 @@ public class MavenITmng3746POMPropertyOverrideTest verifier = newVerifier( projectDir.getAbsolutePath() ); verifier.setLogFileName( "log-cli.txt" ); - + verifier.addCliOption( "-Dtest.verification=cli" ); verifier.addCliOption( "-Dtest.usingCliValue=true" ); verifier.addCliOption( "-Djava.version=cli" ); - + verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java index c069961177..40b950cbe8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3747PrefixedPathExpressionTest.java @@ -29,10 +29,10 @@ import org.apache.maven.it.util.ResourceExtractor; * This is a test set for MNG-3747. * * @todo Fill in a better description of what this test verifies! - * + * * @author Brian Fox * @author jdcasey - * + * */ public class MavenITmng3747PrefixedPathExpressionTest extends AbstractMavenIntegrationTestCase @@ -55,7 +55,7 @@ public class MavenITmng3747PrefixedPathExpressionTest verifier.resetStreams(); Properties props = verifier.loadProperties( "target/config.properties" ); - assertEquals( "path is: " + new File( testDir, "relative" ).getCanonicalPath() + "/somepath", + assertEquals( "path is: " + new File( testDir, "relative" ).getCanonicalPath() + "/somepath", props.getProperty( "stringParam" ) ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java index 3fed34a63e..71f6faabdc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3748BadSettingsXmlTest.java @@ -28,12 +28,12 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3748. - * + * * Verifies that the settings.xml file is parsed using strict mode, such that invalid * xml will cause an error (specifically, when repositories are not contained within a profile declaration) * * @author jdcasey - * + * */ public class MavenITmng3748BadSettingsXmlTest extends AbstractMavenIntegrationTestCase @@ -50,7 +50,7 @@ public class MavenITmng3748BadSettingsXmlTest File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3748" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); - verifier.setAutoclean( false ); + verifier.setAutoclean( false ); verifier.addCliOption( "-s" ); verifier.addCliOption( "settings.xml" ); @@ -61,7 +61,7 @@ public class MavenITmng3748BadSettingsXmlTest { verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); - + fail( "build should fail if settings.xml contains unrecognized elements." ); } catch ( VerificationException e ) @@ -86,7 +86,7 @@ public class MavenITmng3748BadSettingsXmlTest } assertTrue( foundWarning ); } - + verifier.resetStreams(); } 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 1d717755e5..35ce284cd5 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3760. - * + * * @author Brett Porter * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java index 07fa04d0f7..12537aeac7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3766ToolchainsFromExtensionTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3766. - * + * * @author Benjamin Bentmann */ public class MavenITmng3766ToolchainsFromExtensionTest @@ -46,7 +46,7 @@ public class MavenITmng3766ToolchainsFromExtensionTest throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3766" ); - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); 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 1e1abe3eb9..e7e49d9b7e 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-3769. - * + * * */ public class MavenITmng3769ExclusionRelocatedTransdepsTest @@ -45,7 +45,7 @@ public class MavenITmng3769ExclusionRelocatedTransdepsTest * Verify that dependency resolution considers dependency management also for relocated artifacts. */ public void testitMNG3769() - throws Exception + throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-3769" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java index 26510923e8..33f7ceb153 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3775ConflictResolutionBacktrackingTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-3775. - * + * * @author Benjamin Bentmann */ public class MavenITmng3775ConflictResolutionBacktrackingTest 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 80c7dc1319..7a7bf90b5d 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3796. - * + * * @author Benjamin Bentmann * */ 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 3264c02a21..dc496b4f49 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3805. - * + * * @author Benjamin Bentmann * */ 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 4d1aa0b322..c04fc7abfa 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3808. - * + * * @author Brett Porter * */ 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 33553fcccb..2450b01c5d 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3810. - * + * * @author Brett Porter * */ 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 61a2d44db4..d9b2118f68 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3811. - * + * * @author Brett Porter * */ 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 0b248ccf38..5959835ece 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3813. - * + * * @author Benjamin Bentmann * */ 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 1adc223ec5..c54e4bcaa4 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3814. - * + * * @author Benjamin Bentmann * */ 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 0e74943cdf..66d26a53c6 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3819. - * + * * @author Benjamin Bentmann * */ 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 2e4c5c717a..8108eea855 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3821. - * + * * @author Benjamin Bentmann * */ @@ -34,7 +34,7 @@ public class MavenITmng3821EqualPluginExecIdsTest extends AbstractMavenIntegrationTestCase { - public MavenITmng3821EqualPluginExecIdsTest() + public MavenITmng3821EqualPluginExecIdsTest() { super( ALL_MAVEN_VERSIONS ); } 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 e7766e229d..d1ca24f1d5 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3822. - * + * * @author Benjamin Bentmann * */ 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 c2dad16bc3..f8be033ee5 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3827. - * + * * @author Benjamin Bentmann * */ 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 069ac198f9..ef228b00e2 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3831. - * + * * @author Benjamin Bentmann * */ @@ -53,7 +53,7 @@ public class MavenITmng3831PomInterpolationTest verifier.executeGoal( "initialize" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + Properties props = verifier.loadProperties( "target/interpolated.properties" ); String prefix = "project.properties."; 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 5de2332a20..de74218c5b 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3833. - * + * * @author Benjamin Bentmann * */ 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 ba1e321d2c..fe94952eaf 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3836. - * + * * @author Benjamin Bentmann * */ 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 1968f4531d..b7574598db 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3838. - * + * * @author Benjamin Bentmann * */ 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 7f56b974e6..665df4decd 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3839. - * + * * @author Benjamin Bentmann * */ 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 d55a942fea..1a96698936 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3845. - * + * * @author Benjamin Bentmann * */ 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 4b9590e9f2..51a1edaeeb 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3846. - * + * * @author Benjamin Bentmann * */ 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 10d5c95056..30093dd975 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3852. - * + * * @author Benjamin Bentmann * */ 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 708d337459..709ae48a33 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3853. - * + * * @author Benjamin Bentmann * */ 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 57c1b72d9d..baba32362d 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 @@ -27,7 +27,7 @@ import java.io.File; /** * This is a test set for MNG-3863. - * + * * @author Benjamin Bentmann * */ 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 d1f3ec802e..7a7c6ee1dd 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3864. - * + * * @author Benjamin Bentmann * */ 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 7a0e073c16..9fa5cdfec4 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3866. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java index 645cc9e540..a326eece3b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3872ProfileActivationInRelocatedPomTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-3872. - * + * * @author Benjamin Bentmann */ public class MavenITmng3872ProfileActivationInRelocatedPomTest 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 90027522e7..001a1db5f7 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-3873. - * + * * @author Benjamin Bentmann * */ 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 14df5196c6..b2dff04896 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 @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-3877. - * + * * @author Benjamin Bentmann * */ 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 6f011d75e7..e04e8a3884 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3885. - * + * * @author Benjamin Bentmann * */ 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 e3f1daa286..1958cb3d30 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-3886. - * + * * @author Benjamin Bentmann * */ 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 919d24c1e1..90016d9235 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-3887. - * + * * @author Benjamin Bentmann * */ 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 77a051a0ce..9db3061295 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-3890. - * + * * @author Benjamin Bentmann * */ 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 120b8f73e6..c04fef8ba1 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 @@ -27,7 +27,7 @@ import org.apache.maven.shared.utils.io.FileUtils; /** * This is a test set for MNG-3892. - * + * * @author Benjamin Bentmann * */ 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 47a6404dad..326c0e5384 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3899. - * + * * @author Benjamin Bentmann * */ 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 dd93836f9d..20cb6f0993 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3900. - * + * * @author Benjamin Bentmann * */ 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 c003799dc8..33f616f7fb 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3904. - * + * * @author Benjamin Bentmann * */ @@ -57,11 +57,11 @@ public class MavenITmng3904NestedBuildDirInterpolationTest verifier.resetStreams(); Properties props = verifier.loadProperties( "target/pom.properties" ); - assertCanonicalFileEquals( new File( testDir, "target/classes/dir0" ), + assertCanonicalFileEquals( new File( testDir, "target/classes/dir0" ), new File( props.getProperty( "project.properties.dir0" ) ) ); - assertCanonicalFileEquals( new File( testDir, "src/test/dir1" ), + assertCanonicalFileEquals( new File( testDir, "src/test/dir1" ), new File( props.getProperty( "project.properties.dir1" ) ) ); - assertCanonicalFileEquals( new File( testDir, "target/site/dir2" ), + assertCanonicalFileEquals( new File( testDir, "target/site/dir2" ), new File( props.getProperty( "project.properties.dir2" ) ) ); } 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 af3e69a674..8ecbdfea04 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-3906. - * + * * @author Benjamin Bentmann * */ @@ -66,7 +66,7 @@ public class MavenITmng3906MergedPluginClassPathOrderingTest assertEquals( "5", pclProps.getProperty( resName + ".count" ) ); - assertTrue( pclProps.getProperty( resName + ".0" ), + assertTrue( pclProps.getProperty( resName + ".0" ), pclProps.getProperty( resName + ".0" ).endsWith( "/c-0.1.jar!/" + resName ) ); assertTrue( pclProps.getProperty( resName + ".1" ), pclProps.getProperty( resName + ".1" ).endsWith( "/a-0.2.jar!/" + resName ) ); 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 3c07c76f71..b688ce3e8c 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 @@ -29,7 +29,7 @@ import java.util.List; /** * This is a test set for MNG-3916. - * + * * @author Benjamin Bentmann * */ 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 d232d322b7..44bb11aae1 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 @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-3924 and * MNG-3662 - * + * * @author Benjamin Bentmann * */ 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 4b0e956848..c6b408827f 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-3925. - * + * * @author Benjamin Bentmann * */ 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 a88787f7a3..ca37d0d8eb 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3927. - * + * * @author Benjamin Bentmann * */ 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 eecdb57254..7bc1c176a8 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 @@ -28,7 +28,7 @@ import org.apache.maven.shared.utils.Os; /** * This is a test set for MNG-3933. - * + * * @author Benjamin Bentmann * */ 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 32041d028a..86e7810549 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-3937. - * + * * @author Benjamin Bentmann * */ 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 d42e43ca93..df85c97f83 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-3938. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java index ed776213f2..2146697d1e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest.java @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3941. - * + * * @author Benjamin Bentmann */ public class MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest @@ -36,7 +36,7 @@ public class MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest public MavenITmng3941ExecutionProjectRestrictedToForkingMojoTest() { - super( "[3.0-alpha-3,)" ); + super( "[3.0-alpha-3,)" ); } /** 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 0035e41b70..d9755d9af8 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 @@ -29,7 +29,7 @@ import java.util.List; /** * This is a test set for MNG-3943. - * + * * @author Benjamin Bentmann * */ 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 526cb92bdf..50da9d2515 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3947. - * + * * @author Benjamin Bentmann * */ 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 374797b52e..3eb79937e9 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3948. - * + * * @author Benjamin Bentmann * */ 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 167054897d..2ead5c493c 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 @@ -43,7 +43,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-3953. - * + * * @author Benjamin Bentmann * */ 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 6fe4e308d4..8891254810 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3955. - * + * * @author Benjamin Bentmann * */ @@ -62,7 +62,7 @@ public class MavenITmng3955EffectiveSettingsTest Properties props = verifier.loadProperties( "target/settings.properties" ); assertEquals( "true", props.getProperty( "settings.offline" ) ); assertEquals( "false", props.getProperty( "settings.interactiveMode" ) ); - assertEquals( new File( verifier.getLocalRepository() ).getAbsoluteFile(), + assertEquals( new File( verifier.getLocalRepository() ).getAbsoluteFile(), new File( props.getProperty( "settings.localRepository" ) ).getAbsoluteFile() ); } 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 e7d7a577d0..56c1f5bb19 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3970. - * + * * @author Benjamin Bentmann * */ 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 29768cd827..bc2e70d141 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3974. - * + * * @author Benjamin Bentmann * */ 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 50568a4e49..cd40160f2f 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3979. - * + * * @author Benjamin Bentmann * */ 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 ec5bf12e45..da5ce003a9 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 @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3983. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java index d8555738e0..1f60b58f94 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng3991ValidDependencyScopeTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-3991. - * + * * @author Benjamin Bentmann */ public class MavenITmng3991ValidDependencyScopeTest 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 b86a2d632b..89174d6a0b 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 @@ -29,7 +29,7 @@ import java.util.List; /** * This is a test set for MNG-3998. - * + * * @author Benjamin Bentmann * */ 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 b6c302d35b..4dd843d91c 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 @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4000. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java index 9ffd5ab406..75f8e9f74b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4005UniqueDependencyKeyTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4005. - * + * * @author Benjamin Bentmann */ public class MavenITmng4005UniqueDependencyKeyTest @@ -96,7 +96,7 @@ public class MavenITmng4005UniqueDependencyKeyTest foundWarning = true; } } - + assertTrue( "Duplicate dependency warning wasn't generated.", foundWarning ); } 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 7021d303cb..6d086c0fa0 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4007. - * + * * @author Benjamin Bentmann * */ 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 9bcc84997d..bac91ea9e3 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4008. - * + * * @author Benjamin Bentmann * */ 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 8e072e2dd1..18bfc6b2c6 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4009. - * + * * @author Benjamin Bentmann * */ 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 c7ad8653af..fb18806d40 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4016. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java index cbbf75ca16..09f8c329c7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4022IdempotentPluginConfigMergingTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4022. - * + * * @author Benjamin Bentmann */ public class MavenITmng4022IdempotentPluginConfigMergingTest 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 877cd93ba8..54a34f4cba 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4023. - * + * * @author Benjamin Bentmann * */ 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 427ce66787..bd9deca6ae 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4026. - * + * * @author Benjamin Bentmann * */ 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 7f1e2f9833..b6a99f6bc3 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 @@ -29,7 +29,7 @@ import java.util.List; /** * This is a test set for MNG-4034. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java index 3a6f18a61b..8c497eb203 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4036ParentResolutionFromSettingsRepoTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4036. - * + * * @author Benjamin Bentmann */ public class MavenITmng4036ParentResolutionFromSettingsRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java index 9939e84697..8302c92c47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4040ProfileInjectedModulesTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4040. - * + * * @author Benjamin Bentmann */ public class MavenITmng4040ProfileInjectedModulesTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java index 86fba78793..1bdb0b4754 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4048VersionRangeReactorResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4048. - * + * * @author Benjamin Bentmann */ public class MavenITmng4048VersionRangeReactorResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java index f228e78c93..0e1b73e2d0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4052ReactorAwareImportScopeTest.java @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-4052. - * + * * @author Benjamin Bentmann */ public class MavenITmng4052ReactorAwareImportScopeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java index 77ebe9d3db..41dd63523e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4053PluginConfigAttributesTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4053. - * + * * @author Benjamin Bentmann */ public class MavenITmng4053PluginConfigAttributesTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java index fb26aa9bab..837472d0fe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4056ClassifierBasedDepResolutionFromReactorTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4056. - * + * * @author Benjamin Bentmann */ public class MavenITmng4056ClassifierBasedDepResolutionFromReactorTest @@ -61,26 +61,26 @@ public class MavenITmng4056ClassifierBasedDepResolutionFromReactorTest { // artifact type unchanged to match type as declared in dependency - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:tests:0.1" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:sources:0.1" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:javadoc:0.1" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:jar:client:0.1" ) ); } else { // artifact type updated to match type of active artifact - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:test-jar:tests:0.1" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:java-source:sources:0.1" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:javadoc:javadoc:0.1" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4056:producer:ejb-client:client:0.1" ) ); } 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 5992fc1d9d..c0905d2e56 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 @@ -41,7 +41,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-4068. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java index 32bb8923b5..0cdd30a861 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4070WhitespaceTrimmingTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4070. - * + * * @author Benjamin Bentmann */ public class MavenITmng4070WhitespaceTrimmingTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java index fb32f028f5..ab5e598eff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4072InactiveProfileReposTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4072. - * + * * @author Benjamin Bentmann */ public class MavenITmng4072InactiveProfileReposTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java index 859b1b439e..25cbef6168 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4086ExplicitPluginMetaversionTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4086. - * + * * @author Benjamin Bentmann */ public class MavenITmng4086ExplicitPluginMetaversionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java index ee77b21a9b..d29e21e8cf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4087PercentEncodedFileUrlTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4087. - * + * * @author Benjamin Bentmann */ public class MavenITmng4087PercentEncodedFileUrlTest 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 1f6f30d862..c11ed1529b 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4102. - * + * * @author Benjamin Bentmann * */ 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 22af1cb2ec..83f45ba884 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4106. - * + * * @author Benjamin Bentmann * */ 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 749230d237..0d0134dbb0 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4107. - * + * * @author Benjamin Bentmann * */ 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 862f9ed801..c1b5cb0759 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4116. - * + * * @author Benjamin Bentmann * */ @@ -56,27 +56,27 @@ public class MavenITmng4116UndecodedUrlsTest Properties props = verifier.loadProperties( "target/pom.properties" ); - assertEquals( "http://maven.apache.org/spacy%20path", + assertEquals( "http://maven.apache.org/spacy%20path", props.getProperty( "project.url" ) ); - assertEquals( "http://svn.apache.org/viewvc/spacy%20path", + assertEquals( "http://svn.apache.org/viewvc/spacy%20path", props.getProperty( "project.scm.url" ) ); - assertEquals( "scm:svn:svn+ssh://svn.apache.org/spacy%20path", + assertEquals( "scm:svn:svn+ssh://svn.apache.org/spacy%20path", props.getProperty( "project.scm.connection" ) ); - assertEquals( "scm:svn:svn+ssh://svn.apache.org/spacy%20path", + assertEquals( "scm:svn:svn+ssh://svn.apache.org/spacy%20path", props.getProperty( "project.scm.developerConnection" ) ); - assertEquals( "http://ci.apache.org/spacy%20path", + assertEquals( "http://ci.apache.org/spacy%20path", props.getProperty( "project.ciManagement.url" ) ); - assertEquals( "http://issues.apache.org/spacy%20path", + assertEquals( "http://issues.apache.org/spacy%20path", props.getProperty( "project.issueManagement.url" ) ); - assertEquals( "scm:svn:svn+ssh://dist.apache.org/spacy%20path", + assertEquals( "scm:svn:svn+ssh://dist.apache.org/spacy%20path", props.getProperty( "project.distributionManagement.repository.url" ) ); - assertEquals( "scm:svn:svn+ssh://snap.apache.org/spacy%20path", + assertEquals( "scm:svn:svn+ssh://snap.apache.org/spacy%20path", props.getProperty( "project.distributionManagement.snapshotRepository.url" ) ); - assertEquals( "scm:svn:svn+ssh://site.apache.org/spacy%20path", + assertEquals( "scm:svn:svn+ssh://site.apache.org/spacy%20path", props.getProperty( "project.distributionManagement.site.url" ) ); } 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 11e6634f43..62788f3790 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 @@ -27,7 +27,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4126. - * + * * @author Benjamin Bentmann * */ 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 c164e11a15..f4d7b94179 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 @@ -29,7 +29,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4129. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java index 30854b4d61..cd93ba2a11 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4148DepPomInterpWithSettingsProfilesTest.java @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-4148. - * + * * @author John Casey */ public class MavenITmng4148DepPomInterpWithSettingsProfilesTest @@ -49,19 +49,19 @@ public class MavenITmng4148DepPomInterpWithSettingsProfilesTest File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4148" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); - + verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng4148" ); - + verifier.setAutoclean( false ); - + verifier.addCliOption( "-s" ); verifier.addCliOption( "settings.xml" ); - + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); - + verifier.executeGoal( "validate" ); - + verifier.verifyErrorFreeLog(); verifier.resetStreams(); } 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 1d10bdd6d0..128a3aae6d 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 @@ -27,7 +27,7 @@ import java.util.Collection; /** * This is a test set for MNG-505. - * + * * @author Brett Porter * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java index 6329166545..4de13e39db 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4162ReportingMigrationTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4162. - * + * * @author Benjamin Bentmann */ public class MavenITmng4162ReportingMigrationTest 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 40a9852d76..6812a03ab8 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4166. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java index 17b963a56d..f94192833d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4172EmptyDependencySetTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4172. - * + * * @author Benjamin Bentmann */ public class MavenITmng4172EmptyDependencySetTest 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 b228792971..378e135f24 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 @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4189. - * + * * * @author Maria Odea Ching */ @@ -52,7 +52,7 @@ public class MavenITmng4189UniqueVersionSnapshotTest verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); - // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar + // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar verifier.setLogFileName( "log-1.txt" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); @@ -60,7 +60,7 @@ public class MavenITmng4189UniqueVersionSnapshotTest Properties checksums = verifier.loadProperties( "target/checksum.properties" ); assertEquals( "da2e54f69a9ba120f9211c476029f049967d840c", checksums.getProperty( "dep-1.0-SNAPSHOT.jar" ) ); - // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-2:jar + // depend on org.apache.maven.its.mng4189:dep:1.0-20090608.090416-2:jar verifier.deleteDirectory( "target" ); verifier.addCliOption( "-f" ); verifier.addCliOption( "dependent-on-newer-timestamp-pom.xml" ); @@ -71,7 +71,7 @@ public class MavenITmng4189UniqueVersionSnapshotTest checksums = verifier.loadProperties( "target/checksum.properties" ); assertEquals( "835979c28041014c5fd55daa15302d92976924a7", checksums.getProperty( "dep-1.0-SNAPSHOT.jar" ) ); - // revert back to org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar + // revert back to org.apache.maven.its.mng4189:dep:1.0-20090608.090416-1:jar verifier.deleteDirectory( "target" ); verifier.getCliOptions().remove( "-f" ); verifier.getCliOptions().remove( "dependent-on-newer-timestamp-pom.xml" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java index b01d99f0b9..bcafe5b92b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4193UniqueRepoIdTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4193. - * + * * @author Benjamin Bentmann */ public class MavenITmng4193UniqueRepoIdTest 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 9398f29192..499b8c3fed 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4196. - * + * * @author John Casey * */ 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 fdcf23cadb..e705e3eb6c 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 @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-4199. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java index 282154c424..f89eabc607 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4207PluginWithLog4JTest.java @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-4207. - * + * * @author John Casey */ public class MavenITmng4207PluginWithLog4JTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java index 70860fa7be..7800767ea3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4208InterpolationPrefersCliOverProjectPropsTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4208. - * + * * @author Benjamin Bentmann */ public class MavenITmng4208InterpolationPrefersCliOverProjectPropsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java index 55588b83ea..71ba631303 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4214MirroredParentSearchReposTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4214. - * + * * @author Benjamin Bentmann */ public class MavenITmng4214MirroredParentSearchReposTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java index cf69146dff..7deb94c90f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4231SnapshotUpdatePolicyTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4231. - * + * * @author Benjamin Bentmann */ public class MavenITmng4231SnapshotUpdatePolicyTest 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 19d56843b2..d76ececb64 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 @@ -26,7 +26,7 @@ import java.io.IOException; /** * This is a test set for MNG-3506. - * + * * @author John Casey * */ @@ -44,30 +44,30 @@ public class MavenITmng4238ArtifactHandlerExtensionUsageTest { super( "(2.2.0,)" ); } - + public void testProjectPackagingUsage() throws IOException, VerificationException { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4238" ); Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); - + verifier.deleteArtifacts( GID ); - + verifier.executeGoal( "install" ); - + verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + // Now, if everything worked, we have a .pom and a .jar in the local repo. // IF IT DIDN'T, we have a .pom and a .coreit in the local repo... - + String path = verifier.getArtifactPath( GID, AID, VERSION, TYPE ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID, VERSION, "pom" ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID, VERSION, BAD_TYPE ); assertFalse( path + " should NOT have been installed.", new File( path ).exists() ); } 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 cb1a479bd4..ffd1960193 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 @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4254. - * + * * @author John Casey * */ @@ -75,7 +75,7 @@ public class MavenITmng4254SelectableWagonProvidersTest verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); verifier.addCliOption( "-V" ); - + verifier.setLogFileName( "log-settings.txt" ); verifier.executeGoal( "validate" ); @@ -96,7 +96,7 @@ public class MavenITmng4254SelectableWagonProvidersTest verifier.deleteDirectory( "target" ); verifier.addCliOption( "-V" ); - + verifier.setLogFileName( "log-default-http.txt" ); verifier.executeGoal( "validate" ); @@ -118,7 +118,7 @@ public class MavenITmng4254SelectableWagonProvidersTest verifier.addCliOption( "-V" ); verifier.addCliOption( "-DwagonProtocol=https" ); - + verifier.setLogFileName( "log-default-https.txt" ); verifier.executeGoal( "validate" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java index b0c367626d..3fa300e40a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPath370Test.java @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-4262. - * + * * @author Benjamin Bentmann */ public class MavenITmng4262MakeLikeReactorDottedPath370Test diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java index 499f5d1317..d13cb9151c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4262MakeLikeReactorDottedPathTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4262. - * + * * @author Benjamin Bentmann */ public class MavenITmng4262MakeLikeReactorDottedPathTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java index 6ceaaa32de..fa94106f36 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4269BadReactorResolutionFromOutDirTest.java @@ -40,7 +40,7 @@ public class MavenITmng4269BadReactorResolutionFromOutDirTest /** * Test that dependency resolution from the reactor is not too eager and does not resolve plugin artifacts from - * the build directory of their plugin project when the plugin project hasn't been built yet. The technical + * the build directory of their plugin project when the plugin project hasn't been built yet. The technical * problem is that the mere existence of a project output directory like target/classes is no sufficient indicator * that we can use that for artifact resolution. The project's output directory might just be a left over from a * previous build and could be in any state, e.g. incomplete. 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 41053f9ff1..5423cb9550 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 @@ -26,7 +26,7 @@ import java.io.IOException; /** * This is a test set for MNG-4270. - * + * * @author John Casey * */ @@ -46,30 +46,30 @@ public class MavenITmng4270ArtifactHandlersFromPluginDepsTest { super( "(2.2.0,)" ); } - + public void testProjectPackagingUsage() throws IOException, VerificationException { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/" + AID ); Verifier verifier = newVerifier( testDir.getAbsolutePath(), "remote" ); - + verifier.deleteArtifacts( GID ); - + verifier.executeGoal( "install" ); - + verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + // Now, if everything worked, we have .pom and a .jar in the local repo. // IF IT DIDN'T, we have a .pom and a .coreit in the local repo... - + String path = verifier.getArtifactPath( GID, AID, VERSION, TYPE ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID, VERSION, "pom" ); assertTrue( path + " should have been installed.", new File( path ).exists() ); - + path = verifier.getArtifactPath( GID, AID, VERSION, BAD_TYPE ); assertFalse( path + " should NOT have been installed.", new File( path ).exists() ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java index d08cbd4396..aa1f7e4f09 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4279WagonProviderFailoverTest.java @@ -52,7 +52,7 @@ public class MavenITmng4279WagonProviderFailoverTest verifier.addCliOption( "-s" ); verifier.addCliOption( "settings.xml" ); verifier.executeGoal( "validate" ); - + verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java index 679d3bd06e..b05b15f088 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4281PreferLocalSnapshotTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4281. - * + * * @author Benjamin Bentmann */ public class MavenITmng4281PreferLocalSnapshotTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java index 8d86659353..985164b82c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4283ParentPomPackagingTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4283. - * + * * @author Benjamin Bentmann */ public class MavenITmng4283ParentPomPackagingTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java index f371954b43..77d277ce57 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4291MojoRequiresOnlineModeTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4291. - * + * * @author Benjamin Bentmann */ public class MavenITmng4291MojoRequiresOnlineModeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java index e39761d532..8b1ef7f896 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4292EnumTypeMojoParametersTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4292. - * + * * @author Benjamin Bentmann */ public class MavenITmng4292EnumTypeMojoParametersTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java index abf4297559..b655869078 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4293RequiresCompilePlusRuntimeScopeTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-4293. - * + * * @author Benjamin Bentmann */ public class MavenITmng4293RequiresCompilePlusRuntimeScopeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java index 551c383b5a..8b6d4f2732 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4304ProjectDependencyArtifactsTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4304. - * + * * @author Benjamin Bentmann */ public class MavenITmng4304ProjectDependencyArtifactsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java index 5002bebed6..ee2d9cd8ff 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4305LocalRepoBasedirTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4305. - * + * * @author Benjamin Bentmann */ public class MavenITmng4305LocalRepoBasedirTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java index 1fba87f801..a38829ed48 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4309StrictChecksumValidationForMetadataTest.java @@ -26,7 +26,7 @@ import org.apache.maven.shared.utils.io.FileUtils; /** * This is a test set for MNG-4309. - * + * * @author Benjamin Bentmann */ public class MavenITmng4309StrictChecksumValidationForMetadataTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java index 1513b50e03..37ab085256 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4312. - * + * * @author Benjamin Bentmann */ public class MavenITmng4312TypeAwarePluginParameterExpressionInjectionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java index 1c776d897f..f91832f2ba 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4314DirectInvocationOfAggregatorTest.java @@ -27,7 +27,7 @@ import java.util.Arrays; /** * This is a test set for MNG-4314. - * + * * @author Benjamin Bentmann */ public class MavenITmng4314DirectInvocationOfAggregatorTest @@ -53,7 +53,7 @@ public class MavenITmng4314DirectInvocationOfAggregatorTest verifier.deleteDirectory( "consumer/target" ); verifier.deleteDirectory( "dependency/target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng4314" ); - verifier.executeGoals( Arrays.asList( new String[] { "validate", + verifier.executeGoals( Arrays.asList( new String[] { "validate", "org.apache.maven.its.plugins:maven-it-plugin-all:2.1-SNAPSHOT:aggregator-dependencies" } ) ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java index 3b128451b7..1fe61ee4a3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4317PluginVersionResolutionFromMultiReposTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4317. - * + * * @author Benjamin Bentmann */ public class MavenITmng4317PluginVersionResolutionFromMultiReposTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java index ce73a04c59..4275154da5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4318ProjectExecutionRootTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-4318 and * MNG-5014. - * + * * @author Benjamin Bentmann */ public class MavenITmng4318ProjectExecutionRootTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java index c1c301ed2e..a3f0c5cbc2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4319PluginExecutionGoalInterpolationTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4319. - * + * * @author Benjamin Bentmann */ public class MavenITmng4319PluginExecutionGoalInterpolationTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java index 400cec9837..bafe2bfea4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4320AggregatorAndDependenciesTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4320. - * + * * @author Benjamin Bentmann */ public class MavenITmng4320AggregatorAndDependenciesTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java index bc4f548bf7..9cabb7c5de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4321CliUsesPluginMgmtConfigTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4321. - * + * * @author Benjamin Bentmann */ public class MavenITmng4321CliUsesPluginMgmtConfigTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java index 8323ab7711..777f0ac5f2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4327. - * + * * @author Benjamin Bentmann */ public class MavenITmng4327ExcludeForkingMojoFromForkedLifecycleTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java index aa8c7516f2..653eadc744 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4328PrimitiveMojoParameterConfigurationTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4328. - * + * * @author Benjamin Bentmann */ public class MavenITmng4328PrimitiveMojoParameterConfigurationTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java index bb3a8e5c72..bad97167e3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4331DependencyCollectionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4331. - * + * * @author Benjamin Bentmann */ public class MavenITmng4331DependencyCollectionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java index a68fde7b07..a365e43cd5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4332DefaultPluginExecutionOrderTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4332. - * + * * @author Benjamin Bentmann */ public class MavenITmng4332DefaultPluginExecutionOrderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java index 3ccd65f9ab..cf4e3e3cd7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4335SettingsOfflineModeTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4335. - * + * * @author Benjamin Bentmann */ public class MavenITmng4335SettingsOfflineModeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java index af6468151f..d3dea0cd24 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4341PluginExecutionOrderTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4341. - * + * * @author Benjamin Bentmann */ public class MavenITmng4341PluginExecutionOrderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java index a13b59f90d..7fe5ad96ab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4342IndependentMojoParameterDefaultValuesTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4342. - * + * * @author Benjamin Bentmann */ public class MavenITmng4342IndependentMojoParameterDefaultValuesTest 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 153985da67..41071455f4 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 @@ -43,7 +43,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * This is a test set for MNG-4343. - * + * * @author Benjamin Bentmann * */ @@ -88,9 +88,9 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest else { PrintWriter writer = response.getWriter(); - + response.setStatus( HttpServletResponse.SC_OK ); - + if ( request.getRequestURI().endsWith( ".pom" ) ) { writer.println( "" ); @@ -171,7 +171,7 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest // expected } - assertTrue( requestedUris.toString(), + assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.jar" ) || requestedUris.contains( "/dep/0.1/dep-0.1.pom" ) ); requestedUris.clear(); @@ -223,7 +223,7 @@ public class MavenITmng4343MissingReleaseUpdatePolicyTest // expected } - assertTrue( requestedUris.toString(), + assertTrue( requestedUris.toString(), requestedUris.contains( "/dep/0.1/dep-0.1.jar" ) || requestedUris.contains( "/dep/0.1/dep-0.1.pom" ) ); requestedUris.clear(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java index 8fd33ef83d..894cbafed1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4344ManagedPluginExecutionOrderTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4344. - * + * * @author Benjamin Bentmann */ public class MavenITmng4344ManagedPluginExecutionOrderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java index 610712e27c..2cf8c5c019 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4345DefaultPluginExecutionOrderTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4345. - * + * * @author Benjamin Bentmann */ public class MavenITmng4345DefaultPluginExecutionOrderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java index 8677556e8d..9411a31b7c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4347ImportScopeWithSettingsProfilesTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4347. - * + * * @author John Casey */ public class MavenITmng4347ImportScopeWithSettingsProfilesTest @@ -49,19 +49,19 @@ public class MavenITmng4347ImportScopeWithSettingsProfilesTest File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-4347" ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); - + verifier.deleteDirectory( "target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng4347" ); - + verifier.setAutoclean( false ); - + verifier.addCliOption( "-s" ); verifier.addCliOption( "settings.xml" ); - + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", verifier.newDefaultFilterProperties() ); - + verifier.executeGoal( "validate" ); - + verifier.verifyErrorFreeLog(); verifier.resetStreams(); } 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 0d480f47ed..006949dcf5 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 @@ -36,7 +36,7 @@ import java.util.Properties; /** * This is a test set for MNG-4348. - * + * * @author Benjamin Bentmann * */ 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 db290be2ed..e167c262cf 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 @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4349. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java index 626e8bcd57..b3808b5409 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4350LifecycleMappingExecutionOrderTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4350. - * + * * @author Benjamin Bentmann */ public class MavenITmng4350LifecycleMappingExecutionOrderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java index 67d0bba400..65f758e19c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4355ExtensionAutomaticVersionResolutionTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4355. - * + * * @author Benjamin Bentmann */ public class MavenITmng4355ExtensionAutomaticVersionResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java index 21d57ec851..07ba15efbb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4356. - * + * * @author Benjamin Bentmann */ public class MavenITmng4356NoNeedlessRelookupFromActiveCollectionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java index 53572c0ab7..958d777be8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4357LifecycleMappingDiscoveryInReactorTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4357. - * + * * @author Benjamin Bentmann */ public class MavenITmng4357LifecycleMappingDiscoveryInReactorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java index c8d9c8d581..39d017fb1e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4359LocallyReachableParentOutsideOfReactorTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4359. - * + * * @author Benjamin Bentmann */ public class MavenITmng4359LocallyReachableParentOutsideOfReactorTest 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 a2c6d73f2f..7a5238d70b 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 @@ -36,7 +36,7 @@ import java.util.Properties; /** * This is a test set for MNG-4360. - * + * * @author Benjamin Bentmann * */ @@ -50,7 +50,7 @@ public class MavenITmng4360WebDavSupportTest } /** - * Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more + * Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more * that the Jackrabbit based wagon can be properly loaded and doesn't die due to some class realm issue. */ public void testitJackrabbitBasedImpl() @@ -60,7 +60,7 @@ public class MavenITmng4360WebDavSupportTest } /** - * Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more + * Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more * that the Slide based wagon can be properly loaded and doesn't die due to some class realm issue. */ public void testitSlideBasedImpl() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java index c7f5c3eb9a..e5e09afe28 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4361ForceDependencySnapshotUpdateTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4361. - * + * * @author Benjamin Bentmann */ public class MavenITmng4361ForceDependencySnapshotUpdateTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java index 87a89361aa..ce53e2fcc6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4363DynamicAdditionOfDependencyArtifactTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4363. - * + * * @author Benjamin Bentmann */ public class MavenITmng4363DynamicAdditionOfDependencyArtifactTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java index 4aaff1b0ea..e4bbbc56e5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4365XmlMarkupInAttributeValueTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4365. - * + * * @author Benjamin Bentmann */ public class MavenITmng4365XmlMarkupInAttributeValueTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java index ffa7cec161..c58c70a35a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4367LayoutAwareMirrorSelectionTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4367. - * + * * @author Benjamin Bentmann */ public class MavenITmng4367LayoutAwareMirrorSelectionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java index 4f0a0f740d..77113f2fce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4379. - * + * * @author Benjamin Bentmann */ public class MavenITmng4379TransitiveSystemPathInterpolatedWithEnvVarTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java index bf27ce3374..51984cd0c3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4381ExtensionSingletonComponentTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4381. - * + * * @author Benjamin Bentmann */ public class MavenITmng4381ExtensionSingletonComponentTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java index dab9bc45f7..c6d85a37cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4383ValidDependencyVersionTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4383. - * + * * @author Benjamin Bentmann */ public class MavenITmng4383ValidDependencyVersionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java index 192336582e..ce21ba8969 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4385LifecycleMappingFromExtensionInReactorTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4385. - * + * * @author Benjamin Bentmann */ public class MavenITmng4385LifecycleMappingFromExtensionInReactorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java index 3d66e235d8..951ef3ebe2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4386DebugLoggingTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4386. - * + * * @author Benjamin Bentmann */ public class MavenITmng4386DebugLoggingTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java index 95f3c68c99..39e6b72717 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4387QuietLoggingTest.java @@ -29,7 +29,7 @@ import java.util.List; /** * This is a test set for MNG-4387. - * + * * @author Benjamin Bentmann */ public class MavenITmng4387QuietLoggingTest @@ -58,7 +58,7 @@ public class MavenITmng4387QuietLoggingTest verifier.resetStreams(); List lines = verifier.loadLines( "log.txt", "UTF-8" ); - + for ( Iterator it = lines.iterator(); it.hasNext(); ) { String line = it.next(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java index 90ea6fc16f..16b3d15408 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4393ParseExternalParenPomLenientTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4393. - * + * * @author Benjamin Bentmann */ public class MavenITmng4393ParseExternalParenPomLenientTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java index 7b5bc0f93f..28c3012641 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4396AntBased20xMojoSupportTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4396. - * + * * @author Benjamin Bentmann */ public class MavenITmng4396AntBased20xMojoSupportTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java index 2c4852cd23..8efc239f14 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4400RepositoryOrderTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4400. - * + * * @author Benjamin Bentmann */ public class MavenITmng4400RepositoryOrderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java index 3f2c5fa25e..b250a7e229 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4401RepositoryOrderForParentPomTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4401. - * + * * @author Benjamin Bentmann */ public class MavenITmng4401RepositoryOrderForParentPomTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java index f47d234582..24fb3a49fe 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4402DuplicateChildModuleTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4402. - * + * * @author Benjamin Bentmann */ public class MavenITmng4402DuplicateChildModuleTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java index 41c3c80ffc..d73026b3ec 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4404UniqueProfileIdTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4404. - * + * * @author Benjamin Bentmann */ public class MavenITmng4404UniqueProfileIdTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java index 0875bd78a6..8192bad4c1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4405ValidPluginVersionTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4405. - * + * * @author Benjamin Bentmann */ public class MavenITmng4405ValidPluginVersionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java index 9c2f8f548b..508501e69d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4408NonExistentSettingsFileTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4408. - * + * * @author Benjamin Bentmann */ public class MavenITmng4408NonExistentSettingsFileTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java index 91f8798d08..99e14f734a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4410UsageHelpTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4410. - * + * * @author Benjamin Bentmann */ public class MavenITmng4410UsageHelpTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java index 952f8cae1c..22346e3c2c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4411VersionInfoTest.java @@ -25,7 +25,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4411. - * + * * @author Benjamin Bentmann */ public class MavenITmng4411VersionInfoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java index e2d04737f1..c1c5c86bbb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4412OfflineModeInPluginTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4412. - * + * * @author Benjamin Bentmann */ public class MavenITmng4412OfflineModeInPluginTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java index 2a5d48fcd0..a6cc2b72b9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4413MirroringOfDependencyRepoTest.java @@ -41,7 +41,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-4413. - * + * * @author Benjamin Bentmann */ public class MavenITmng4413MirroringOfDependencyRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java index 7d8b70bb80..704880bf61 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4422PluginExecutionPhaseInterpolationTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4422. - * + * * @author Benjamin Bentmann */ public class MavenITmng4422PluginExecutionPhaseInterpolationTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java index 00b0fdc421..c0fd0efef3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4423SessionDataFromPluginParameterExpressionTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4423. - * + * * @author Benjamin Bentmann */ public class MavenITmng4423SessionDataFromPluginParameterExpressionTest 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 2374f7edab..8400570ead 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 @@ -44,7 +44,7 @@ import static org.eclipse.jetty.http.HttpVersion.HTTP_1_1; /** * This is a test set for MNG-4428. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java index a61678820b..5db7b70e58 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4429CompRequirementOnNonDefaultImplTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4429. - * + * * @author Benjamin Bentmann */ public class MavenITmng4429CompRequirementOnNonDefaultImplTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java index 45894b090f..bc2ea1afd2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4430DistributionManagementStatusTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4430. - * + * * @author Benjamin Bentmann */ public class MavenITmng4430DistributionManagementStatusTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java index 73d8eab084..17eb6dfd9e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4433ForceParentSnapshotUpdateTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4433. - * + * * @author Benjamin Bentmann */ public class MavenITmng4433ForceParentSnapshotUpdateTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java index 08d3f65765..17f772a80e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4436SingletonComponentLookupTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4436. - * + * * @author Benjamin Bentmann */ public class MavenITmng4436SingletonComponentLookupTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java index b3c6e57d2e..21114992b2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4450StubModelForMissingDependencyPomTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4450. - * + * * @author Benjamin Bentmann */ public class MavenITmng4450StubModelForMissingDependencyPomTest @@ -60,9 +60,9 @@ public class MavenITmng4450StubModelForMissingDependencyPomTest Properties props = verifier.loadProperties( "target/pom.properties" ); // NOTE: Some Maven versions generate faulty packaging for the stub model (always "pom"), not our business here - assertEquals( "org.apache.maven.its.mng4450:missing:jar:0.1", + assertEquals( "org.apache.maven.its.mng4450:missing:jar:0.1", props.getProperty( "org.apache.maven.its.mng4450:missing:jar:0.1.project.id" ).replaceAll( "pom", "jar" ) ); - assertEquals( "org.apache.maven.its.mng4450:missing:jar:0.1", + assertEquals( "org.apache.maven.its.mng4450:missing:jar:0.1", props.getProperty( "org.apache.maven.its.mng4450:missing:jar:0.1.artifact.id" ).replaceAll( "pom", "jar" ) ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java index 52abbbfde3..f327fc679c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4452ResolutionOfSnapshotWithClassifierTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4452. - * + * * @author Benjamin Bentmann */ public class MavenITmng4452ResolutionOfSnapshotWithClassifierTest @@ -83,11 +83,11 @@ public class MavenITmng4452ResolutionOfSnapshotWithClassifierTest verifier.resetStreams(); List artifacts = verifier.loadLines( "target/artifacts.txt", "UTF-8" ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4452:producer:jar:unix:0.1-SNAPSHOT" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4452:producer:jar:win:0.1-SNAPSHOT" ) ); - assertTrue( artifacts.toString(), + assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4452:producer:war:win:0.1-SNAPSHOT" ) ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java index dafa2bd8c7..96ad02481f 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4453PluginVersionFromLifecycleMappingTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4453. - * + * * @author Benjamin Bentmann */ public class MavenITmng4453PluginVersionFromLifecycleMappingTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java index e221a3dae2..24eb34fccc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4459InMemorySettingsKeptEncryptedTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4459. - * + * * @author Benjamin Bentmann */ public class MavenITmng4459InMemorySettingsKeptEncryptedTest @@ -51,7 +51,7 @@ public class MavenITmng4459InMemorySettingsKeptEncryptedTest Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); - verifier.getSystemProperties().setProperty( "settings.security", + verifier.getSystemProperties().setProperty( "settings.security", new File( testDir, "settings-security.xml" ).getAbsolutePath() ); verifier.addCliOption( "--settings" ); verifier.addCliOption( "settings.xml" ); @@ -60,7 +60,7 @@ public class MavenITmng4459InMemorySettingsKeptEncryptedTest verifier.resetStreams(); Properties props = verifier.loadProperties( "target/settings.properties" ); - assertEquals( "{BteqUEnqHecHM7MZfnj9FwLcYbdInWxou1C929Txa0A=}", + assertEquals( "{BteqUEnqHecHM7MZfnj9FwLcYbdInWxou1C929Txa0A=}", props.getProperty( "settings.servers.0.password", "" ) ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java index e587b8480b..a8501a7217 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4461ArtifactUploadMonitorTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4461. - * + * * @author Benjamin Bentmann */ public class MavenITmng4461ArtifactUploadMonitorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java index 751b617472..5b1a7cd87a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4464PlatformIndependentFileSeparatorTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4464. - * + * * @author Benjamin Bentmann */ public class MavenITmng4464PlatformIndependentFileSeparatorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java index 5cb624c338..aafa84f3f1 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4465. - * + * * @author Benjamin Bentmann */ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest @@ -68,7 +68,7 @@ public class MavenITmng4465PluginPrefixFromLocalCacheOfDownRepoTest verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); - verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", + verifier.filterFile( "settings-template.xml", "settings.xml", "UTF-8", Collections.singletonMap( "@baseurl@", "bad://localhost:63412" ) ); verifier.setLogFileName( "log2.txt" ); verifier.addCliOption( "-s" ); 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 ec26dee3fa..6fa7925127 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 @@ -43,7 +43,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-4469. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java index 4eedfe0656..58de2a217d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4474PerLookupWagonInstantiationTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4474. - * + * * @author Benjamin Bentmann */ public class MavenITmng4474PerLookupWagonInstantiationTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java index 9f17af91da..d3081900c9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-4479. - * + * * @author Benjamin Bentmann */ public class MavenITmng4479ProjectLevelPluginDepUsedForCliConfigTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java index 3ec2c430bd..5eb4ee4544 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4482ForcePluginSnapshotUpdateTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4482. - * + * * @author Benjamin Bentmann */ public class MavenITmng4482ForcePluginSnapshotUpdateTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java index cf28787cc6..c9c46e6394 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4488ValidateExternalParenPomLenientTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4488. - * + * * @author Benjamin Bentmann */ public class MavenITmng4488ValidateExternalParenPomLenientTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java index 4829c26643..ac4e4f0fe2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4489MirroringOfExtensionRepoTest.java @@ -41,7 +41,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-4489. - * + * * @author Benjamin Bentmann */ public class MavenITmng4489MirroringOfExtensionRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java index 10b1adcac3..8f07168a4d 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4498IgnoreBrokenMetadataTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4498. - * + * * @author Benjamin Bentmann */ public class MavenITmng4498IgnoreBrokenMetadataTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java index 25d9e44036..8e03373bf7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4500NoUpdateOfTimestampedSnapshotsTest.java @@ -38,7 +38,7 @@ import java.util.Properties; /** * This is a test set for MNG-4500. - * + * * @author Benjamin Bentmann */ public class MavenITmng4500NoUpdateOfTimestampedSnapshotsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java index 4063320441..ba689a1ced 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4522FailUponMissingDependencyParentPomTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4522. - * + * * @author Benjamin Bentmann */ public class MavenITmng4522FailUponMissingDependencyParentPomTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java index 9b203a2e92..3081a303c7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4526MavenProjectArtifactsScopeTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4526. - * + * * @author Benjamin Bentmann */ public class MavenITmng4526MavenProjectArtifactsScopeTest @@ -60,17 +60,17 @@ public class MavenITmng4526MavenProjectArtifactsScopeTest verifier.resetStreams(); List artifacts; - + artifacts = verifier.loadLines( "target/compile.txt", "UTF-8" ); assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:a:jar:0.1" ) ); assertFalse( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:b:jar:0.1" ) ); assertFalse( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:c:jar:0.1" ) ); - + artifacts = verifier.loadLines( "target/runtime.txt", "UTF-8" ); assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:a:jar:0.1" ) ); assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:b:jar:0.1" ) ); assertFalse( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:c:jar:0.1" ) ); - + artifacts = verifier.loadLines( "target/test.txt", "UTF-8" ); assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:a:jar:0.1" ) ); assertTrue( artifacts.toString(), artifacts.contains( "org.apache.maven.its.mng4526:b:jar:0.1" ) ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java index 52a909f7f5..2732863ec6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4528. - * + * * @author Benjamin Bentmann */ public class MavenITmng4528ExcludeWagonsFromMavenCoreArtifactsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java index fe5efd9983..c9a8178d34 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4536RequiresNoProjectForkingMojoTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4536. - * + * * @author Benjamin Bentmann */ public class MavenITmng4536RequiresNoProjectForkingMojoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java index 10c25a9e29..0b59ef2b9a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4544ActiveComponentCollectionThreadSafeTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4544. - * + * * @author Benjamin Bentmann */ public class MavenITmng4544ActiveComponentCollectionThreadSafeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java index ae21d31ddb..6baec3f88a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4553CoreArtifactFilterConsidersGroupIdTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4553. - * + * * @author Benjamin Bentmann */ public class MavenITmng4553CoreArtifactFilterConsidersGroupIdTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java index 0f22d93daf..b550980810 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4554PluginPrefixMappingUpdateTest.java @@ -40,7 +40,7 @@ import java.util.Properties; /** * This is a test set for MNG-4554. - * + * * @author Benjamin Bentmann */ public class MavenITmng4554PluginPrefixMappingUpdateTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java index cb57ee5ff1..86d65142c4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4561MirroringOfPluginRepoTest.java @@ -41,7 +41,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-4561. - * + * * @author Benjamin Bentmann */ public class MavenITmng4561MirroringOfPluginRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java index 9f7def8e7a..d219dcd5f9 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4565MultiConditionProfileActivationTest.java @@ -26,7 +26,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-3106: - * + * * When multiple activators are present in a profile they should be AND'd. All activator must * conditions must be satisfied in order for the profile to be activated. */ @@ -40,9 +40,9 @@ public class MavenITmng4565MultiConditionProfileActivationTest /** * Test build with two profiles, each with more than one activator. - * The profiles should be activated even though only one of the activators + * The profiles should be activated even though only one of the activators * returns true. - * + * */ public void testProfilesWithMultipleActivators() throws Exception @@ -58,7 +58,7 @@ public class MavenITmng4565MultiConditionProfileActivationTest verifier.executeGoal( "validate" ); // - // The property profile1.on = true so only profile1 should be activated. The profile2.on property is not true so profile2 + // The property profile1.on = true so only profile1 should be activated. The profile2.on property is not true so profile2 // should not be activated. Only the profile1/touch.txt file should be generated. // verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java index c3ab1012d1..cafc98633b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4572ModelVersionSurroundedByWhitespaceTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4572. - * + * * @author Benjamin Bentmann */ public class MavenITmng4572ModelVersionSurroundedByWhitespaceTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java index 4cf2785312..f08493348e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4580. - * + * * @author Benjamin Bentmann */ public class MavenITmng4580ProjectLevelPluginDepUsedForCliInvocInReactorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java index f4566d31ca..05ccbc7311 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4586. - * + * * @author Benjamin Bentmann */ public class MavenITmng4586PluginPrefixResolutionFromVersionlessPluginMngtTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java index 21d8eb851e..4daf1c8f78 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4590ImportedPomUsesSystemPropertiesTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4590. - * + * * @author Benjamin Bentmann */ public class MavenITmng4590ImportedPomUsesSystemPropertiesTest @@ -63,7 +63,7 @@ public class MavenITmng4590ImportedPomUsesSystemPropertiesTest Properties props = verifier.loadProperties( "target/pom.properties" ); assertEquals( "1", props.getProperty( "project.dependencyManagement.dependencies" ) ); assertEquals( "dep-a", props.getProperty( "project.dependencyManagement.dependencies.0.artifactId" ) ); - assertEquals( new File( testDir, "pom.xml" ).getAbsoluteFile(), + assertEquals( new File( testDir, "pom.xml" ).getAbsoluteFile(), new File( props.getProperty( "project.dependencyManagement.dependencies.0.systemPath" ) ) ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java index 4051146b4b..fc5446c810 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4600DependencyOptionalFlagManagementTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-4600. - * + * * @author Benjamin Bentmann */ public class MavenITmng4600DependencyOptionalFlagManagementTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java index 46cfcb9b18..0d4a6baef2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4615ValidateRequiredPluginParameterTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4615. - * + * * @author Benjamin Bentmann */ public class MavenITmng4615ValidateRequiredPluginParameterTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java index d010e57884..0662ccab47 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4618AggregatorBuiltAfterModulesTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4618. - * + * * @author Benjamin Bentmann */ public class MavenITmng4618AggregatorBuiltAfterModulesTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java index 16a89c898c..450f3cd7f6 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-4625. - * + * * @author Benjamin Bentmann */ public class MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest @@ -59,7 +59,7 @@ public class MavenITmng4625SettingsXmlInterpolationWithXmlMarkupTest if( Os.isFamily( Os.FAMILY_WINDOWS ) && !System.getProperties().contains( "CLASSWORLDS_LAUNCHER" ) ) { verifier.setSystemProperty( "test.prop", "\"&x=y<>\"" ); - verifier.setForkJvm( true ); // force forked JVM, since the workaround expects forked run + verifier.setForkJvm( true ); // force forked JVM, since the workaround expects forked run } else { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java index f17896db83..7c1424d330 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4629. - * + * * @author Benjamin Bentmann */ public class MavenITmng4629NoPomValidationErrorUponMissingSystemDepTest 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 8403e5f0a3..e74e1b01f9 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 @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-4633. - * + * * * @author Kristian Rosenvold */ @@ -55,5 +55,5 @@ public class MavenITmng4633DualCompilerExecutionsWeaveModeTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); } - + } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java index d434a93fe2..15f8352ab5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4644StrictPomParsingRejectsMisplacedTextTest.java @@ -27,7 +27,7 @@ import java.io.File; /** * This is a test set for MNG-4644. - * + * * @author Benjamin Bentmann */ public class MavenITmng4644StrictPomParsingRejectsMisplacedTextTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java index 9515b55b73..1715cfa4e2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4654ArtifactHandlerForMainArtifactTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4654. - * + * * @author Benjamin Bentmann */ public class MavenITmng4654ArtifactHandlerForMainArtifactTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java index 7bd20e5e25..bf2e0ca123 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4677DisabledPluginConfigInheritanceTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4677. - * + * * @author Benjamin Bentmann */ public class MavenITmng4677DisabledPluginConfigInheritanceTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java index f0854ca569..4e30759f62 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4679SnapshotUpdateInPluginTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4679. - * + * * @author Benjamin Bentmann */ public class MavenITmng4679SnapshotUpdateInPluginTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java index 641bda7419..5faa29608b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4684DistMngtOverridenByProfileTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4684. - * + * * @author Benjamin Bentmann */ public class MavenITmng4684DistMngtOverridenByProfileTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java index d5e743d049..a3c55e9872 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4690InterdependentConflictResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4690. - * + * * @author Benjamin Bentmann */ public class MavenITmng4690InterdependentConflictResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java index 752ef87638..93489721ef 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4720DependencyManagementExclusionMergeTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4720. - * + * * @author Benjamin Bentmann */ public class MavenITmng4720DependencyManagementExclusionMergeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java index 7780ec59a2..fbef6a0649 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4721OptionalPluginDependencyTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4721. - * + * * @author Benjamin Bentmann */ public class MavenITmng4721OptionalPluginDependencyTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java index f6d4b67689..250056afa3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest.java @@ -41,7 +41,7 @@ import static org.eclipse.jetty.util.security.Constraint.__BASIC_AUTH; /** * This is a test set for MNG-4729. - * + * * @author Benjamin Bentmann */ public class MavenITmng4729MirrorProxyAuthUsedByProjectBuilderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java index 1c3e067e69..149ab243e2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4747JavaAgentUsedByPluginTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4747. - * + * * @author Benjamin Bentmann */ public class MavenITmng4747JavaAgentUsedByPluginTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java index 2eebaec569..ec25e089ab 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-4750 and * MNG-4845. - * + * * @author Benjamin Bentmann */ public class MavenITmng4750ResolvedMavenProjectDependencyArtifactsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java index 4c850c6406..03b0fcbbfd 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4755FetchRemoteMetadataForVersionRangeTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4755. - * + * * @author Benjamin Bentmann */ public class MavenITmng4755FetchRemoteMetadataForVersionRangeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java index c3d65a6204..6c6fc84c1c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4761PluginLevelDependencyScopesTest.java @@ -39,9 +39,9 @@ public class MavenITmng4761PluginLevelDependencyScopesTest /** * Verify that plugin-level dependencies specified in a user's pom.xml DO NOT use compile scope. - * Using any scope other than runtime for plugin dependencies may favor them and their transitive + * Using any scope other than runtime for plugin dependencies may favor them and their transitive * dependencies inappropriately, leading to unpredictable results. - * + * * Plugin-dependency scope should be DISREGARDED, and runtime scope should be forced. */ public void testit() diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java index 30fdc74c9c..2510b94ecf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4765LocalPomProjectBuilderTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4765. - * + * * @author Benjamin Bentmann */ public class MavenITmng4765LocalPomProjectBuilderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java index 6cda9709c9..3c954c22d5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4768NearestMatchConflictResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4768. - * + * * @author Benjamin Bentmann */ public class MavenITmng4768NearestMatchConflictResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java index 56b5d90c86..d4ed73ffa2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest.java @@ -36,7 +36,7 @@ import java.util.concurrent.ConcurrentLinkedDeque; /** * This is a test set for MNG-4771. - * + * * @author Benjamin Bentmann */ public class MavenITmng4771PluginPrefixResolutionDoesntTouchDisabledRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java index 82390a1af0..4cd7e2c990 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest.java @@ -37,7 +37,7 @@ import java.util.Properties; /** * This is a test set for MNG-4772. - * + * * @author Benjamin Bentmann */ public class MavenITmng4772PluginVersionResolutionDoesntTouchDisabledRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java index b4c6e37390..1b876d0fe3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4776ForkedReactorPluginVersionResolutionTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4776. - * + * * @author Benjamin Bentmann */ public class MavenITmng4776ForkedReactorPluginVersionResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java index 58f7300aa1..0dbb51bdb7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4779. - * + * * @author Benjamin Bentmann */ public class MavenITmng4779MultipleDepsWithVersionRangeFromLocalRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java index 8783ab58a2..42907b4674 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4781DeploymentToNexusStagingRepoTest.java @@ -38,7 +38,7 @@ import static org.hamcrest.MatcherAssert.assertThat; /** * This is a test set for MNG-4781. - * + * * @author Benjamin Bentmann */ public class MavenITmng4781DeploymentToNexusStagingRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java index 541257a3ad..8650d8d131 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4785TransitiveResolutionInForkedThreadTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4785. - * + * * @author Benjamin Bentmann */ public class MavenITmng4785TransitiveResolutionInForkedThreadTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java index 5e7822dd1e..3958ec735a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4786AntBased21xMojoSupportTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4786. - * + * * @author Benjamin Bentmann */ public class MavenITmng4786AntBased21xMojoSupportTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java index fc24a4ca3b..b44a726b05 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4788InstallationToCustomLocalRepoTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4788. - * + * * @author Benjamin Bentmann */ public class MavenITmng4788InstallationToCustomLocalRepoTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java index 6369622088..14b726d1bf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4789ScopeInheritanceMeetsConflictTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4789. - * + * * @author Benjamin Bentmann */ public class MavenITmng4789ScopeInheritanceMeetsConflictTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java index 910beac837..51fd88b125 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4791. - * + * * @author Benjamin Bentmann */ public class MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest @@ -61,7 +61,7 @@ public class MavenITmng4791ProjectBuilderResolvesRemotePomArtifactTest Properties props = verifier.loadProperties( "target/pom.properties" ); - assertEquals( "0.1-20100902.190819-1", + assertEquals( "0.1-20100902.190819-1", props.getProperty( "org.apache.maven.its.mng4791:a:pom:0.1-SNAPSHOT.version" ) ); String path = props.getProperty( "org.apache.maven.its.mng4791:a:pom:0.1-SNAPSHOT.file" ); assertTrue( path, path.endsWith( ".pom" ) ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java index d8bb98e167..7e41a7adc2 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4795. - * + * * @author Benjamin Bentmann */ public class MavenITmng4795DepResolutionInReactorProjectForkedByLifecycleTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java index 9e163202b5..9a6fcd3d52 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4800NearestWinsVsScopeWideningTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4800. - * + * * @author Benjamin Bentmann */ public class MavenITmng4800NearestWinsVsScopeWideningTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java index 1b1273e31d..17dd012b0e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4829ChecksumFailureWarningTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4829. - * + * * @author Benjamin Bentmann */ public class MavenITmng4829ChecksumFailureWarningTest @@ -73,7 +73,7 @@ public class MavenITmng4829ChecksumFailureWarningTest foundWarningJar = true; } } - + assertTrue( "Checksum warning for corrupt.pom has not been logged.", foundWarningPom ); assertTrue( "Checksum warning for corrupt.jar has not been logged.", foundWarningJar ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java index 8e0c7ca55e..cf726d5c8e 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4834ParentProjectResolvedFromRemoteReposTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4834. - * + * * @author Benjamin Bentmann */ public class MavenITmng4834ParentProjectResolvedFromRemoteReposTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java index 3bd667fcdb..9eff83e285 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4840MavenPrerequisiteTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4840. - * + * * @author Benjamin Bentmann */ public class MavenITmng4840MavenPrerequisiteTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java index aecd0b21f1..ff8329ff02 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4842ParentResolutionOfDependencyPomTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4842. - * + * * @author Benjamin Bentmann */ public class MavenITmng4842ParentResolutionOfDependencyPomTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java index d9eda363de..3c710ff708 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4872ReactorResolutionAttachedWithExclusionsTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4872. - * + * * @author Benjamin Bentmann */ public class MavenITmng4872ReactorResolutionAttachedWithExclusionsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java index a1162394e4..b3908774f5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4874UpdateLatestPluginVersionTest.java @@ -26,7 +26,7 @@ import org.apache.maven.shared.utils.io.FileUtils; /** * This is a test set for MNG-4874. - * + * * @author Benjamin Bentmann */ public class MavenITmng4874UpdateLatestPluginVersionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java index 9b89e23ef6..27f912327c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4877DeployUsingPrivateKeyTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4877. - * + * * @author Benjamin Bentmann */ public class MavenITmng4877DeployUsingPrivateKeyTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java index a559b20836..89001ccd43 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4883FailUponOverconstrainedVersionRangesTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4883. - * + * * @author Benjamin Bentmann */ public class MavenITmng4883FailUponOverconstrainedVersionRangesTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java index 961d8d3e0f..c5a18d44ce 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4890MakeLikeReactorConsidersVersionsTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4890. - * + * * @author Benjamin Bentmann */ public class MavenITmng4890MakeLikeReactorConsidersVersionsTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java index 0302cb9153..2d6ee6a274 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4891RobustSnapshotResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4891. - * + * * @author Benjamin Bentmann */ public class MavenITmng4891RobustSnapshotResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java index 3aa5140359..a3803d5ff3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4895PluginDepWithNonRelocatedMavenApiTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4895. - * + * * @author Benjamin Bentmann */ public class MavenITmng4895PluginDepWithNonRelocatedMavenApiTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java index 5894dff799..1766195c2c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4913UserPropertyVsDependencyPomPropertyTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4913. - * + * * @author Benjamin Bentmann */ public class MavenITmng4913UserPropertyVsDependencyPomPropertyTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java index d3823b801e..296ce55229 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4919LifecycleMappingWithSameGoalTwiceTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4919. - * + * * @author Benjamin Bentmann */ public class MavenITmng4919LifecycleMappingWithSameGoalTwiceTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java index 8aaeaa54eb..88b5968019 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4925ContainerLookupRealmDuringMojoExecTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4925. - * + * * @author Benjamin Bentmann */ public class MavenITmng4925ContainerLookupRealmDuringMojoExecTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java index 461018f590..c01bc7015b 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4936EventSpyTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4936. - * + * * @author Benjamin Bentmann */ public class MavenITmng4936EventSpyTest @@ -60,15 +60,15 @@ public class MavenITmng4936EventSpyTest List lines = verifier.loadLines( "target/spy.log", "UTF-8" ); assertTrue( lines.toString(), lines.get( 0 ).toString().startsWith( "init" ) ); assertTrue( lines.toString(), lines.get( lines.size() - 1 ).toString().startsWith( "close" ) ); - assertTrue( lines.toString(), + assertTrue( lines.toString(), lines.contains( "event: org.apache.maven.settings.building.DefaultSettingsBuildingRequest" ) ); - assertTrue( lines.toString(), + assertTrue( lines.toString(), lines.contains( "event: org.apache.maven.settings.building.DefaultSettingsBuildingResult" ) ); - assertTrue( lines.toString(), + assertTrue( lines.toString(), lines.contains( "event: org.apache.maven.execution.DefaultMavenExecutionRequest" ) ); - assertTrue( lines.toString(), + assertTrue( lines.toString(), lines.contains( "event: org.apache.maven.execution.DefaultMavenExecutionResult" ) ); - assertTrue( lines.toString(), + assertTrue( lines.toString(), lines.contains( "event: org.apache.maven.lifecycle.internal.DefaultExecutionEvent" ) ); } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java index b22d4d6bfb..f20476f9de 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4952MetadataReleaseInfoUpdateTest.java @@ -27,7 +27,7 @@ import org.apache.maven.shared.utils.io.FileUtils; /** * This is a test set for MNG-4952. - * + * * @author Benjamin Bentmann */ public class MavenITmng4952MetadataReleaseInfoUpdateTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java index e78296103d..70ee0a0940 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4955LocalVsRemoteSnapshotResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4955. - * + * * @author Benjamin Bentmann */ public class MavenITmng4955LocalVsRemoteSnapshotResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java index b2593b0f91..ce99d8a8d7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4960MakeLikeReactorResumeTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4960. - * + * * @author Benjamin Bentmann */ public class MavenITmng4960MakeLikeReactorResumeTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java index 1aadfdd103..c0efab30cb 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4963ParentResolutionFromMirrorTest.java @@ -26,7 +26,7 @@ import java.io.File; /** * This is a test set for MNG-4963. - * + * * @author Benjamin Bentmann */ public class MavenITmng4963ParentResolutionFromMirrorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java index 5e2fad8b9e..3aac1547da 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4966AbnormalUrlPreservationTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4966. - * + * * @author Benjamin Bentmann */ public class MavenITmng4966AbnormalUrlPreservationTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java index d1e1e67208..ea49cdbf89 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4973ExtensionVisibleToPluginInReactorTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-4973. - * + * * @author Benjamin Bentmann */ public class MavenITmng4973ExtensionVisibleToPluginInReactorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java index d27044fa99..e031097ae0 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4975ProfileInjectedPluginExecutionOrderTest.java @@ -28,7 +28,7 @@ import java.util.List; /** * This is a test set for MNG-4975. - * + * * @author Benjamin Bentmann */ public class MavenITmng4975ProfileInjectedPluginExecutionOrderTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java index 01be561521..fe48962797 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4987TimestampBasedSnapshotSelectionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-4987. - * + * * @author Benjamin Bentmann */ public class MavenITmng4987TimestampBasedSnapshotSelectionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java index 64d89d53c9..47a4ad16e7 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng4991NonProxyHostsTest.java @@ -34,7 +34,7 @@ import java.util.Properties; /** * This is a test set for MNG-4991. - * + * * @author Benjamin Bentmann */ public class MavenITmng4991NonProxyHostsTest 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 d55b09de20..068a26ec8a 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 @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-5000. Note this is a subtle * variation and not a duplicate of the test for MNG-2006. - * + * * @author Benjamin Bentmann * */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java index e6c49661e5..971abc6d68 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5006VersionRangeDependencyParentResolutionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-5006. - * + * * @author Benjamin Bentmann */ public class MavenITmng5006VersionRangeDependencyParentResolutionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java index e71b8510a2..135b2902b3 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5064SuppressSnapshotUpdatesTest.java @@ -38,7 +38,7 @@ import java.util.Properties; /** * This is a test set for MNG-5064. - * + * * @author Benjamin Bentmann */ public class MavenITmng5064SuppressSnapshotUpdatesTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java index 444e6cffff..e98684788a 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-5096. - * + * * @author Benjamin Bentmann */ public class MavenITmng5096ExclusionAtDependencyWithImpliedClassifierTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java index 3ccd5c3a32..7947def3d8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5135AggregatorDepResolutionModuleExtensionTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-5135. - * + * * @author Benjamin Bentmann */ public class MavenITmng5135AggregatorDepResolutionModuleExtensionTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java index 7093f696b3..f27e8250af 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5137ReactorResolutionInForkedBuildTest.java @@ -27,7 +27,7 @@ import java.util.List; /** * This is a test set for MNG-5137. - * + * * @author Benjamin Bentmann */ public class MavenITmng5137ReactorResolutionInForkedBuildTest @@ -55,7 +55,7 @@ public class MavenITmng5137ReactorResolutionInForkedBuildTest verifier.deleteDirectory( "producer/target" ); verifier.deleteDirectory( "consumer/target" ); verifier.deleteArtifacts( "org.apache.maven.its.mng5137" ); - verifier.executeGoal( + verifier.executeGoal( "org.apache.maven.its.plugins:maven-it-plugin-fork:2.1-SNAPSHOT:fork-lifecycle-aggregator" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java index aed1eb1d33..df76e2392c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5230MakeReactorWithExcludesTest.java @@ -34,7 +34,7 @@ public class MavenITmng5230MakeReactorWithExcludesTest public MavenITmng5230MakeReactorWithExcludesTest() { - super( "[3.2,)" ); + super( "[3.2,)" ); } private void clean( Verifier verifier ) @@ -204,7 +204,7 @@ public class MavenITmng5230MakeReactorWithExcludesTest verifier.assertFileNotPresent( "mod-d/target/touch.txt" ); } - + /** * Verify that the project list can also specify project ids for exclusion */ @@ -254,7 +254,7 @@ public class MavenITmng5230MakeReactorWithExcludesTest verifier.assertFilePresent( "mod-c/target/touch.txt" ); verifier.assertFilePresent( "mod-d/target/touch.txt" ); } - + /** * Verify that reactor is resumed from specified project with exclude */ diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java index bc6cd94603..bbfb9a0180 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5280SettingsProfilesRepositoriesOrderTest.java @@ -37,7 +37,7 @@ import java.util.Properties; /** * This is a test set for MNG-5280. - * + * * @author Anders Hammar */ public class MavenITmng5280SettingsProfilesRepositoriesOrderTest @@ -163,7 +163,7 @@ public class MavenITmng5280SettingsProfilesRepositoriesOrderTest writer.println( " fake-artifact" ); writer.println( " 1.0" ); writer.println( "" ); - + response.setStatus( HttpServletResponse.SC_OK ); } else if ( uri.endsWith( ".jar" ) ) diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java index cec34d93a9..bc698aacbf 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5382Jsr330Plugin.java @@ -60,7 +60,7 @@ public class MavenITmng5382Jsr330Plugin { // // Build a plugin that uses a JSR330 plugin - // + // Verifier v0 = newVerifier( testDir.getAbsolutePath(), "remote" ); v0.setAutoclean( false ); v0.deleteDirectory( "target" ); @@ -68,7 +68,7 @@ public class MavenITmng5382Jsr330Plugin v0.executeGoal( "install" ); v0.verifyErrorFreeLog(); v0.resetStreams(); - + // // Execute the JSR330 plugin // diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java index 6eff63857c..a9224ecb02 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5418FileProjectPropertiesActivatorTest.java @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-5418. - * + * * @author Olivier Lamy */ public class MavenITmng5418FileProjectPropertiesActivatorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java index b7167b49e5..a429441514 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5482AetherNotFoundTest.java @@ -28,10 +28,10 @@ import java.util.regex.Pattern; /** * This is a test set for MNG-5482. - * + * * It checks that plugins and reports causing errors because of Aether change from Sonatype to Eclipse * get a dedicated message to explain solution to end-users - * + * * @author hboutemy */ public class MavenITmng5482AetherNotFoundTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java index b314bd2291..799e9a84a8 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5503ZipInReactorTest.java @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-5418. - * + * * @author jvz */ public class MavenITmng5503ZipInReactorTest diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java index 2d2ce0511f..1c64b791aa 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5557ProperlyRestrictedReactor.java @@ -29,7 +29,7 @@ import org.apache.maven.it.util.ResourceExtractor; * multi-module project where only project-0, and project-1 are specified to be used. The project-0 has a dependency on * project-4 and in this constrained mode the dependency resolution should fail because project-4 is no longer placed in * the reactor. - * + * * @author jvanzyl */ public class MavenITmng5557ProperlyRestrictedReactor diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java index a0c49164ea..41b80cd284 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5572ReactorPluginExtensionsTest.java @@ -26,8 +26,8 @@ import java.io.File; /** * This is a test set for MNG-5572 * as a response to MNG-1911 - * - * + * + * * @author rfscholte */ public class MavenITmng5572ReactorPluginExtensionsTest @@ -40,7 +40,7 @@ public class MavenITmng5572ReactorPluginExtensionsTest } /** - * Test that Maven warns when one reactor project contains a plugin, and another tries to use it with extensions + * Test that Maven warns when one reactor project contains a plugin, and another tries to use it with extensions */ public void testit() throws Exception diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java index d68d79d736..2104187ddc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5576CdFriendlyVersions.java @@ -28,7 +28,7 @@ import java.util.Properties; /** * This is a test set for MNG-5576. - * + * * @author Jason van Zyl */ public class MavenITmng5576CdFriendlyVersions @@ -51,7 +51,7 @@ public class MavenITmng5576CdFriendlyVersions Verifier verifier = newVerifier( testDir.getAbsolutePath() ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); - verifier.addCliOption( "-Dchangelist=changelist" ); + verifier.addCliOption( "-Dchangelist=changelist" ); verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); @@ -59,7 +59,7 @@ public class MavenITmng5576CdFriendlyVersions Properties props = verifier.loadProperties( "target/pom.properties" ); assertEquals( "1.0.0.changelist", props.getProperty( "project.version" ) ); - + List lines = verifier.loadFile( new File( testDir, "log.txt" ), false ); for( String line : lines ) { @@ -80,7 +80,7 @@ public class MavenITmng5576CdFriendlyVersions verifier.setLogFileName( "log-bc.txt" ); verifier.setAutoclean( false ); verifier.deleteDirectory( "target" ); - verifier.addCliOption( "-Dchangelist=changelist" ); + verifier.addCliOption( "-Dchangelist=changelist" ); verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" ); verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); @@ -88,7 +88,7 @@ public class MavenITmng5576CdFriendlyVersions Properties props = verifier.loadProperties( "target/pom.properties" ); assertEquals( "1.0.0.changelist", props.getProperty( "project.version" ) ); - + List lines = verifier.loadFile( new File( testDir, "log-bc.txt" ), false ); for( String line : lines ) { diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java index b22fb4cdda..bf8a0957b4 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5716ToolchainsTypeTest.java @@ -27,7 +27,7 @@ import java.util.Properties; /** * This is a test set for MNG-5716. - * + * * @author Hervé Boutemy */ public class MavenITmng5716ToolchainsTypeTest @@ -39,7 +39,7 @@ public class MavenITmng5716ToolchainsTypeTest } /** - * + * */ public void testitMNG5716() throws Exception @@ -51,7 +51,7 @@ public class MavenITmng5716ToolchainsTypeTest new File( javaHome, "bin" ).mkdirs(); new File( javaHome, "bin/javac").createNewFile(); new File( javaHome, "bin/javac.exe").createNewFile(); - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); Properties properties = verifier.newDefaultFilterProperties(); properties.setProperty( "@javaHome@", javaHome.getAbsolutePath() ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java index 4888f1cca2..35d22c0c82 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5753CustomMojoExecutionConfiguratorTest.java @@ -35,7 +35,7 @@ public class MavenITmng5753CustomMojoExecutionConfiguratorTest public void testCustomMojoExecutionConfigurator() throws Exception - { + { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5753-custom-mojo-execution-configurator" ); File pluginDir = new File( testDir, "plugin" ); File projectDir = new File( testDir, "project" ); @@ -56,7 +56,7 @@ public class MavenITmng5753CustomMojoExecutionConfiguratorTest verifier.executeGoal( "validate" ); verifier.resetStreams(); verifier.verifyErrorFreeLog(); - + verifier.assertFilePresent( configurationFile.getCanonicalPath() ); // // The element in the original configuration is "ORIGINAL". We want to assert that our diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java index 37d3c486f3..23bd4ae215 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5771CoreExtensionsTest.java @@ -8,7 +8,7 @@ import org.apache.maven.it.util.ResourceExtractor; /** * This is a test set for MNG-5771: * check that Maven loads core extensions and components contributed by .mvn/extensions.xml - * are available to regular plugins. + * are available to regular plugins. */ public class MavenITmng5771CoreExtensionsTest extends AbstractMavenIntegrationTestCase @@ -53,7 +53,7 @@ public class MavenITmng5771CoreExtensionsTest verifier.verifyErrorFreeLog(); verifier.resetStreams(); } - + // // https://issues.apache.org/jira/browse/MNG-5795: Maven extensions can not be retrieved from authenticated repositories // @@ -71,7 +71,7 @@ public class MavenITmng5771CoreExtensionsTest .source(new File(testDir, "repo")) // .build(); server.start(); - + Verifier verifier = newVerifier( testDir.getAbsolutePath() ); Properties properties = verifier.newDefaultFilterProperties(); properties.setProperty("@port@", Integer.toString(server.port())); @@ -85,7 +85,7 @@ public class MavenITmng5771CoreExtensionsTest verifier.executeGoal( "validate" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + server.stop(); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java index b29204a789..6019591bb5 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5774ConfigurationProcessorsTest.java @@ -29,7 +29,7 @@ public class MavenITmng5774ConfigurationProcessorsTest verifier.executeGoal( "process-resources" ); verifier.verifyErrorFreeLog(); // Making sure our configuration processor executes - verifier.verifyTextInLog( "[INFO] ConfigurationProcessorOne.process()" ); + verifier.verifyTextInLog( "[INFO] ConfigurationProcessorOne.process()" ); // We have a property value injected by our configuration processor. Make sure it's correct verifier.assertFilePresent( "target/classes/result.properties" ); Properties result = verifier.loadProperties( "target/classes/result.properties" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java index 0e8aa014f8..17e942a2ed 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration.java @@ -17,7 +17,7 @@ public class MavenITmng5805PkgTypeMojoConfiguration throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5805-pkg-type-mojo-configuration" ); - + Verifier verifier; verifier = newVerifier( testDir.getAbsolutePath() ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java index ca1c0e3a6e..9d9a393e81 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5805PkgTypeMojoConfiguration2.java @@ -17,9 +17,9 @@ public class MavenITmng5805PkgTypeMojoConfiguration2 throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5805-pkg-type-mojo-configuration2" ); - + Verifier verifier; - + verifier = newVerifier( testDir.getAbsolutePath() ); verifier.executeGoal( "validate" ); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java index 281b71bb99..bee5b139dc 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840ParentVersionRanges.java @@ -11,12 +11,12 @@ public class MavenITmng5840ParentVersionRanges { super( "[3.3,)" ); } - + public void testParentRangeRelativePathPointsToWrongVersion() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5840-relative-path-range-negative" ); - + Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); @@ -27,12 +27,12 @@ public class MavenITmng5840ParentVersionRanges verifier.verifyErrorFreeLog(); verifier.resetStreams(); } - + public void testParentRangeRelativePathPointsToCorrectVersion() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5840-relative-path-range-positive" ); - + Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); @@ -43,5 +43,5 @@ public class MavenITmng5840ParentVersionRanges verifier.verifyErrorFreeLog(); verifier.resetStreams(); } - + } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java index 93a8d0bfef..f33297ddde 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5840RelativePathReactorMatching.java @@ -11,12 +11,12 @@ public class MavenITmng5840RelativePathReactorMatching { super( ALL_MAVEN_VERSIONS ); } - + public void testRelativePathPointsToWrongVersion() throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5840-relative-path-reactor-matching" ); - + Verifier verifier = newVerifier( new File( testDir, "parent-1" ).getAbsolutePath(), "remote" ); verifier.executeGoal( "install" ); verifier.verifyErrorFreeLog(); diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java index 5d0db8583f..df4587bbac 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5895CIFriendlyUsageWithPropertyTest.java @@ -25,12 +25,12 @@ import org.apache.maven.it.util.ResourceExtractor; import java.io.File; /** - * The usage of a ${revision} for the version in the pom file and furthermore + * The usage of a ${revision} for the version in the pom file and furthermore * defining the property in the pom file and overwrite it via command line. * MNG-5895. - * + * * This will result in a failure without the fix for this issue. - * + * * @author Karl Heinz Marbaise khmarbaise@apache.org */ public class MavenITmng5895CIFriendlyUsageWithPropertyTest @@ -45,9 +45,9 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest } /** - * Check that the resulting run will not fail in case + * Check that the resulting run will not fail in case * of defining the property via command line which is - * already defined inside the pom. + * already defined inside the pom. */ public void testitShouldResolveTheDependenciesWithoutBuildConsumer() throws Exception @@ -72,11 +72,11 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest throws Exception { File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-5895-ci-friendly-usage-with-property" ); - + Verifier verifier = newVerifier( testDir.getAbsolutePath(), false ); verifier.setMavenDebug( false ); verifier.setAutoclean( false ); - + verifier.setLogFileName( "log-bc.txt" ); verifier.addCliOption( "-Drevision=1.2" ); verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" ); @@ -84,7 +84,7 @@ public class MavenITmng5895CIFriendlyUsageWithPropertyTest verifier.executeGoal( "package" ); verifier.verifyErrorFreeLog(); verifier.resetStreams(); - + } - + } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java index 4298e81c4d..221850004c 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest.java @@ -25,7 +25,7 @@ import java.io.File; /** * This is a test set for MNG-5898. - * + * * @author Karl Heinz Marbaise */ public class MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest @@ -38,7 +38,7 @@ public class MavenITmng5898BuildMultimoduleWithEARFailsToResolveWARTest } /** - * + * */ public void testit() throws Exception diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java index 02e9f5ba17..4b47d80070 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng5937MavenWrapper.java @@ -42,20 +42,20 @@ public class MavenITmng5937MavenWrapper extends AbstractMavenIntegrationTestCase { private Path wrapperDistro; - + private final Map envVars; - + private final Path baseDir = Paths.get( "target/test-classes/mng-5937 wrapper" ); - + private ZipUnArchiver zipUnArchiver = new ZipUnArchiver(); - + public MavenITmng5937MavenWrapper() throws Exception { super( "[4.0.0-alpha-1,)" ); - + String localRepo = System.getProperty("maven.repo.local"); - + envVars = new HashMap<>( 4 ); envVars.put( "MVNW_REPOURL", Paths.get( localRepo ).toUri().toURL().toString() ); envVars.put( "MVNW_VERBOSE", "true" ); @@ -76,7 +76,7 @@ public class MavenITmng5937MavenWrapper { throw new IllegalStateException( "Missing maven.distro=${mavenDistro} parameter to test maven-wrapper: see run ITs instructions" ); } - + Verifier distInstaller = newVerifier( baseDir.toAbsolutePath().toFile().toString() ); distInstaller.setSystemProperty( "file", mavenDist ); distInstaller.setSystemProperty( "groupId", "org.apache.maven" ); @@ -85,7 +85,7 @@ public class MavenITmng5937MavenWrapper distInstaller.setSystemProperty( "classifier", "bin" ); distInstaller.setSystemProperty( "packaging", "zip" ); distInstaller.executeGoal( "org.apache.maven.plugins:maven-install-plugin:2.5.2:install-file" ); - + String distroValue = System.getProperty( "maven.wrapper.distrodir" ); if ( StringUtils.isEmpty( distroValue ) ) { @@ -98,7 +98,7 @@ public class MavenITmng5937MavenWrapper throws Exception { final File testDir = baseDir.resolve( "bin" ).toFile(); - + unpack( testDir.toPath(), "bin" ); envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() ); @@ -115,9 +115,9 @@ public class MavenITmng5937MavenWrapper throws Exception { final File testDir = baseDir.resolve( "script" ).toFile(); - + unpack( testDir.toPath(), "script" ); - + envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); @@ -132,9 +132,9 @@ public class MavenITmng5937MavenWrapper throws Exception { final File testDir = baseDir.resolve( "source" ).toFile(); - + unpack( testDir.toPath(), "source" ); - + envVars.put( "MAVEN_BASEDIR", testDir.getAbsolutePath() ); Verifier verifier = newVerifier( testDir.getAbsolutePath() ); @@ -149,9 +149,9 @@ public class MavenITmng5937MavenWrapper throws Exception { final File testDir = baseDir.resolve( "properties" ).toFile(); - + unpack( testDir.toPath(), "bin" ); - + Path p = baseDir.resolve( "properties/.mvn/wrapper/maven-wrapper.properties" ); try ( BufferedWriter out = Files.newBufferedWriter( p, StandardOpenOption.TRUNCATE_EXISTING ) ) { @@ -178,11 +178,11 @@ public class MavenITmng5937MavenWrapper private void unpack( Path target, String classifier ) throws IOException { Path distro = wrapperDistro.resolve( "apache-maven-wrapper-" + getMavenVersion() + '-' + classifier + ".zip" ); - + zipUnArchiver.setSourceFile( distro.toFile() ); zipUnArchiver.setDestDirectory( target.toFile() ); zipUnArchiver.enableLogging( new ConsoleLogger() ); - + zipUnArchiver.extract(); } } diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java index 1cc5f13eec..0253bc14ba 100644 --- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java +++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6057CheckReactorOrderTest.java @@ -30,7 +30,7 @@ import java.util.List; * Using a ${revision} in the version will change the reactor order before fixing * MNG-6057. Without the fix for this issue the order of * the reactor is changed in that way that the parent is ordered to the last position instead of the first position. - * + * * @author Karl Heinz Marbaise khmarbaise@apache.org */ public class MavenITmng6057CheckReactorOrderTest @@ -76,7 +76,7 @@ public class MavenITmng6057CheckReactorOrderTest /** * Extract the lines at the beginning of the Maven output: - * + * * 
      * [INFO] Reactor Build Order:
      * [INFO]
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
index e9d3abead2..9d72eba692 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6090CIFriendlyTest.java
@@ -26,11 +26,11 @@ import java.io.File;
 import java.util.Arrays;
 
 /**
- * The usage of a ${revision} for the version in the pom file and furthermore 
+ * The usage of a ${revision} for the version in the pom file and furthermore
  * defining the property in the pom file and overwrite it via command line and
  * try to build a partial reactor via mvn -pl ..
  * MNG-6090.
- * 
+ *
  * @author Karl Heinz Marbaise khmarbaise@apache.org
  */
 public class MavenITmng6090CIFriendlyTest
@@ -45,7 +45,7 @@ public class MavenITmng6090CIFriendlyTest
     }
 
     /**
-     * Check that the resulting run will not fail in case 
+     * Check that the resulting run will not fail in case
      * of defining the property via command line and
      * install the projects and afterwards just build
      * a part of the whole reactor.
@@ -58,7 +58,7 @@ public class MavenITmng6090CIFriendlyTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setMavenDebug( false );
         verifier.setAutoclean( false );
-        
+
         verifier.addCliOption( "-Drevision=1.2" );
         verifier.addCliOption( "-Dmaven.experimental.buildconsumer=false" );
         verifier.setLogFileName( "install-log.txt" );
@@ -81,22 +81,22 @@ public class MavenITmng6090CIFriendlyTest
                     throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6090-ci-friendly" );
-        
+
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setMavenDebug( false );
         verifier.setAutoclean( false );
-        
+
         verifier.addCliOption( "-Drevision=1.2" );
         verifier.addCliOption( "-Dmaven.experimental.buildconsumer=true" );
         verifier.setLogFileName( "install-log.txt" );
         verifier.executeGoals( Arrays.asList( "clean", "install" ) );
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
-        
+
         verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setMavenDebug( false );
         verifier.setAutoclean( false );
-        
+
         verifier.addCliOption( "-Drevision=1.2" );
         verifier.addCliOption( "-pl module-3" );
         verifier.executeGoal( "package" );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
index 6148f34ad6..8c0fa49d54 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6189SiteReportPluginsWarningTest.java
@@ -27,7 +27,7 @@ import java.io.File;
 /**
  * This is a test set for MNG-6189:
  * using maven-site-plugin reportPlugins parameter must issue a warning.
- * 
+ *
  * @author Hervé Boutemy
  */
 public class MavenITmng6189SiteReportPluginsWarningTest
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
index 7adf2cd688..7faa412c89 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6330RelativePath.java
@@ -28,7 +28,7 @@ import org.apache.maven.it.util.ResourceExtractor;
 
 /**
  * MNG-6030 reintroduced ReactorModelCache, but this ignores invalid relativePaths of parents
- * 
+ *
  * @author Robert Scholte
  */
 public class MavenITmng6330RelativePath
@@ -38,11 +38,11 @@ public class MavenITmng6330RelativePath
     {
         super( "(,3.5.0),(3.5.2,)" );
     }
-    
+
     public void testRelativePath() throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6330-relative-path" );
-        
+
         Verifier verifier = newVerifier( testDir.getAbsolutePath() );
         verifier.setForkJvm( true );
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
index f8ec576b2d..94dddd5d60 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6352PrintVersionTest.java
@@ -31,9 +31,9 @@ import java.util.List;
  * An integration test to check the enhancements to print out version
  * information during the reactor summary output at the correct
  * positions.
- *  
+ *
  * MNG-6352.
- * 
+ *
  * @author Karl Heinz Marbaise khmarbaise@apache.org
  */
 public class MavenITmng6352PrintVersionTest
@@ -47,9 +47,9 @@ public class MavenITmng6352PrintVersionTest
 
     /**
      * Check that the resulting output is
-     * as expected for the root module and last 
+     * as expected for the root module and last
      * module in build but not for the intermediate
-     * modules. 
+     * modules.
      */
     public void testitShouldPrintVersionAtTopAndAtBottom()
         throws Exception
@@ -59,7 +59,7 @@ public class MavenITmng6352PrintVersionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setMavenDebug( false );
         verifier.setAutoclean( false );
-        
+
         verifier.setLogFileName( "version-log.txt" );
         verifier.executeGoals( Arrays.asList( "clean" ) );
         verifier.verifyErrorFreeLog();
@@ -76,13 +76,13 @@ public class MavenITmng6352PrintVersionTest
         assertTrue( resultingLines.get( 1 ).startsWith( "[INFO] module-1 ........................................... SUCCESS [" ) );
         assertTrue( resultingLines.get( 2 ).startsWith( "[INFO] module-2 ........................................... SUCCESS [" ) );
         assertTrue( resultingLines.get( 3 ).startsWith( "[INFO] module-3 1.3.0-SNAPSHOT ............................ SUCCESS [" ) );
-        
+
     }
 
     /**
      * Check that the resulting output is
      * as expected for all modules in case
-     * for an aggregator build. 
+     * for an aggregator build.
      */
     public void testitShouldPrintVersionInAllLines()
         throws Exception
@@ -92,7 +92,7 @@ public class MavenITmng6352PrintVersionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setMavenDebug( false );
         verifier.setAutoclean( false );
-        
+
         verifier.setLogFileName( "version-log.txt" );
         verifier.executeGoals( Arrays.asList( "clean" ) );
         verifier.verifyErrorFreeLog();
@@ -112,10 +112,10 @@ public class MavenITmng6352PrintVersionTest
 
     }
 
-    
+
     /**
      * Extract the lines at the end of the Maven output:
-     * 
+     *
      * 
      * [INFO] Reactor Summary:
      * [INFO]
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
index a8bda14397..fb18631dea 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6391PrintVersionTest.java
@@ -31,9 +31,9 @@ import java.util.List;
  * An integration test to check the enhancements to print out version
  * information during the reactor summary output at the correct
  * positions.
- *  
+ *
  * MNG-6391.
- * 
+ *
  * @author Karl Heinz Marbaise khmarbaise@apache.org
  */
 public class MavenITmng6391PrintVersionTest
@@ -47,9 +47,9 @@ public class MavenITmng6391PrintVersionTest
 
     /**
      * Check that the resulting output is
-     * as expected for the root module and last 
+     * as expected for the root module and last
      * module in build but not for the intermediate
-     * modules. 
+     * modules.
      */
     public void testitShouldPrintVersionAtTopAndAtBottom()
         throws Exception
@@ -59,7 +59,7 @@ public class MavenITmng6391PrintVersionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setMavenDebug( false );
         verifier.setAutoclean( false );
-        
+
         verifier.setLogFileName( "version-log.txt" );
         verifier.executeGoals( Arrays.asList( "clean" ) );
         verifier.verifyErrorFreeLog();
@@ -77,13 +77,13 @@ public class MavenITmng6391PrintVersionTest
         assertTrue( resultingLines.get( 2 ).startsWith( "[INFO] module-1 ........................................... SUCCESS [" ) );
         assertTrue( resultingLines.get( 3 ).startsWith( "[INFO] module-2 ........................................... SUCCESS [" ) );
         assertTrue( resultingLines.get( 4 ).startsWith( "[INFO] module-3 ........................................... SUCCESS [" ) );
-        
+
     }
 
     /**
      * Check that the resulting output is
      * as expected for all modules in case
-     * for an aggregator build. 
+     * for an aggregator build.
      */
     public void testitShouldPrintVersionInAllLines()
         throws Exception
@@ -93,7 +93,7 @@ public class MavenITmng6391PrintVersionTest
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setMavenDebug( false );
         verifier.setAutoclean( false );
-        
+
         verifier.setLogFileName( "version-log.txt" );
         verifier.executeGoals( Arrays.asList( "clean" ) );
         verifier.verifyErrorFreeLog();
@@ -113,10 +113,10 @@ public class MavenITmng6391PrintVersionTest
         assertTrue( resultingLines.get( 4 ).startsWith( "[INFO] base-project 1.0.0-SNAPSHOT ........................ SUCCESS [  " ) );
 
     }
-    
+
     /**
      * Extract the lines at the end of the Maven output:
-     * 
+     *
      * 
      * [INFO] Reactor Summary..: XXX
      * [INFO]
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
index 42e4b5b7ff..a92bf32f5a 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6558ToolchainsBuildingEventTest.java
@@ -57,9 +57,9 @@ public class MavenITmng6558ToolchainsBuildingEventTest
         List lines = verifier.loadLines( "target/spy.log", "UTF-8" );
         assertTrue( lines.toString(), lines.get( 0 ).startsWith( "init" ) );
         assertTrue( lines.toString(), lines.get( lines.size() - 1 ).startsWith( "close" ) );
-        assertTrue( lines.toString(), 
+        assertTrue( lines.toString(),
             lines.contains( "event: org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest" ) );
-        assertTrue( lines.toString(), 
+        assertTrue( lines.toString(),
             lines.contains( "event: org.apache.maven.toolchain.building.DefaultToolchainsBuildingResult" ) );
     }
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
index 9f3b16d626..ddad3dfe93 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6562WarnDefaultBindings.java
@@ -37,7 +37,7 @@ public class MavenITmng6562WarnDefaultBindings
         throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-        
+
         String phase = "validate";
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setAutoclean( false );
@@ -49,13 +49,13 @@ public class MavenITmng6562WarnDefaultBindings
 
         verifier.verifyErrorFreeLog();
     }
-    
+
 
     public void testItShouldNotWarn2()
                     throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-        
+
         String phase = "process-resources";
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setAutoclean( false );
@@ -67,12 +67,12 @@ public class MavenITmng6562WarnDefaultBindings
 
         verifier.verifyErrorFreeLog();
     }
-                
+
     public void testItShouldWarnForCompilerPlugin()
                     throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-        
+
         String phase = "compile";
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setAutoclean( false );
@@ -83,12 +83,12 @@ public class MavenITmng6562WarnDefaultBindings
         verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
                 + ", you should define versions in pluginManagement section of your pom.xml or parent" );
     }
-    
+
     public void testItShouldWarnForCompilerPlugin2()
                     throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-        
+
         String phase = "process-test-resources";
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setAutoclean( false );
@@ -100,12 +100,12 @@ public class MavenITmng6562WarnDefaultBindings
         verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
                 + ", you should define versions in pluginManagement section of your pom.xml or parent" );
     }
-    
+
     public void testItShouldWarnForCompilerPlugin3()
                     throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-        
+
         String phase = "test-compile";
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setAutoclean( false );
@@ -117,12 +117,12 @@ public class MavenITmng6562WarnDefaultBindings
         verifier.verifyTextInLog( "Version not locked for default bindings plugins [maven-compiler-plugin]"
                 + ", you should define versions in pluginManagement section of your pom.xml or parent" );
     }
-    
+
     public void testItShouldWarnForCompilerPluginAndSurefirePlugin()
                     throws Exception
     {
         File testDir = ResourceExtractor.simpleExtractResources( getClass(), "/mng-6562-default-bindings" );
-        
+
         String phase = "test";
         Verifier verifier = newVerifier( testDir.getAbsolutePath(), false );
         verifier.setAutoclean( false );
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
index 4a60442393..6086e5c213 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6656BuildConsumer.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
  *   
  • parents can omit the version if the relative path points to the correct parent
    • 
  *   
  • dependencies can omit the version if it is part of the reactor
    • 
  * 
- * 
+ *
  * During install the pom will be cleaned up
  * 
      
  *   
    • the modules will be removed
      • 
@@ -75,16 +75,16 @@ public class MavenITmng6656BuildConsumer
         verifier.verifyErrorFreeLog();
 
         String content;
-        content = FileUtils.fileRead( new File( testDir, "expected/parent.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/parent.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6656-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/simple-parent.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/simple-parent.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6656-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/simple-weather.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/simple-weather.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6656-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/simple-webapp.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/simple-webapp.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6656-SNAPSHOT", "pom", content );
     }
 
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
index 18aa3a0dc5..398da0805c 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6772NestedImportScopeRepositoryOverride.java
@@ -28,7 +28,7 @@ import org.apache.maven.it.util.ResourceExtractor;
  *
  * The test POM references an import scope POM, which also has a dependency on an import scope POM.
  *
- * Both import POMs can only be found in the repository defined in the test POM. 
+ * Both import POMs can only be found in the repository defined in the test POM.
  * It has a parent POM that defines the same repository with a different location.
  * The test confirms that the dominant repository definition (child) wins while resolving the import POMs.
  *
@@ -58,7 +58,7 @@ public class MavenITmng6772NestedImportScopeRepositoryOverride
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
     }
-    
+
     // This will test the behavior using DefaultModelResolver
     public void testitInDependency()
         throws Exception
@@ -75,7 +75,7 @@ public class MavenITmng6772NestedImportScopeRepositoryOverride
         verifier.verifyErrorFreeLog();
         verifier.resetStreams();
     }
-    
+
     // central must not be defined in any settings.xml or super POM will never be in play.
     private void overrideGlobalSettings( final File testDir, final Verifier verifier )
     {
diff --git a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
index 147edb4ae0..6486d45854 100644
--- a/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
+++ b/its/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng6957BuildConsumer.java
@@ -32,7 +32,7 @@ import java.util.Arrays;
  *   
    • parents can omit the version if the relative path points to the correct parent
      • 
  *   
    • dependencies can omit the version if it is part of the reactor
      • 
  * 
    
- * 
+ *
  * During install the POM will be cleaned up
  * 
      
  *   
    • the modules will be removed
      • 
@@ -75,22 +75,22 @@ public class MavenITmng6957BuildConsumer
         verifier.verifyErrorFreeLog();
 
         String content;
-        content = FileUtils.fileRead( new File( testDir, "expected/parent.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/parent.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/simple-parent.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/simple-parent.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/simple-weather.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/simple-weather.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-weather", "0.9-MNG6957-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/simple-webapp.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/simple-webapp.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-webapp", "0.9-MNG6957-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/simple-testutils.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/simple-testutils.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "simple-testutils", "0.9-MNG6957-SNAPSHOT", "pom", content );
 
-        content = FileUtils.fileRead( new File( testDir, "expected/utils-parent.pom") ); 
+        content = FileUtils.fileRead( new File( testDir, "expected/utils-parent.pom") );
         verifier.assertArtifactContents( "org.sonatype.mavenbook.multi", "utils-parent", "0.9-MNG6957-SNAPSHOT", "pom", content );
     }
 
diff --git a/its/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml b/its/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
index 700eb2146f..4ea5d05e64 100644
--- a/its/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
+++ b/its/core-it-suite/src/test/resources/bootstrap/group-5/pom.xml
@@ -70,17 +70,17 @@ under the License.
       plexus-utils
       3.0.9
       runtime
-        
+    
     
       commons-lang
       commons-lang
       2.6
       runtime
-        
+    
     
       org.apache.maven.skins
       maven-default-skin
       1.0
-            
+    
   
 
diff --git a/its/core-it-suite/src/test/resources/it0008/pom.xml b/its/core-it-suite/src/test/resources/it0008/pom.xml
index ff7a05a669..c1b0834dea 100644
--- a/its/core-it-suite/src/test/resources/it0008/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0008/pom.xml
@@ -27,11 +27,11 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0008 
+  Maven Integration Test :: it0008
   
     Simple goal decoration where a plugin binds to a phase and the plugin must
     be downloaded from a remote repository before it can be executed. This
-    test also checks to make sure that mojo parameters are aligned to the 
+    test also checks to make sure that mojo parameters are aligned to the
     project basedir when their type is "java.io.File".
   
 
diff --git a/its/core-it-suite/src/test/resources/it0009/pom.xml b/its/core-it-suite/src/test/resources/it0009/pom.xml
index 8a4d7e722f..af9a0b7d56 100644
--- a/its/core-it-suite/src/test/resources/it0009/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0009/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0009 
+  Maven Integration Test :: it0009
   
     Test plugin configuration and goal configuration that overrides what the
     mojo has specified.
diff --git a/its/core-it-suite/src/test/resources/it0010/pom.xml b/its/core-it-suite/src/test/resources/it0010/pom.xml
index 83daff7e4c..1ac309e5d5 100644
--- a/its/core-it-suite/src/test/resources/it0010/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0010/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0010 
+  Maven Integration Test :: it0010
   
     Since the artifact resolution does not use the project builder, we must
     ensure that the full hierarchy of all dependencies is resolved. This
diff --git a/its/core-it-suite/src/test/resources/it0011/pom.xml b/its/core-it-suite/src/test/resources/it0011/pom.xml
index 28e84cf25f..d055cf4242 100644
--- a/its/core-it-suite/src/test/resources/it0011/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0011/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0011 
+  Maven Integration Test :: it0011
   Test specification of dependency versions via <dependencyManagement/>.
 
   
diff --git a/its/core-it-suite/src/test/resources/it0012/pom.xml b/its/core-it-suite/src/test/resources/it0012/pom.xml
index 089a8d6736..f03cba0ea1 100644
--- a/its/core-it-suite/src/test/resources/it0012/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0012/pom.xml
@@ -27,7 +27,7 @@ under the License.
   3.8.1
   pom
 
-  Maven Integration Test :: it0012 
+  Maven Integration Test :: it0012
   Test simple POM interpolation
 
   
diff --git a/its/core-it-suite/src/test/resources/it0018/pom.xml b/its/core-it-suite/src/test/resources/it0018/pom.xml
index 23a49a7b7e..57bd646dea 100644
--- a/its/core-it-suite/src/test/resources/it0018/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0018/pom.xml
@@ -26,13 +26,13 @@ under the License.
   maven-it-it0018
   1.0
 
-  Maven Integration Test :: it0018 
+  Maven Integration Test :: it0018
   
     Ensure that managed dependencies for dependency POMs are calculated
     correctly when resolved. Removes managed-dep-1.0.3 and checks it is
     redownloaded.
   
-  
+
   
     
       org.apache.maven.its.it0018
diff --git a/its/core-it-suite/src/test/resources/it0019/pom.xml b/its/core-it-suite/src/test/resources/it0019/pom.xml
index 999889dd13..8b30cd9105 100644
--- a/its/core-it-suite/src/test/resources/it0019/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0019/pom.xml
@@ -26,7 +26,7 @@ under the License.
   maven-it-it0019
   1.0
 
-  Maven Integration Test :: it0019 
+  Maven Integration Test :: it0019
   Test that a version is managed by pluginManagement in the super POM
 
   
diff --git a/its/core-it-suite/src/test/resources/it0021/pom.xml b/its/core-it-suite/src/test/resources/it0021/pom.xml
index 2828fd1789..d7af4e27ba 100644
--- a/its/core-it-suite/src/test/resources/it0021/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0021/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: it0021 
+  Maven Integration Test :: it0021
   
     Test pom-level profile inclusion (this one is activated by system property).
   
diff --git a/its/core-it-suite/src/test/resources/it0023/pom.xml b/its/core-it-suite/src/test/resources/it0023/pom.xml
index db7988b09e..807eef2d92 100644
--- a/its/core-it-suite/src/test/resources/it0023/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0023/pom.xml
@@ -24,9 +24,9 @@ under the License.
 
   org.apache.maven.its.it0023
   maven-it-it0023
-  1.0-SNAPSHOT  
+  1.0-SNAPSHOT
 
-  Maven Integration Test :: it0023 
+  Maven Integration Test :: it0023
   Test profile inclusion from settings.xml (this one is activated by an id in the activeProfiles section).
 
   
diff --git a/its/core-it-suite/src/test/resources/it0023/settings.xml b/its/core-it-suite/src/test/resources/it0023/settings.xml
index 363bde0538..00554c94a0 100644
--- a/its/core-it-suite/src/test/resources/it0023/settings.xml
+++ b/its/core-it-suite/src/test/resources/it0023/settings.xml
@@ -23,7 +23,7 @@ under the License.
   
     test-profile
   
-  
+
   
     
       test-profile
diff --git a/its/core-it-suite/src/test/resources/it0025/pom.xml b/its/core-it-suite/src/test/resources/it0025/pom.xml
index 6da5dc7460..23d39b8d48 100644
--- a/its/core-it-suite/src/test/resources/it0025/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0025/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0025 
+  Maven Integration Test :: it0025
   org.apache.maven.its.it0025
   maven-it-it0025
   Test multiple goal executions with different execution-level configs.
@@ -19,7 +19,7 @@
             
               test.txt
             
-            
+
             
               touch
             
diff --git a/its/core-it-suite/src/test/resources/it0030/pom.xml b/its/core-it-suite/src/test/resources/it0030/pom.xml
index ccbf5896d6..305ada0d46 100644
--- a/its/core-it-suite/src/test/resources/it0030/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0030/pom.xml
@@ -1,9 +1,9 @@
 
   4.0.0
-  Maven Integration Test :: it0030 
+  Maven Integration Test :: it0030
   org.apache.maven.its.it0030
   maven-it-it0030
-  Test for injection of dependencyManagement through parents of 
+  Test for injection of dependencyManagement through parents of
         dependency poms.
   1.0-SNAPSHOT
   pom
diff --git a/its/core-it-suite/src/test/resources/it0032/pom.xml b/its/core-it-suite/src/test/resources/it0032/pom.xml
index 247ff59e5d..cd203f8513 100644
--- a/its/core-it-suite/src/test/resources/it0032/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0032/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0032 
+  Maven Integration Test :: it0032
   Tests that a specified Maven version requirement that is lower doesn't cause any problems
 
   
diff --git a/its/core-it-suite/src/test/resources/it0036/pom.xml b/its/core-it-suite/src/test/resources/it0036/pom.xml
index c7a9d1d9ed..4fdd4701d2 100644
--- a/its/core-it-suite/src/test/resources/it0036/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0036/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: it0036 
+  Maven Integration Test :: it0036
   
     Test building from release-pom.xml when it's available
   
diff --git a/its/core-it-suite/src/test/resources/it0036/release-pom.xml b/its/core-it-suite/src/test/resources/it0036/release-pom.xml
index 0e3f363e85..2a9846e8da 100644
--- a/its/core-it-suite/src/test/resources/it0036/release-pom.xml
+++ b/its/core-it-suite/src/test/resources/it0036/release-pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: it0036 
+  Maven Integration Test :: it0036
   
     Test building from release-pom.xml when it's available
   
diff --git a/its/core-it-suite/src/test/resources/it0037/pom.xml b/its/core-it-suite/src/test/resources/it0037/pom.xml
index e430d822b1..9b25b36740 100644
--- a/its/core-it-suite/src/test/resources/it0037/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0037/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: it0037 
+  Maven Integration Test :: it0037
   
     Test building with alternate pom file using '-f'
   
diff --git a/its/core-it-suite/src/test/resources/it0037/pom2.xml b/its/core-it-suite/src/test/resources/it0037/pom2.xml
index 195c359a2a..59743ebd54 100644
--- a/its/core-it-suite/src/test/resources/it0037/pom2.xml
+++ b/its/core-it-suite/src/test/resources/it0037/pom2.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: it0037 
+  Maven Integration Test :: it0037
   
     Test building with alternate pom file using '-f'
   
diff --git a/its/core-it-suite/src/test/resources/it0038/pom.xml b/its/core-it-suite/src/test/resources/it0038/pom.xml
index f8e6501373..c912f1572a 100644
--- a/its/core-it-suite/src/test/resources/it0038/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0038/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: it0038 
+  Maven Integration Test :: it0038
   
   	Test building project from outside the project directory using '-f' option
   
diff --git a/its/core-it-suite/src/test/resources/it0038/project/pom2.xml b/its/core-it-suite/src/test/resources/it0038/project/pom2.xml
index 3272f0ae8f..df32a8c8cb 100644
--- a/its/core-it-suite/src/test/resources/it0038/project/pom2.xml
+++ b/its/core-it-suite/src/test/resources/it0038/project/pom2.xml
@@ -27,7 +27,7 @@ under the License.
   0.2
   jar
 
-  Maven Integration Test :: it0038 
+  Maven Integration Test :: it0038
   
     Test building project from outside the project directory using '-f' option
   
diff --git a/its/core-it-suite/src/test/resources/it0039/project/pom.xml b/its/core-it-suite/src/test/resources/it0039/project/pom.xml
index 00f730fbc6..c380e1233c 100644
--- a/its/core-it-suite/src/test/resources/it0039/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0039/project/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: it0039 
+  Maven Integration Test :: it0039
   
     Test that reactor uses release-pom.xml if available.
   
diff --git a/its/core-it-suite/src/test/resources/it0039/project/release-pom.xml b/its/core-it-suite/src/test/resources/it0039/project/release-pom.xml
index cb0183e21c..7938bce71e 100644
--- a/its/core-it-suite/src/test/resources/it0039/project/release-pom.xml
+++ b/its/core-it-suite/src/test/resources/it0039/project/release-pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.2
   jar
 
-  Maven Integration Test :: it0039 
+  Maven Integration Test :: it0039
   
     Test that reactor uses release-pom.xml if available.
   
diff --git a/its/core-it-suite/src/test/resources/it0039/project2/pom.xml b/its/core-it-suite/src/test/resources/it0039/project2/pom.xml
index a00bd01ce0..88a5067bc2 100644
--- a/its/core-it-suite/src/test/resources/it0039/project2/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0039/project2/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: it0039 
+  Maven Integration Test :: it0039
   
     Test that reactor uses release-pom.xml if available.
   
diff --git a/its/core-it-suite/src/test/resources/it0039/project2/release-pom.xml b/its/core-it-suite/src/test/resources/it0039/project2/release-pom.xml
index 9116cc116b..c615e901d2 100644
--- a/its/core-it-suite/src/test/resources/it0039/project2/release-pom.xml
+++ b/its/core-it-suite/src/test/resources/it0039/project2/release-pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.2
   jar
 
-  Maven Integration Test :: it0039 
+  Maven Integration Test :: it0039
   
     Test that reactor uses release-pom.xml if available.
   
diff --git a/its/core-it-suite/src/test/resources/it0040/pom.xml b/its/core-it-suite/src/test/resources/it0040/pom.xml
index 0b79e21ee3..e4201f0d05 100644
--- a/its/core-it-suite/src/test/resources/it0040/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0040/pom.xml
@@ -1,12 +1,12 @@
 
   4.0.0
-  Maven Integration Test :: it0040 
+  Maven Integration Test :: it0040
   org.apache.maven.its.it0040
   maven-it-it0040
   Test the use of a packaging from a plugin
   it-packaging
   1.0
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0041/pom.xml b/its/core-it-suite/src/test/resources/it0041/pom.xml
index 52a36a44ac..5fb8a6e8c4 100644
--- a/its/core-it-suite/src/test/resources/it0041/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0041/pom.xml
@@ -26,9 +26,9 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: it0041 
+  Maven Integration Test :: it0041
   Test the use of a new type from a plugin
-  
+
   
     
       org.apache.maven
diff --git a/its/core-it-suite/src/test/resources/it0051/pom.xml b/its/core-it-suite/src/test/resources/it0051/pom.xml
index 93ecd1fa41..58094499d0 100644
--- a/its/core-it-suite/src/test/resources/it0051/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0051/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0051 
+  Maven Integration Test :: it0051
   Test source attachment when -DperformRelease=true is specified.
-  
+
   
   
     
diff --git a/its/core-it-suite/src/test/resources/it0052/pom.xml b/its/core-it-suite/src/test/resources/it0052/pom.xml
index ac4da04b86..85b7bd945b 100644
--- a/its/core-it-suite/src/test/resources/it0052/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0052/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0052 
+  Maven Integration Test :: it0052
   Test that source attachment doesn't take place when -DperformRelease=true is missing.
 
   
diff --git a/its/core-it-suite/src/test/resources/it0056/pom.xml b/its/core-it-suite/src/test/resources/it0056/pom.xml
index ab449c00de..3597990e03 100644
--- a/its/core-it-suite/src/test/resources/it0056/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0056/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0056 
+  Maven Integration Test :: it0056
   
     Test that multiple executions of a goal with different
     parameter values will succeed.
diff --git a/its/core-it-suite/src/test/resources/it0063/pom.xml b/its/core-it-suite/src/test/resources/it0063/pom.xml
index b12cc70a7c..0d7b08a90c 100644
--- a/its/core-it-suite/src/test/resources/it0063/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0063/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0063 
+  Maven Integration Test :: it0063
   Test the use of a system scoped dependency to a (fake) tools.jar.
 
   
diff --git a/its/core-it-suite/src/test/resources/it0064/pom.xml b/its/core-it-suite/src/test/resources/it0064/pom.xml
index e67ed99edd..82345e4478 100644
--- a/its/core-it-suite/src/test/resources/it0064/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0064/pom.xml
@@ -6,7 +6,7 @@
   1.0
   jar
 
-  Maven Integration Test :: it0064 
+  Maven Integration Test :: it0064
   
     Test the use of a mojo that uses setters instead of private fields
     for the population of configuration values.
diff --git a/its/core-it-suite/src/test/resources/it0071/pom.xml b/its/core-it-suite/src/test/resources/it0071/pom.xml
index 32e36edf51..799a349ede 100644
--- a/its/core-it-suite/src/test/resources/it0071/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0071/pom.xml
@@ -6,7 +6,7 @@
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: it0071 
+  Maven Integration Test :: it0071
   
     Verifies that dotted property references work within plugin configurations.
   
diff --git a/its/core-it-suite/src/test/resources/it0072/pom.xml b/its/core-it-suite/src/test/resources/it0072/pom.xml
index 0dd5d33b03..7cd953e41e 100644
--- a/its/core-it-suite/src/test/resources/it0072/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0072/pom.xml
@@ -7,7 +7,7 @@
   ${m2.version}
   jar
 
-  Maven Integration Test :: it0072 
+  Maven Integration Test :: it0072
   
     Verifies that property references with dotted notation work within POM interpolation.
   
diff --git a/its/core-it-suite/src/test/resources/it0085/pom.xml b/its/core-it-suite/src/test/resources/it0085/pom.xml
index 88b547929f..d876a9c0a5 100644
--- a/its/core-it-suite/src/test/resources/it0085/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0085/pom.xml
@@ -6,7 +6,7 @@
   1.0
   pom
 
-  Maven Integration Test :: it0085 
+  Maven Integration Test :: it0085
   
     Verify that system-scoped dependencies get resolved with system scope
     when they are resolved transitively via another (non-system)
diff --git a/its/core-it-suite/src/test/resources/it0086/pom.xml b/its/core-it-suite/src/test/resources/it0086/pom.xml
index 7ee7fb7c58..bfd0601421 100644
--- a/its/core-it-suite/src/test/resources/it0086/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0086/pom.xml
@@ -26,12 +26,12 @@ under the License.
   maven-it-it0086
   1.0
 
-  Maven Integration Test :: it0086 
+  Maven Integration Test :: it0086
   
     Verify that a plugin dependency class can be loaded from both the plugin classloader and the context classloader
     available to the plugin.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0087/pom.xml b/its/core-it-suite/src/test/resources/it0087/pom.xml
index 2525e9fbab..7d5f3a54ea 100644
--- a/its/core-it-suite/src/test/resources/it0087/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0087/pom.xml
@@ -26,7 +26,7 @@ under the License.
   maven-it-it0087
   1.0
 
-  Maven Integration Test :: it0087 
+  Maven Integration Test :: it0087
   
     Verify that a project-level plugin dependency class can be loaded from both the plugin classloader
     and the context classloader available to the plugin.
diff --git a/its/core-it-suite/src/test/resources/it0090/pom.xml b/its/core-it-suite/src/test/resources/it0090/pom.xml
index bd1af5d6a3..173d82c848 100644
--- a/its/core-it-suite/src/test/resources/it0090/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0090/pom.xml
@@ -26,7 +26,7 @@ under the License.
   maven-it-it0090
   1.0
 
-  Maven Integration Test :: it0090 
+  Maven Integration Test :: it0090
   
     Test that ensures that envars are interpolated correctly into plugin
     configurations.
diff --git a/its/core-it-suite/src/test/resources/it0116/pom.xml b/its/core-it-suite/src/test/resources/it0116/pom.xml
index bcbf46cbe0..bf611e718c 100644
--- a/its/core-it-suite/src/test/resources/it0116/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0116/pom.xml
@@ -5,16 +5,16 @@
   pom
   1.0-SNAPSHOT
   
-     
-      bogus-profile 
-       
+    
+      bogus-profile
+      
         
-          bogus-family 
-         
+          bogus-family
+        
       
       
         value
       
     
-    
+  
 
diff --git a/its/core-it-suite/src/test/resources/it0130/pom.xml b/its/core-it-suite/src/test/resources/it0130/pom.xml
index 7c3ffa18be..5aa9effd12 100644
--- a/its/core-it-suite/src/test/resources/it0130/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0130/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0130 
+  Maven Integration Test :: it0130
   Test default binding of goals for "clean" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0131/pom.xml b/its/core-it-suite/src/test/resources/it0131/pom.xml
index 66d817e593..0cd9782851 100644
--- a/its/core-it-suite/src/test/resources/it0131/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0131/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0131 
+  Maven Integration Test :: it0131
   Test default binding of goals for "site" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0132/pom.xml b/its/core-it-suite/src/test/resources/it0132/pom.xml
index ed0f43a2e6..731264c01d 100644
--- a/its/core-it-suite/src/test/resources/it0132/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0132/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: it0132 
+  Maven Integration Test :: it0132
   Test default binding of goals for "pom" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0133/pom.xml b/its/core-it-suite/src/test/resources/it0133/pom.xml
index bd34e453d1..b6f92dbf43 100644
--- a/its/core-it-suite/src/test/resources/it0133/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0133/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0133 
+  Maven Integration Test :: it0133
   Test default binding of goals for "jar" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0134/pom.xml b/its/core-it-suite/src/test/resources/it0134/pom.xml
index 3607cce836..02812a323b 100644
--- a/its/core-it-suite/src/test/resources/it0134/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0134/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   war
 
-  Maven Integration Test :: it0134 
+  Maven Integration Test :: it0134
   Test default binding of goals for "war" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0135/pom.xml b/its/core-it-suite/src/test/resources/it0135/pom.xml
index 2861790528..8d31a53f6d 100644
--- a/its/core-it-suite/src/test/resources/it0135/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0135/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   ejb
 
-  Maven Integration Test :: it0135 
+  Maven Integration Test :: it0135
   Test default binding of goals for "ejb" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0136/pom.xml b/its/core-it-suite/src/test/resources/it0136/pom.xml
index c007380226..d22440978f 100644
--- a/its/core-it-suite/src/test/resources/it0136/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0136/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   rar
 
-  Maven Integration Test :: it0136 
+  Maven Integration Test :: it0136
   Test default binding of goals for "rar" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0137/pom.xml b/its/core-it-suite/src/test/resources/it0137/pom.xml
index 029e5ee13f..a368062233 100644
--- a/its/core-it-suite/src/test/resources/it0137/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0137/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   ear
 
-  Maven Integration Test :: it0137 
+  Maven Integration Test :: it0137
   Test default binding of goals for "ear" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0138/pom.xml b/its/core-it-suite/src/test/resources/it0138/pom.xml
index 7754ed93d6..3785024827 100644
--- a/its/core-it-suite/src/test/resources/it0138/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0138/pom.xml
@@ -27,9 +27,9 @@ under the License.
   1.0
   maven-plugin
 
-  Maven Integration Test :: it0138 
+  Maven Integration Test :: it0138
   Test default binding of goals for "maven-plugin" lifecycle.
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/it0139/child/pom.xml b/its/core-it-suite/src/test/resources/it0139/child/pom.xml
index f566a34ed7..63960f93d3 100644
--- a/its/core-it-suite/src/test/resources/it0139/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0139/child/pom.xml
@@ -114,5 +114,5 @@ under the License.
   
     target/doc
   
-            
+
 
diff --git a/its/core-it-suite/src/test/resources/it0139/pom.xml b/its/core-it-suite/src/test/resources/it0139/pom.xml
index 78ccdc8b79..7668790a81 100644
--- a/its/core-it-suite/src/test/resources/it0139/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0139/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: it0139 
+  Maven Integration Test :: it0139
   Test POM interpolation with expressions of the form $ { project.* }
 
   
diff --git a/its/core-it-suite/src/test/resources/it0140/child/pom.xml b/its/core-it-suite/src/test/resources/it0140/child/pom.xml
index 30230a3831..587125870a 100644
--- a/its/core-it-suite/src/test/resources/it0140/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0140/child/pom.xml
@@ -114,5 +114,5 @@ under the License.
   
     target/doc
   
-            
+
 
diff --git a/its/core-it-suite/src/test/resources/it0140/pom.xml b/its/core-it-suite/src/test/resources/it0140/pom.xml
index 65252594c3..c5f150cae4 100644
--- a/its/core-it-suite/src/test/resources/it0140/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0140/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: it0140 
+  Maven Integration Test :: it0140
   Test POM interpolation with expressions of the form $ { pom.* }
 
   
diff --git a/its/core-it-suite/src/test/resources/it0143/pom-template.xml b/its/core-it-suite/src/test/resources/it0143/pom-template.xml
index 42f48436fc..b997355918 100644
--- a/its/core-it-suite/src/test/resources/it0143/pom-template.xml
+++ b/its/core-it-suite/src/test/resources/it0143/pom-template.xml
@@ -26,7 +26,7 @@ under the License.
   consumer
   0.1
 
-  Maven Integration Test :: it0143 
+  Maven Integration Test :: it0143
   
     Test that the different scopes of transitive dependencies end up on the right class paths.
   
diff --git a/its/core-it-suite/src/test/resources/it0144/pom.xml b/its/core-it-suite/src/test/resources/it0144/pom.xml
index 31f77c3de5..a736fde437 100644
--- a/its/core-it-suite/src/test/resources/it0144/pom.xml
+++ b/its/core-it-suite/src/test/resources/it0144/pom.xml
@@ -27,11 +27,11 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0144 
+  Maven Integration Test :: it0144
   
     Test that the lifecycle phases execute in proper order.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-0095/pom.xml b/its/core-it-suite/src/test/resources/mng-0095/pom.xml
index 6a9d58b0c7..be4ad287e4 100644
--- a/its/core-it-suite/src/test/resources/mng-0095/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0095/pom.xml
@@ -6,7 +6,7 @@
   1.0
   pom
 
-  Maven Integration Test :: MNG-95 
+  Maven Integration Test :: MNG-95
   
     Test reactor failure modes fail-fast, fail-at-end and fail-never by forcing an exception in the first module and
     checking the build output of the other modules.
@@ -23,7 +23,7 @@
       
     
   
-  
+
   
     subproject1
     subproject2
diff --git a/its/core-it-suite/src/test/resources/mng-0095/subproject1/pom.xml b/its/core-it-suite/src/test/resources/mng-0095/subproject1/pom.xml
index 8329229dd6..3b0caf4626 100644
--- a/its/core-it-suite/src/test/resources/mng-0095/subproject1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0095/subproject1/pom.xml
@@ -10,7 +10,7 @@
   subproject1
   jar
 
-  Maven Integration Test :: MNG-95 : Project 1 
+  Maven Integration Test :: MNG-95 : Project 1
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-0095/subproject2/pom.xml b/its/core-it-suite/src/test/resources/mng-0095/subproject2/pom.xml
index 9832268392..a07a659466 100644
--- a/its/core-it-suite/src/test/resources/mng-0095/subproject2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0095/subproject2/pom.xml
@@ -10,7 +10,7 @@
   subproject2
   jar
 
-  Maven Integration Test :: MNG-95 : Project 2 
+  Maven Integration Test :: MNG-95 : Project 2
 
   
 
diff --git a/its/core-it-suite/src/test/resources/mng-0095/subproject3/pom.xml b/its/core-it-suite/src/test/resources/mng-0095/subproject3/pom.xml
index 2d568092ae..4610907e23 100644
--- a/its/core-it-suite/src/test/resources/mng-0095/subproject3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0095/subproject3/pom.xml
@@ -10,7 +10,7 @@
   subproject3
   jar
 
-  Maven Integration Test :: MNG-95 : Project 3 
+  Maven Integration Test :: MNG-95 : Project 3
 
   
   
diff --git a/its/core-it-suite/src/test/resources/mng-0249/pom.xml b/its/core-it-suite/src/test/resources/mng-0249/pom.xml
index 3e22493623..68c6e2f941 100644
--- a/its/core-it-suite/src/test/resources/mng-0249/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0249/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-249 
+  Maven Integration Test :: MNG-249
   Test that the reactor can establish the artifact location of known projects for dependencies
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-0282/pom.xml b/its/core-it-suite/src/test/resources/mng-0282/pom.xml
index 7cf6b0f99b..a7342c4197 100644
--- a/its/core-it-suite/src/test/resources/mng-0282/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0282/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0045 
+  Maven Integration Test :: it0045
   org.apache.maven.its.it0045
   maven-it-it0045
   Test non-reactor behavior when plugin declares "@requiresProject false"
@@ -18,7 +18,7 @@
       
     
   
-  
+
   
     subproject
   
diff --git a/its/core-it-suite/src/test/resources/mng-0294/global-settings.xml b/its/core-it-suite/src/test/resources/mng-0294/global-settings.xml
index ca69453c4e..8c7df09374 100644
--- a/its/core-it-suite/src/test/resources/mng-0294/global-settings.xml
+++ b/its/core-it-suite/src/test/resources/mng-0294/global-settings.xml
@@ -2,13 +2,13 @@
   
     
       test-profile
-      
+
       
         
           includeProfile
         
       
-      
+
       
         test.txt
       
diff --git a/its/core-it-suite/src/test/resources/mng-0294/pom.xml b/its/core-it-suite/src/test/resources/mng-0294/pom.xml
index f9e00a714c..6c65bbda62 100644
--- a/its/core-it-suite/src/test/resources/mng-0294/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0294/pom.xml
@@ -1,10 +1,10 @@
 
   4.0.0
-  Maven Integration Test :: it0026 
+  Maven Integration Test :: it0026
   org.apache.maven.its.it0026
   maven-it-it0026
   Test merging of global- and user-level settings.xml files.
-  1.0-SNAPSHOT  
+  1.0-SNAPSHOT
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-0377/pom.xml b/its/core-it-suite/src/test/resources/mng-0377/pom.xml
index dcfbf56bfd..9b32899887 100644
--- a/its/core-it-suite/src/test/resources/mng-0377/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0377/pom.xml
@@ -26,7 +26,7 @@ under the License.
   maven-it-it0031
   1.0-SNAPSHOT
 
-  Maven Integration Test :: it0031 
+  Maven Integration Test :: it0031
   
     Test usage of plugins.xml mapping file on the repository to resolve
     plugin artifactId from it's prefix using the pluginGroups in
diff --git a/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml b/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
index 8c83f7418a..113200d933 100644
--- a/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0469/test0/pom.xml
@@ -31,7 +31,7 @@ under the License.
   
     Test that reporting configuration applies to build plugins, too.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml b/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
index e0d42c4836..9226914631 100644
--- a/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0469/test1/pom.xml
@@ -31,7 +31,7 @@ under the License.
   
     Test that reporting configuration does not override build configuration during build lifecycle.
   
-  
+
   
     
       
@@ -45,7 +45,7 @@ under the License.
       
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml b/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml
index da48edbfda..b94ef5265f 100644
--- a/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0469/test2/pom.xml
@@ -27,11 +27,11 @@ under the License.
   1.1
   jar
 
-  Maven Integration Test :: MNG-469 
+  Maven Integration Test :: MNG-469
   
     Test that build configuration does not affect report goals.
   
-  
+
   
     
       
@@ -66,7 +66,7 @@ under the License.
       
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-0471/pom.xml b/its/core-it-suite/src/test/resources/mng-0471/pom.xml
index 6bbf50ace1..c8d8d735a2 100644
--- a/its/core-it-suite/src/test/resources/mng-0471/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0471/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0027 
+  Maven Integration Test :: it0027
   org.apache.maven.its.it0027
   maven-it-it0027
   Test @execute with a custom lifecycle, including configuration
diff --git a/its/core-it-suite/src/test/resources/mng-0479/setup/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/setup/pom.xml
index 1a4406a095..0c1b1d6fd0 100644
--- a/its/core-it-suite/src/test/resources/mng-0479/setup/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0479/setup/pom.xml
@@ -21,12 +21,12 @@ under the License.
 
 
   4.0.0
-  
+
   org.apache.maven.its.it0043
   maven-it-it0043
   1.0-SNAPSHOT
 
-  Maven Integration Test :: it0043 setup 
+  Maven Integration Test :: it0043 setup
   Preparation project with non-overriden URL to central for plugin download.
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-0479/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/test-1/pom.xml
index c741bd91b0..a94e6e7a49 100644
--- a/its/core-it-suite/src/test/resources/mng-0479/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0479/test-1/pom.xml
@@ -21,7 +21,7 @@ under the License.
 
 
   4.0.0
-  
+
   
     
     org.apache.maven.its.mng0479
@@ -33,7 +33,7 @@ under the License.
   test
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-479 
+  Maven Integration Test :: MNG-479
   
     Verify that using the same repo id allows to override "central". This project checks that the repo URL can be
     changed and that snapshots can be enabled.
diff --git a/its/core-it-suite/src/test/resources/mng-0479/test-2/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/test-2/pom.xml
index 811e58a97d..5bc922e4dd 100644
--- a/its/core-it-suite/src/test/resources/mng-0479/test-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0479/test-2/pom.xml
@@ -21,7 +21,7 @@ under the License.
 
 
   4.0.0
-  
+
   
     
     org.apache.maven.its.mng0479
@@ -33,7 +33,7 @@ under the License.
   test
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-479 
+  Maven Integration Test :: MNG-479
   
     Verify that using the same repo id allows to override "central". This project checks that releases can be
     disabled and that this policy is effective during resolution of parent POMs.
diff --git a/its/core-it-suite/src/test/resources/mng-0479/test-3/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/test-3/pom.xml
index dc1d25571a..87bbba9b6d 100644
--- a/its/core-it-suite/src/test/resources/mng-0479/test-3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0479/test-3/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-479 
+  Maven Integration Test :: MNG-479
   
     Verify that using the same repo id allows to override "central". This project checks that releases can be
     disabled and this policy is effective during resolution of dependencies.
diff --git a/its/core-it-suite/src/test/resources/mng-0479/test-4/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/test-4/pom.xml
index 2ee42fa3d0..edce8e4bea 100644
--- a/its/core-it-suite/src/test/resources/mng-0479/test-4/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0479/test-4/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-479 
+  Maven Integration Test :: MNG-479
   
     Verify that using the same repo id allows to override "central". This project checks that releases can be
     disabled and this policy is effective during resolution of transitive dependencies.
diff --git a/its/core-it-suite/src/test/resources/mng-0479/test/pom.xml b/its/core-it-suite/src/test/resources/mng-0479/test/pom.xml
index 67f9ee6fc9..5c1dacab08 100644
--- a/its/core-it-suite/src/test/resources/mng-0479/test/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0479/test/pom.xml
@@ -21,12 +21,12 @@ under the License.
 
 
   4.0.0
-  
+
   org.apache.maven.its.it0043
   maven-it-it0043
   1.0-SNAPSHOT
 
-  Maven Integration Test :: it0043 
+  Maven Integration Test :: it0043
   Test for repository inheritence - ensure using the same id overrides the defaults
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-0505/pom.xml b/its/core-it-suite/src/test/resources/mng-0505/pom.xml
index 0c75f69df7..cad1dd4e96 100644
--- a/its/core-it-suite/src/test/resources/mng-0505/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0505/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-505 
+  Maven Integration Test :: MNG-505
   
     Test version range support.
   
diff --git a/its/core-it-suite/src/test/resources/mng-0507/pom.xml b/its/core-it-suite/src/test/resources/mng-0507/pom.xml
index b93b4a11c1..a09c27242b 100644
--- a/its/core-it-suite/src/test/resources/mng-0507/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0507/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-507 
+  Maven Integration Test :: MNG-507
   Test artifact relocation.
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-0557/pom.xml b/its/core-it-suite/src/test/resources/mng-0557/pom.xml
index 79bce26c52..abf0ebb944 100644
--- a/its/core-it-suite/src/test/resources/mng-0557/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0557/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0044 
+  Maven Integration Test :: it0044
   org.apache.maven.its.it0044
   maven-it-it0044
   Test --settings CLI option
diff --git a/its/core-it-suite/src/test/resources/mng-0557/settings.xml b/its/core-it-suite/src/test/resources/mng-0557/settings.xml
index 6d6edbf30f..bb1e81e585 100644
--- a/its/core-it-suite/src/test/resources/mng-0557/settings.xml
+++ b/its/core-it-suite/src/test/resources/mng-0557/settings.xml
@@ -2,11 +2,11 @@
   
     test-profile
   
-  
+
   
     
       test-profile
-      
+
       
         test.txt
       
diff --git a/its/core-it-suite/src/test/resources/mng-0557/src/main/java/org/apache/maven/it0044/Person.java b/its/core-it-suite/src/test/resources/mng-0557/src/main/java/org/apache/maven/it0044/Person.java
index a40f37ad25..b8d3ea3955 100644
--- a/its/core-it-suite/src/test/resources/mng-0557/src/main/java/org/apache/maven/it0044/Person.java
+++ b/its/core-it-suite/src/test/resources/mng-0557/src/main/java/org/apache/maven/it0044/Person.java
@@ -3,12 +3,12 @@ package org.apache.maven.it0044;
 public class Person
 {
     private String name;
-    
+
     public void setName( String name )
     {
         this.name = name;
     }
-    
+
     public String getName()
     {
         return name;
diff --git a/its/core-it-suite/src/test/resources/mng-0612/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-0612/dependency/pom.xml
index 1f652b7f52..9dd3f8f6a1 100644
--- a/its/core-it-suite/src/test/resources/mng-0612/dependency/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0612/dependency/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test Dependency :: it0125 
+  Maven Integration Test Dependency :: it0125
   org.apache.maven.its.it0125
   maven-it-it0125-dependency
   Project that brings in a newer version of maven-core-it-support.
diff --git a/its/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml
index 3163644da8..7f97a3d613 100644
--- a/its/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0612/plugin/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test Plugin :: it0125 
+  Maven Integration Test Plugin :: it0125
   org.apache.maven.its.it0125
   maven-it-it0125-plugin
   maven-plugin
diff --git a/its/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java b/its/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java
index 2f9802a180..0bb27d5285 100644
--- a/its/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-0612/plugin/src/main/java/org/apache/maven/its/it0125/DependenciesMojo.java
@@ -50,19 +50,19 @@ public class DependenciesMojo extends AbstractMojo
      * @parameter expression="${project.artifacts}"
      */
     private Set artifacts;
-    
+
     /**
      * @parameter expression="${project.build.directory}"
      */
     private String buildDirectory;
-    
+
     /*
      * @see org.apache.maven.plugin.Mojo#execute()
      */
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         File file = new File( buildDirectory, "dependencies.log" );
-        
+
         if ( !file.getParentFile().mkdirs() )
         {
             throw new MojoExecutionException( "Cannot create build directory" );
@@ -71,15 +71,15 @@ public class DependenciesMojo extends AbstractMojo
         try
         {
             BufferedWriter writer = new BufferedWriter( new FileWriter( file ) );
-            
+
             for ( Iterator iterator = artifacts.iterator(); iterator.hasNext(); )
             {
                 Artifact artifact = (Artifact) iterator.next();
-                
+
                 writer.write( artifact.toString() );
                 writer.newLine();
             }
-            
+
             writer.close();
         }
         catch ( IOException exception )
diff --git a/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml b/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml
index 0ad7d027dd..05707d7c16 100644
--- a/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0612/project/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0125 
+  Maven Integration Test :: it0125
   org.apache.maven.its.it0125
   maven-it-it0125
   Test that ensures the newest-wins conflict resolver is used.
diff --git a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/Hello.java b/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/Hello.java
index 8ff698db1d..4b668d43dd 100644
--- a/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/Hello.java
+++ b/its/core-it-suite/src/test/resources/mng-0624/parentBadPath/main/src/main/java/Hello.java
@@ -9,6 +9,6 @@ public class Hello
 {
     public void helloWorld()
     {
-        System.out.println("Hello World!");   
+        System.out.println("Hello World!");
     }
 }
diff --git a/its/core-it-suite/src/test/resources/mng-0666/pom.xml b/its/core-it-suite/src/test/resources/mng-0666/pom.xml
index 171b3a3a5c..6e37565913 100644
--- a/its/core-it-suite/src/test/resources/mng-0666/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0666/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-666 
+  Maven Integration Test :: MNG-666
   
     Verify that maven-1 POMs will be ignored but not stop the resolution process.
   
diff --git a/its/core-it-suite/src/test/resources/mng-0674/pom.xml b/its/core-it-suite/src/test/resources/mng-0674/pom.xml
index 13fe035b04..0ad6de4145 100644
--- a/its/core-it-suite/src/test/resources/mng-0674/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0674/pom.xml
@@ -5,7 +5,7 @@
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-674 
+  Maven Integration Test :: MNG-674
   Test parameter alias usage.
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-0680/pom.xml b/its/core-it-suite/src/test/resources/mng-0680/pom.xml
index 384534701e..72dfcdbbf5 100644
--- a/its/core-it-suite/src/test/resources/mng-0680/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0680/pom.xml
@@ -27,7 +27,7 @@ under the License.
   pom
   1.0
 
-  Maven Integration Test :: MNG-680 
+  Maven Integration Test :: MNG-680
   Test that the basedir of the parent is set correctly.
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-0731/pom.xml b/its/core-it-suite/src/test/resources/mng-0731/pom.xml
index 32698e10d9..78558b8378 100644
--- a/its/core-it-suite/src/test/resources/mng-0731/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0731/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0061 
+  Maven Integration Test :: it0061
   
     Verify that deployment of artifacts to a legacy-layout repository
     results in a groupId directory of 'the.full.group.id' instead of
diff --git a/its/core-it-suite/src/test/resources/mng-0761/pom.xml b/its/core-it-suite/src/test/resources/mng-0761/pom.xml
index 8858407dc3..0e708ef483 100644
--- a/its/core-it-suite/src/test/resources/mng-0761/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0761/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-761 
+  Maven Integration Test :: MNG-761
   
     Test that a deployment of a snapshot falls back to a non-snapshot repository if no snapshot repository is
     specified.
diff --git a/its/core-it-suite/src/test/resources/mng-0768/pom.xml b/its/core-it-suite/src/test/resources/mng-0768/pom.xml
index 8f5f89127a..70c33db239 100644
--- a/its/core-it-suite/src/test/resources/mng-0768/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0768/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-768 
+  Maven Integration Test :: MNG-768
   Test offline mode.
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-0773/pom.xml b/its/core-it-suite/src/test/resources/mng-0773/pom.xml
index b2908ad4b8..93fd0ff67b 100644
--- a/its/core-it-suite/src/test/resources/mng-0773/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0773/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-773 
+  Maven Integration Test :: MNG-773
   
     Verify that profiles from settings.xml do not pollute module lists across projects in a reactorized build.
    
diff --git a/its/core-it-suite/src/test/resources/mng-0781/pom.xml b/its/core-it-suite/src/test/resources/mng-0781/pom.xml
index 2d1320872d..1146475bb6 100644
--- a/its/core-it-suite/src/test/resources/mng-0781/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0781/pom.xml
@@ -27,14 +27,14 @@ under the License.
   maven-it-it0074
   1.0
 
-  Maven Integration Test :: it0074 
+  Maven Integration Test :: it0074
   
     Test that plugin-level configuration instances are not nullified by
     execution-level configuration instances.
   
 
   
-     
+    
       
         org.apache.maven.plugins
         maven-resources-plugin
@@ -52,6 +52,6 @@ under the License.
           
         
       
-        
+    
   
 
diff --git a/its/core-it-suite/src/test/resources/mng-0786/pom.xml b/its/core-it-suite/src/test/resources/mng-0786/pom.xml
index 99c8347be7..b09fce627c 100644
--- a/its/core-it-suite/src/test/resources/mng-0786/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0786/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: it0075 
+  Maven Integration Test :: it0075
   
     Verify that direct invocation of a mojo from the command line still
     results in the processing of modules included via profiles.
diff --git a/its/core-it-suite/src/test/resources/mng-0814/pom.xml b/its/core-it-suite/src/test/resources/mng-0814/pom.xml
index 96c2f0e5ad..6d1cf9724b 100644
--- a/its/core-it-suite/src/test/resources/mng-0814/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0814/pom.xml
@@ -26,9 +26,9 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-814 
+  Maven Integration Test :: MNG-814
   Test activation of a profile from the command line.
-  
+
   
     
       test-profile
diff --git a/its/core-it-suite/src/test/resources/mng-0818/pom.xml b/its/core-it-suite/src/test/resources/mng-0818/pom.xml
index f77171ea68..fca5688c47 100644
--- a/its/core-it-suite/src/test/resources/mng-0818/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0818/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   ear
 
-  Maven Integration Test :: it0080 
+  Maven Integration Test :: it0080
   
     Test that depending on a WAR doesn't also get its dependencies transitively.
   
diff --git a/its/core-it-suite/src/test/resources/mng-0823/pom.xml b/its/core-it-suite/src/test/resources/mng-0823/pom.xml
index 53568efc27..93d13af2f1 100644
--- a/its/core-it-suite/src/test/resources/mng-0823/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0823/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0073 
+  Maven Integration Test :: it0073
   org.apache.maven.its.it0073
   maven-it-it0073
   Tests context passing between mojos in the same plugin.
diff --git a/its/core-it-suite/src/test/resources/mng-0836/pom.xml b/its/core-it-suite/src/test/resources/mng-0836/pom.xml
index d4e77cfc88..a1d2811951 100644
--- a/its/core-it-suite/src/test/resources/mng-0836/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0836/pom.xml
@@ -27,7 +27,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-836 
+  Maven Integration Test :: MNG-836
   
     Test that parent POMs referenced by a plugin POM can be resolved from ordinary repos, i.e. non-plugin repos.
     As a motivation for this, imagine the plugin repository hosts only snapshots while the ordinary repository
diff --git a/its/core-it-suite/src/test/resources/mng-0848/pom.xml b/its/core-it-suite/src/test/resources/mng-0848/pom.xml
index fcae484778..62315c8c44 100644
--- a/its/core-it-suite/src/test/resources/mng-0848/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0848/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-848 
+  Maven Integration Test :: MNG-848
   
     Test that execution/system properties take precedence over default value of plugin parameters.
   
diff --git a/its/core-it-suite/src/test/resources/mng-0866/pom.xml b/its/core-it-suite/src/test/resources/mng-0866/pom.xml
index 61d8bf19b6..9becd08e51 100644
--- a/its/core-it-suite/src/test/resources/mng-0866/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0866/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-866 
+  Maven Integration Test :: MNG-866
   
     Test that expressions inside the default value of plugin parameters are evaluated.
   
diff --git a/its/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml
index d379de64c9..8023442225 100644
--- a/its/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0870/plugin/pom.xml
@@ -33,7 +33,7 @@ under the License.
   0.1-SNAPSHOT
   maven-plugin
 
-  Maven Integration Test :: MNG-870 :: Test Plugin 
+  Maven Integration Test :: MNG-870 :: Test Plugin
   
     Test that the reactor can resolve plugins that have just been built by a previous module and are not yet
     installed to the local repo.
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 5d18e2908e..505df0ac3e 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
@@ -30,10 +30,10 @@ import java.net.URL;
 
 /**
  * Creates a touch file if and only if a resource from the plugin dependency was successfully loaded, fails otherwise.
- * 
+ *
  * @goal load
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -43,14 +43,14 @@ public class LoadMojo
 
     /**
      * The path to the output file, relative to the project base directory.
-     * 
+     *
      * @parameter expression="${touch.file}" default-value="target/touch.txt"
      */
     private File file;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
diff --git a/its/core-it-suite/src/test/resources/mng-0870/pom.xml b/its/core-it-suite/src/test/resources/mng-0870/pom.xml
index 197ef119ac..cdbf46e2b6 100644
--- a/its/core-it-suite/src/test/resources/mng-0870/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0870/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-870 
+  Maven Integration Test :: MNG-870
   
     Test that the reactor can resolve plugins that have just been built by a previous module and are not yet
     installed to the local repo.
diff --git a/its/core-it-suite/src/test/resources/mng-0870/project/pom.xml b/its/core-it-suite/src/test/resources/mng-0870/project/pom.xml
index fad34b7d5c..c4a42e87e4 100644
--- a/its/core-it-suite/src/test/resources/mng-0870/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0870/project/pom.xml
@@ -33,7 +33,7 @@ under the License.
   0.2-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-870 :: Plugin Consumer 
+  Maven Integration Test :: MNG-870 :: Plugin Consumer
   
     Test that the reactor can resolve plugins that have just been built by a previous module and are not yet
     installed to the local repo.
diff --git a/its/core-it-suite/src/test/resources/mng-0947/pom.xml b/its/core-it-suite/src/test/resources/mng-0947/pom.xml
index 8f1d162b92..ce3f3e4859 100644
--- a/its/core-it-suite/src/test/resources/mng-0947/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0947/pom.xml
@@ -26,7 +26,7 @@ under the License.
   consumer
   0.1
 
-  Maven Integration Test :: MNG-947 
+  Maven Integration Test :: MNG-947
   
     Verify that direct optional dependencies are included in the project class paths while transitive optional
     dependencies are excluded.
diff --git a/its/core-it-suite/src/test/resources/mng-0956/pom.xml b/its/core-it-suite/src/test/resources/mng-0956/pom.xml
index 6d57e991a4..313e16ac4d 100644
--- a/its/core-it-suite/src/test/resources/mng-0956/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0956/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-956 
+  Maven Integration Test :: MNG-956
   
     Test component injection from project-level plugin dependencies.
   
diff --git a/its/core-it-suite/src/test/resources/mng-0985/pom.xml b/its/core-it-suite/src/test/resources/mng-0985/pom.xml
index d5c9c6ec77..d76ac2d512 100644
--- a/its/core-it-suite/src/test/resources/mng-0985/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-0985/pom.xml
@@ -23,16 +23,16 @@ under the License.
   4.0.0
 
   org.apache.maven.its.it0076
-  maven-it-it0076 
+  maven-it-it0076
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: it0076 
+  Maven Integration Test :: it0076
   
     Test that plugins in pluginManagement aren't included in the build
     unless they are referenced by groupId/artifactId within the plugins
     section of a pom.
-   
+  
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-1021/pom.xml b/its/core-it-suite/src/test/resources/mng-1021/pom.xml
index fc5e7c83c7..1c30c475cb 100644
--- a/its/core-it-suite/src/test/resources/mng-1021/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1021/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   SNAPSHOT
 
-  Maven Integration Test :: MNG-1021 
+  Maven Integration Test :: MNG-1021
   
     Test that attached artifacts have the same build number as the main
     artifact when deployed.
diff --git a/its/core-it-suite/src/test/resources/mng-1052/pom.xml b/its/core-it-suite/src/test/resources/mng-1052/pom.xml
index e40e051f45..7ca0fa9589 100644
--- a/its/core-it-suite/src/test/resources/mng-1052/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1052/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: it0078 
+  Maven Integration Test :: it0078
   
     Test that configuration for a lifecycle-bound plugin is injected from
     PluginManagement section even when it's not explicitly defined in the
diff --git a/its/core-it-suite/src/test/resources/mng-1088/client/pom.xml b/its/core-it-suite/src/test/resources/mng-1088/client/pom.xml
index ec8ef20d76..b8287de1a8 100644
--- a/its/core-it-suite/src/test/resources/mng-1088/client/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1088/client/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.2-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-1088 :: Plugin Client 
+  Maven Integration Test :: MNG-1088 :: Plugin Client
   
     Test that the plugin manager falls back to resolution from the repository if a plugin is part of the reactor
     (i.e. an active project artifact) but the lifecycle has not been executed far enough to produce a file for
diff --git a/its/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml
index 28360f7e9c..1169958666 100644
--- a/its/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1088/plugin/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   maven-plugin
 
-  Maven Integration Test :: MNG-1088 :: Plugin 
+  Maven Integration Test :: MNG-1088 :: Plugin
   
     Test that the plugin manager falls back to resolution from the repository if a plugin is part of the reactor
     (i.e. an active project artifact) but the lifecycle has not been executed far enough to produce a file for
diff --git a/its/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java b/its/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
index 28d10ec926..f1db14b433 100644
--- a/its/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-1088/plugin/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
@@ -27,10 +27,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file.
- * 
+ *
  * @goal touch
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class TouchMojo
@@ -39,14 +39,14 @@ public class TouchMojo
 
     /**
      * The path to the output file, relative to the project base directory.
-     * 
+     *
      * @parameter expression="${touch.file}" default-value="target/touch.txt"
      */
     private File file;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
diff --git a/its/core-it-suite/src/test/resources/mng-1088/pom.xml b/its/core-it-suite/src/test/resources/mng-1088/pom.xml
index e3e7ab926a..f95880b2bb 100644
--- a/its/core-it-suite/src/test/resources/mng-1088/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1088/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-1088 
+  Maven Integration Test :: MNG-1088
   
     Test that the plugin manager falls back to resolution from the repository if a plugin is part of the reactor
     (i.e. an active project artifact) but the lifecycle has not been executed far enough to produce a file for
diff --git a/its/core-it-suite/src/test/resources/mng-1323/a/pom.xml b/its/core-it-suite/src/test/resources/mng-1323/a/pom.xml
index 92e4935c2a..d0767bdab2 100644
--- a/its/core-it-suite/src/test/resources/mng-1323/a/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1323/a/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   a
 
-  Maven Integration Test :: MNG-1323 :: Module A 
+  Maven Integration Test :: MNG-1323 :: Module A
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml b/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml
index 60df01911c..dc79be99a7 100644
--- a/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1323/b/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   b
 
-  Maven Integration Test :: MNG-1323 :: Module B 
+  Maven Integration Test :: MNG-1323 :: Module B
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-1323/c/pom.xml b/its/core-it-suite/src/test/resources/mng-1323/c/pom.xml
index 8a9ada77a5..ef196d55d7 100644
--- a/its/core-it-suite/src/test/resources/mng-1323/c/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1323/c/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   c
 
-  Maven Integration Test :: MNG-1323 :: Module C 
+  Maven Integration Test :: MNG-1323 :: Module C
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-1323/pom.xml b/its/core-it-suite/src/test/resources/mng-1323/pom.xml
index f5e2f55ee8..23892c5c8a 100644
--- a/its/core-it-suite/src/test/resources/mng-1323/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1323/pom.xml
@@ -27,7 +27,7 @@ under the License.
   pom
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-1323 :: Parent 
+  Maven Integration Test :: MNG-1323 :: Parent
   
     Verify that project-level plugin dependencies actually apply to the current project only and not the entire reactor.
   
diff --git a/its/core-it-suite/src/test/resources/mng-1349/pom.xml b/its/core-it-suite/src/test/resources/mng-1349/pom.xml
index 97ed2f577b..6fb09d1f37 100644
--- a/its/core-it-suite/src/test/resources/mng-1349/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1349/pom.xml
@@ -27,7 +27,7 @@ under the License.
   jar
   1
 
-  Maven Integration Test :: MNG-1349 
+  Maven Integration Test :: MNG-1349
   
     Tests that different checksum formats are supported.
   
diff --git a/its/core-it-suite/src/test/resources/mng-1412/pom.xml b/its/core-it-suite/src/test/resources/mng-1412/pom.xml
index 39b0309f95..ca9fd6944a 100644
--- a/its/core-it-suite/src/test/resources/mng-1412/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1412/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-1412 
+  Maven Integration Test :: MNG-1412
   
     Check that dependencies are available in classpath in same order as declared in POM.
   
diff --git a/its/core-it-suite/src/test/resources/mng-1415/pom.xml b/its/core-it-suite/src/test/resources/mng-1415/pom.xml
index 1b0395d5cf..9df32be207 100644
--- a/its/core-it-suite/src/test/resources/mng-1415/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1415/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-1415 
+  Maven Integration Test :: MNG-1415
   
     Test that quoted system properties are processed correctly.
   
diff --git a/its/core-it-suite/src/test/resources/mng-1701/pom.xml b/its/core-it-suite/src/test/resources/mng-1701/pom.xml
index 409e669aee..85334e7e3c 100644
--- a/its/core-it-suite/src/test/resources/mng-1701/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1701/pom.xml
@@ -27,11 +27,11 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-1701 
+  Maven Integration Test :: MNG-1701
   
     Verify that duplicate plugin declarations cause a warning/error.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-1703/child/pom.xml b/its/core-it-suite/src/test/resources/mng-1703/child/pom.xml
index 6c75acf6ed..227e2fb95b 100644
--- a/its/core-it-suite/src/test/resources/mng-1703/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1703/child/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   maven-it-mng1703
 
-  Maven Integration Test :: MNG-1703 
+  Maven Integration Test :: MNG-1703
   
     Verify that a project-level plugin dependency class inherited from the parent can be loaded from both the plugin classloader
     and the context classloader available to the plugin.
diff --git a/its/core-it-suite/src/test/resources/mng-1703/pom.xml b/its/core-it-suite/src/test/resources/mng-1703/pom.xml
index e58ac8100f..8d743f8824 100644
--- a/its/core-it-suite/src/test/resources/mng-1703/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1703/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-1703 
+  Maven Integration Test :: MNG-1703
   
     Verify that a project-level plugin dependency class inherited from the parent can be loaded from both the plugin classloader
     and the context classloader available to the plugin.
@@ -36,7 +36,7 @@ under the License.
   
     child
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-1830/pom.xml b/its/core-it-suite/src/test/resources/mng-1830/pom.xml
index c29e254c00..f3ecf3c748 100644
--- a/its/core-it-suite/src/test/resources/mng-1830/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1830/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: MNG-1830 
+  Maven Integration Test :: MNG-1830
   org.apache.maven.its.mng1830
   maven-it-mng-1830
   Test -v
diff --git a/its/core-it-suite/src/test/resources/mng-1908/pom.xml b/its/core-it-suite/src/test/resources/mng-1908/pom.xml
index 4314f0fc7d..894c852ef8 100644
--- a/its/core-it-suite/src/test/resources/mng-1908/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1908/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-1908 
+  Maven Integration Test :: MNG-1908
   
     Test that legacy repositories with legacy snapshots download correctly.
   
diff --git a/its/core-it-suite/src/test/resources/mng-1995/pom.xml b/its/core-it-suite/src/test/resources/mng-1995/pom.xml
index 98dc8ef0fb..992eac1eb2 100644
--- a/its/core-it-suite/src/test/resources/mng-1995/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1995/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test1
   1.0
 
-  Maven Integration Test :: MNG-1995 
+  Maven Integration Test :: MNG-1995
   
     Verify that POM fields that are of type boolean can be interpolated with expressions.
   
@@ -53,7 +53,7 @@ under the License.
         src/main/resources
         
         ${filter.resources}
-          
+      
     
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-1999/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-1999/child1/pom.xml
index 5de9e40418..657092971a 100644
--- a/its/core-it-suite/src/test/resources/mng-1999/child1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1999/child1/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   child1
 
-  Maven Integration Test :: MNG-1999 
+  Maven Integration Test :: MNG-1999
   
     Verify that default reports can be suppressed via inheritance from the parent.
   
diff --git a/its/core-it-suite/src/test/resources/mng-1999/child2/pom.xml b/its/core-it-suite/src/test/resources/mng-1999/child2/pom.xml
index ead5362962..b59feb87e1 100644
--- a/its/core-it-suite/src/test/resources/mng-1999/child2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1999/child2/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   child2
 
-  Maven Integration Test :: MNG-1999 
+  Maven Integration Test :: MNG-1999
   
     Verify that children can re-enable default reports if suppressed via inheritance from the parent.
   
diff --git a/its/core-it-suite/src/test/resources/mng-1999/pom.xml b/its/core-it-suite/src/test/resources/mng-1999/pom.xml
index 46e4499d65..c7ab62e680 100644
--- a/its/core-it-suite/src/test/resources/mng-1999/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-1999/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-1999 
+  Maven Integration Test :: MNG-1999
   
     Verify that default reports can be suppressed via inheritance from the parent unless children explicitly re-enable
     default reports.
diff --git a/its/core-it-suite/src/test/resources/mng-2006/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-2006/parent/pom.xml
index 00a4a349b3..f8b069f82e 100644
--- a/its/core-it-suite/src/test/resources/mng-2006/parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2006/parent/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-2006 
+  Maven Integration Test :: MNG-2006
   
     Test that inheritance of those URLs which automatically append the child's artifact id take the child's
     relative location to the parent into account.
diff --git a/its/core-it-suite/src/test/resources/mng-2045/pom.xml b/its/core-it-suite/src/test/resources/mng-2045/pom.xml
index af9f871612..497327ae06 100644
--- a/its/core-it-suite/src/test/resources/mng-2045/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2045/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2045 
+  Maven Integration Test :: MNG-2045
   
     Verify that during a multi-module build up to phase "install" the (compile) class path of a module that
     depends on another module's test JAR actually points to the test classes/JAR and not the main classes.
diff --git a/its/core-it-suite/src/test/resources/mng-2045/test-jar/pom.xml b/its/core-it-suite/src/test/resources/mng-2045/test-jar/pom.xml
index 63191f2d56..59a222d2f0 100644
--- a/its/core-it-suite/src/test/resources/mng-2045/test-jar/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2045/test-jar/pom.xml
@@ -32,7 +32,7 @@ under the License.
   test-jar
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-2045 :: Test JAR Producer 
+  Maven Integration Test :: MNG-2045 :: Test JAR Producer
   
     Verify that during a multi-module build up to phase "install" the (compile) class path of a module that
     depends on another module's test JAR actually points to the test classes/JAR and not the main classes.
diff --git a/its/core-it-suite/src/test/resources/mng-2045/test-user/pom.xml b/its/core-it-suite/src/test/resources/mng-2045/test-user/pom.xml
index cf84991f0e..f4cd4936dc 100644
--- a/its/core-it-suite/src/test/resources/mng-2045/test-user/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2045/test-user/pom.xml
@@ -32,7 +32,7 @@ under the License.
   test-user
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-2045 :: Test JAR Consumer 
+  Maven Integration Test :: MNG-2045 :: Test JAR Consumer
   
     Verify that during a multi-module build up to phase "install" the (compile) class path of a module that
     depends on another module's test JAR actually points to the test classes/JAR and not the main classes.
diff --git a/its/core-it-suite/src/test/resources/mng-2052/pom.xml b/its/core-it-suite/src/test/resources/mng-2052/pom.xml
index 6f3ac8f665..c9efd08b1c 100644
--- a/its/core-it-suite/src/test/resources/mng-2052/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2052/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-2052 
+  Maven Integration Test :: MNG-2052
   
     Test that properties defined in an active profile in the user's
     settings are available for interpolation of systemPath in a dependency.
diff --git a/its/core-it-suite/src/test/resources/mng-2054/pom.xml b/its/core-it-suite/src/test/resources/mng-2054/pom.xml
index 12100b2add..06687efd33 100644
--- a/its/core-it-suite/src/test/resources/mng-2054/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2054/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1
   pom
 
-  Maven Integration Test :: MNG-2054 
+  Maven Integration Test :: MNG-2054
   
     Test that plugin executions from >1 step of inheritance don't run multiple times.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/App.java b/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/App.java
index 1840d732f3..3d3f7bfac1 100644
--- a/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/App.java
+++ b/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/main/java/com/stchome/mavenTest/App.java
@@ -4,7 +4,7 @@ package com.stchome.mavenTest.it0096;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java b/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java
index c0559fd596..1c8ac9911c 100644
--- a/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-2054/project/project-level2/project-level3/project-jar/src/test/java/com/stchome/mavenTest/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/child/pom.xml b/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/child/pom.xml
index cdf10fc075..d9b7070f20 100644
--- a/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/child/pom.xml
@@ -32,5 +32,5 @@ under the License.
   child
   jar
 
-  Maven Integration Test :: MNG-2068 :: Child 
+  Maven Integration Test :: MNG-2068 :: Child
 
diff --git a/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/pom.xml
index b5415c23b6..36a9b25304 100644
--- a/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2068/test-1/parent/pom.xml
@@ -32,7 +32,7 @@ under the License.
   parent
   pom
 
-  Maven Integration Test :: MNG-2068 :: Parent 
+  Maven Integration Test :: MNG-2068 :: Parent
 
   
     child
diff --git a/its/core-it-suite/src/test/resources/mng-2068/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-2068/test-1/pom.xml
index fc0109bacf..365b3594ad 100644
--- a/its/core-it-suite/src/test/resources/mng-2068/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2068/test-1/pom.xml
@@ -24,8 +24,8 @@ under the License.
 
   org.apache.maven.its.mng2068
   grand-parent
-  2.2-SNAPSHOT 
+  2.2-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2068 :: Grand Parent 
+  Maven Integration Test :: MNG-2068 :: Grand Parent
 
diff --git a/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/child/pom.xml b/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/child/pom.xml
index 23c0893115..37dad3edc9 100644
--- a/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/child/pom.xml
@@ -33,5 +33,5 @@ under the License.
   child
   1
 
-  Maven Integration Test :: MNG-2068 :: Child 
+  Maven Integration Test :: MNG-2068 :: Child
 
diff --git a/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/pom.xml
index 308587c66a..b6611ee5e2 100644
--- a/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2068/test-2/parent/pom.xml
@@ -34,7 +34,7 @@ under the License.
   1
   pom
 
-  Maven Integration Test :: MNG-2068 :: Parent 
+  Maven Integration Test :: MNG-2068 :: Parent
 
   
     child
diff --git a/its/core-it-suite/src/test/resources/mng-2068/test-2/pom.xml b/its/core-it-suite/src/test/resources/mng-2068/test-2/pom.xml
index 8bce96d12a..f7832c3996 100644
--- a/its/core-it-suite/src/test/resources/mng-2068/test-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2068/test-2/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1
   pom
 
-  Maven Integration Test :: MNG-2068 :: Grand Parent 
+  Maven Integration Test :: MNG-2068 :: Grand Parent
 
   
     parent
diff --git a/its/core-it-suite/src/test/resources/mng-2068/test-3/pom.xml b/its/core-it-suite/src/test/resources/mng-2068/test-3/pom.xml
index 68e0af2aba..abbd16a890 100644
--- a/its/core-it-suite/src/test/resources/mng-2068/test-3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2068/test-3/pom.xml
@@ -6,7 +6,7 @@
   1
   pom
 
-  Maven Integration Test :: MNG-2068 
+  Maven Integration Test :: MNG-2068
   
     Test that the implied relative path for the parent POM works, even two levels deep.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2123/pom.xml b/its/core-it-suite/src/test/resources/mng-2123/pom.xml
index 0165dcfc06..cbd055939c 100644
--- a/its/core-it-suite/src/test/resources/mng-2123/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2123/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-2123 
+  Maven Integration Test :: MNG-2123
   
     Verify that conflicts between a soft version and a version range are properly resolved.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml b/its/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml
index 2e6531cbd4..b54b8e76b4 100644
--- a/its/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2124/parent/child/pom.xml
@@ -57,5 +57,5 @@ under the License.
       
     
   
-            
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-2124/pom.xml b/its/core-it-suite/src/test/resources/mng-2124/pom.xml
index ab80ad8d15..08d081522a 100644
--- a/its/core-it-suite/src/test/resources/mng-2124/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2124/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: it0100 
+  Maven Integration Test :: it0100
   Test that ${parent.artifactId} resolves correctly. [MNG-2124]
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-2130/pom.xml b/its/core-it-suite/src/test/resources/mng-2130/pom.xml
index 0cca8ba012..21c7bbdf54 100644
--- a/its/core-it-suite/src/test/resources/mng-2130/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2130/pom.xml
@@ -6,12 +6,12 @@
   1
   pom
 
-  Maven Integration Test :: MNG-2130 
+  Maven Integration Test :: MNG-2130
   
     Test that parent-POMs cached during a build are available as parents
     to other POMs in the multimodule build.
   
-  
+
   
     child
   
diff --git a/its/core-it-suite/src/test/resources/mng-2136/pom.xml b/its/core-it-suite/src/test/resources/mng-2136/pom.xml
index 671d9695f5..9f2d7d470d 100644
--- a/its/core-it-suite/src/test/resources/mng-2136/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2136/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: it0102 
+  Maven Integration Test :: it0102
   
     Test that <activeByDefault/> calculations for profile activation only
     use profiles defined in the POM. [MNG-2136]
diff --git a/its/core-it-suite/src/test/resources/mng-2174/pom.xml b/its/core-it-suite/src/test/resources/mng-2174/pom.xml
index 118861a34a..e283bb09be 100644
--- a/its/core-it-suite/src/test/resources/mng-2174/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2174/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2174 
+  Maven Integration Test :: MNG-2174
   
     Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the
     parent's main plugin management section is also present.
diff --git a/its/core-it-suite/src/test/resources/mng-2174/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-2174/sub/pom.xml
index 9c06879520..3614e30527 100644
--- a/its/core-it-suite/src/test/resources/mng-2174/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2174/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
   child
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-2174 
+  Maven Integration Test :: MNG-2174
   
     Verify that plugin dependencies defined by plugin management of a parent profile are not lost when the
     parent's main plugin management section is also present.
diff --git a/its/core-it-suite/src/test/resources/mng-2196/pom.xml b/its/core-it-suite/src/test/resources/mng-2196/pom.xml
index 6e6b067a2d..dfe2fc923f 100644
--- a/its/core-it-suite/src/test/resources/mng-2196/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2196/pom.xml
@@ -6,7 +6,7 @@
   1
   pom
 
-  Maven Integration Test :: MNG-2196 
+  Maven Integration Test :: MNG-2196
   
   	Verify that multimodule builds where one project references another as
     a parent can build, even if that parent is not correctly referenced by
diff --git a/its/core-it-suite/src/test/resources/mng-2222/mod-a/pom.xml b/its/core-it-suite/src/test/resources/mng-2222/mod-a/pom.xml
index 743d48d395..08d3a46e60 100644
--- a/its/core-it-suite/src/test/resources/mng-2222/mod-a/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2222/mod-a/pom.xml
@@ -31,7 +31,7 @@ under the License.
   mod-a
   1
 
-  Maven Integration Test :: MNG-2222 :: Module A 
+  Maven Integration Test :: MNG-2222 :: Module A
   
     Test that dependencies on reactor projects can be satisfied by their output directories even if those do not
     exist (e.g. due to non-existing sources). This ensures consistent build results for "mvn compile" and
diff --git a/its/core-it-suite/src/test/resources/mng-2222/mod-b/pom.xml b/its/core-it-suite/src/test/resources/mng-2222/mod-b/pom.xml
index 1ec98dad7b..05c66f8212 100644
--- a/its/core-it-suite/src/test/resources/mng-2222/mod-b/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2222/mod-b/pom.xml
@@ -31,7 +31,7 @@ under the License.
   mod-b
   1
 
-  Maven Integration Test :: MNG-2222 :: Module B 
+  Maven Integration Test :: MNG-2222 :: Module B
   
     Test that dependencies on reactor projects can be satisfied by their output directories even if those do not
     exist (e.g. due to non-existing sources). This ensures consistent build results for "mvn compile" and
diff --git a/its/core-it-suite/src/test/resources/mng-2222/pom.xml b/its/core-it-suite/src/test/resources/mng-2222/pom.xml
index 561df55b38..2f54d0e369 100644
--- a/its/core-it-suite/src/test/resources/mng-2222/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2222/pom.xml
@@ -27,13 +27,13 @@ under the License.
   1
   pom
 
-  Maven Integration Test :: MNG-2222 
+  Maven Integration Test :: MNG-2222
   
     Test that dependencies on reactor projects can be satisfied by their output directories even if those do not
     exist (e.g. due to non-existing sources). This ensures consistent build results for "mvn compile" and
     "mvn package".
   
-  
+
   
     mod-a
     mod-b
diff --git a/its/core-it-suite/src/test/resources/mng-2228/pom.xml b/its/core-it-suite/src/test/resources/mng-2228/pom.xml
index 98d62da13a..724f7ea288 100644
--- a/its/core-it-suite/src/test/resources/mng-2228/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2228/pom.xml
@@ -26,10 +26,10 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-2228 
+  Maven Integration Test :: MNG-2228
   
     Verify that components injected into plugins are actually assignment-compatible with the corresponding mojo
-    fields in case the field type is both provided by a plugin dependency and by a build extension. 
+    fields in case the field type is both provided by a plugin dependency and by a build extension.
   
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-2234/pom.xml b/its/core-it-suite/src/test/resources/mng-2234/pom.xml
index d5f0b59efa..b6c5b32ad7 100644
--- a/its/core-it-suite/src/test/resources/mng-2234/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2234/pom.xml
@@ -5,7 +5,7 @@
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-2234 
+  Maven Integration Test :: MNG-2234
   
     Verify that the activeProfile section from the settings.xml can also activate profiles specified in the POM,
     i.e. outside of the settings.xml.
diff --git a/its/core-it-suite/src/test/resources/mng-2254/latin-1/pom.xml b/its/core-it-suite/src/test/resources/mng-2254/latin-1/pom.xml
index f9bb573ac8..8e31ee2fc0 100644
--- a/its/core-it-suite/src/test/resources/mng-2254/latin-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2254/latin-1/pom.xml
@@ -37,6 +37,6 @@ NOTE: This POM's XML declaration intentionally declares Latin-1 encoding.
   0.1-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2254 :: Latin-1 
+  Maven Integration Test :: MNG-2254 :: Latin-1
   TEST-CHARS: ÄÖÜäöüß
 
diff --git a/its/core-it-suite/src/test/resources/mng-2254/pom.xml b/its/core-it-suite/src/test/resources/mng-2254/pom.xml
index 2a2e552d82..9740c1fe56 100644
--- a/its/core-it-suite/src/test/resources/mng-2254/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2254/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2254 
+  Maven Integration Test :: MNG-2254
   
     Verify that the encoding declaration of the POM is respected.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2254/utf-8/pom.xml b/its/core-it-suite/src/test/resources/mng-2254/utf-8/pom.xml
index 625042ccd2..580a4d04f4 100644
--- a/its/core-it-suite/src/test/resources/mng-2254/utf-8/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2254/utf-8/pom.xml
@@ -37,6 +37,6 @@ NOTE: This POM's XML declaration specified no encoding which should therefore de
   0.1-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2254 :: UTF-8 
+  Maven Integration Test :: MNG-2254 :: UTF-8
   TEST-CHARS: ßıΣЯ×€
 
diff --git a/its/core-it-suite/src/test/resources/mng-2276/pom.xml b/its/core-it-suite/src/test/resources/mng-2276/pom.xml
index af4759de4d..fd8c5d89a7 100644
--- a/its/core-it-suite/src/test/resources/mng-2276/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2276/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-2276 
+  Maven Integration Test :: MNG-2276
   
     Test that profiles in the POM can be activated by properties declared in active profiles from the settings.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2277/pom.xml b/its/core-it-suite/src/test/resources/mng-2277/pom.xml
index 47d38e5061..97b09410c3 100644
--- a/its/core-it-suite/src/test/resources/mng-2277/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2277/pom.xml
@@ -17,7 +17,7 @@
       
     
   
-  
+
   
     assembly
     test
diff --git a/its/core-it-suite/src/test/resources/mng-2289/issue/pom.xml b/its/core-it-suite/src/test/resources/mng-2289/issue/pom.xml
index da2b497a47..837a1f54e2 100644
--- a/its/core-it-suite/src/test/resources/mng-2289/issue/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2289/issue/pom.xml
@@ -15,12 +15,12 @@
     Issue 2289
     SNAPSHOT
     
-    
+
     
         
             commons-logging
             commons-logging
         
     
-    
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml b/its/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml
index 2f8ffe1733..ef6d1f6015 100644
--- a/its/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml
+++ b/its/core-it-suite/src/test/resources/mng-2289/parent/pom1.xml
@@ -39,7 +39,7 @@
             file:///tmp/repo-m2-snapshot
         
     
-    
+
     
     
         
diff --git a/its/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml b/its/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml
index bb2e2252f1..59df0fadbf 100644
--- a/its/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml
+++ b/its/core-it-suite/src/test/resources/mng-2289/parent/pom2.xml
@@ -15,7 +15,7 @@
     
     
     
-    
+
     
         
             
@@ -40,7 +40,7 @@
             file:///tmp/repo-m2-snapshot
         
     
-    
+
     
     
         
diff --git a/its/core-it-suite/src/test/resources/mng-2293/pom.xml b/its/core-it-suite/src/test/resources/mng-2293/pom.xml
index ad5ec95892..92016ad084 100644
--- a/its/core-it-suite/src/test/resources/mng-2293/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2293/pom.xml
@@ -6,7 +6,7 @@
   3.8.1
   pom
 
-  Maven Integration Test :: MNG-2293 
+  Maven Integration Test :: MNG-2293
   
     Verify that default implementation of an implementation for a complex object works as expected.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2309/pom.xml b/its/core-it-suite/src/test/resources/mng-2309/pom.xml
index aa83ec4fde..63ad804769 100644
--- a/its/core-it-suite/src/test/resources/mng-2309/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2309/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-2309 
+  Maven Integration Test :: MNG-2309
   
     Test that profiles are injected in declaration order, with the last profile being the most dominant.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2339/a/pom.xml b/its/core-it-suite/src/test/resources/mng-2339/a/pom.xml
index 66a575f7de..14ede1ba73 100644
--- a/its/core-it-suite/src/test/resources/mng-2339/a/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2339/a/pom.xml
@@ -4,9 +4,9 @@
   bad-project-interpolation
   1.0-SNAPSHOT
 
-  
   
diff --git a/its/core-it-suite/src/test/resources/mng-2387/pom.xml b/its/core-it-suite/src/test/resources/mng-2387/pom.xml
index e69d1b42be..31f3cf0b35 100644
--- a/its/core-it-suite/src/test/resources/mng-2387/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2387/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-1
   0.1
 
-  Maven Integration Test :: MNG-2387 
+  Maven Integration Test :: MNG-2387
   
     Test that no proxy is used if none of the configured proxies is actually set as active.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2432/pom.xml b/its/core-it-suite/src/test/resources/mng-2432/pom.xml
index 07f11a01ef..0512e1327e 100644
--- a/its/core-it-suite/src/test/resources/mng-2432/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2432/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.1
 
-  Maven Integration Test :: MNG-2432 
+  Maven Integration Test :: MNG-2432
   
     Verify that when resolving plugin prefixes the plugins from the POM are searched before the plugin groups
     from the settings.
diff --git a/its/core-it-suite/src/test/resources/mng-2539/pom.xml b/its/core-it-suite/src/test/resources/mng-2539/pom.xml
index a286c47bb4..ad04cbd7c5 100644
--- a/its/core-it-suite/src/test/resources/mng-2539/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2539/pom.xml
@@ -6,7 +6,7 @@
   mng-2539
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-2539 
+  Maven Integration Test :: MNG-2539
   
     Verify that dependencies specified in plugins are also retrieved from ordinary/non-plugin repositories.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2562/custom/pom.xml b/its/core-it-suite/src/test/resources/mng-2562/custom/pom.xml
index e3f951cce4..51ce13ea27 100644
--- a/its/core-it-suite/src/test/resources/mng-2562/custom/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2562/custom/pom.xml
@@ -26,7 +26,7 @@ under the License.
   pom
   1.0
 
-  Maven Integration Test :: MNG-2562 
+  Maven Integration Test :: MNG-2562
   
     Verify that the format of the timestamp can be customized via maven.build.timestamp.format.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2562/default/pom.xml b/its/core-it-suite/src/test/resources/mng-2562/default/pom.xml
index 5d67ce6e57..5d10947ce9 100644
--- a/its/core-it-suite/src/test/resources/mng-2562/default/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2562/default/pom.xml
@@ -26,7 +26,7 @@ under the License.
   pom
   1.0
 
-  Maven Integration Test :: MNG-2562 
+  Maven Integration Test :: MNG-2562
   
     Verify that the property build.timestamp is available for POM interpolation.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2562/reactor/child-1/pom.xml b/its/core-it-suite/src/test/resources/mng-2562/reactor/child-1/pom.xml
index 5d5bce463b..022d907d50 100644
--- a/its/core-it-suite/src/test/resources/mng-2562/reactor/child-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2562/reactor/child-1/pom.xml
@@ -32,7 +32,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-2562 :: Child 1 
+  Maven Integration Test :: MNG-2562 :: Child 1
   
     Verify that the timestamp is the same for all modules of a reactor build.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2562/reactor/child-2/pom.xml b/its/core-it-suite/src/test/resources/mng-2562/reactor/child-2/pom.xml
index b582780d79..5479d2bb79 100644
--- a/its/core-it-suite/src/test/resources/mng-2562/reactor/child-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2562/reactor/child-2/pom.xml
@@ -32,7 +32,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-2562 :: Child 2 
+  Maven Integration Test :: MNG-2562 :: Child 2
   
     Verify that the timestamp is the same for all modules of a reactor build.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2562/reactor/child-3/pom.xml b/its/core-it-suite/src/test/resources/mng-2562/reactor/child-3/pom.xml
index bb20901695..7e22335523 100644
--- a/its/core-it-suite/src/test/resources/mng-2562/reactor/child-3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2562/reactor/child-3/pom.xml
@@ -32,7 +32,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-2562 :: Child 3 
+  Maven Integration Test :: MNG-2562 :: Child 3
   
     Verify that the timestamp is the same for all modules of a reactor build.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2562/reactor/pom.xml b/its/core-it-suite/src/test/resources/mng-2562/reactor/pom.xml
index feee18f677..124c61a1e3 100644
--- a/its/core-it-suite/src/test/resources/mng-2562/reactor/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2562/reactor/pom.xml
@@ -26,7 +26,7 @@ under the License.
   pom
   1.0
 
-  Maven Integration Test :: MNG-2562 
+  Maven Integration Test :: MNG-2562
   
     Verify that the timestamp is the same for all modules of a reactor build.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2591/no-profile/pom.xml b/its/core-it-suite/src/test/resources/mng-2591/no-profile/pom.xml
index 52fb468dc2..60180d5135 100644
--- a/its/core-it-suite/src/test/resources/mng-2591/no-profile/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2591/no-profile/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-2591 
+  Maven Integration Test :: MNG-2591
   
     Test aggregation of list configuration items for build plugins when using
     'combine.children=append' attribute.
diff --git a/its/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml b/its/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml
index 48a8d393ba..72ab3f4525 100644
--- a/its/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2591/with-profile/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-2591 
+  Maven Integration Test :: MNG-2591
   
     Test aggregation of list configuration items for build plugins when using
     'combine.children=append' attribute.
diff --git a/its/core-it-suite/src/test/resources/mng-2605/pom.xml b/its/core-it-suite/src/test/resources/mng-2605/pom.xml
index 870bf71b26..a3439d49c3 100644
--- a/its/core-it-suite/src/test/resources/mng-2605/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2605/pom.xml
@@ -26,7 +26,7 @@ under the License.
   child
   0.1
 
-  Maven Integration Test :: MNG-2605 
+  Maven Integration Test :: MNG-2605
   
     Test that profiles are not accidentally activated when they have no activation element at all and
     the user did not request their activation via id.
diff --git a/its/core-it-suite/src/test/resources/mng-2668/pom.xml b/its/core-it-suite/src/test/resources/mng-2668/pom.xml
index 87eb162672..ecf2306fb7 100644
--- a/its/core-it-suite/src/test/resources/mng-2668/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2668/pom.xml
@@ -7,7 +7,7 @@
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2539 
+  Maven Integration Test :: MNG-2539
   
     Verify that dependencies of plugins are considered by the project sorter for a reactor build.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2668/project/pom.xml b/its/core-it-suite/src/test/resources/mng-2668/project/pom.xml
index d3cf8a597a..d609a2b2bf 100644
--- a/its/core-it-suite/src/test/resources/mng-2668/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2668/project/pom.xml
@@ -10,7 +10,7 @@
 
   project
 
-  Maven Integration Test :: MNG-2539 :: Plugin Dependency Consumer 
+  Maven Integration Test :: MNG-2539 :: Plugin Dependency Consumer
   
     Verify that dependencies of plugins are considered by the project sorter for a reactor build.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2668/tools/pom.xml b/its/core-it-suite/src/test/resources/mng-2668/tools/pom.xml
index 17acec129f..d046da9219 100644
--- a/its/core-it-suite/src/test/resources/mng-2668/tools/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2668/tools/pom.xml
@@ -10,7 +10,7 @@
 
   tools
 
-  Maven Integration Test :: MNG-2539 :: Plugin Dependency Provider 
+  Maven Integration Test :: MNG-2539 :: Plugin Dependency Provider
   
     Verify that dependencies of plugins are considered by the project sorter for a reactor build.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2690/mojo-complookup/pom.xml b/its/core-it-suite/src/test/resources/mng-2690/mojo-complookup/pom.xml
index 2918f35f2a..c0f4580c61 100644
--- a/its/core-it-suite/src/test/resources/mng-2690/mojo-complookup/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2690/mojo-complookup/pom.xml
@@ -5,7 +5,7 @@
   mng-2690-mojo-complookup
   1
   pom
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2690/noclassdef-mojo/pom.xml b/its/core-it-suite/src/test/resources/mng-2690/noclassdef-mojo/pom.xml
index 0f0b0b002a..0a2697df4e 100644
--- a/its/core-it-suite/src/test/resources/mng-2690/noclassdef-mojo/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2690/noclassdef-mojo/pom.xml
@@ -5,7 +5,7 @@
   mng-2690-noclassdef-mojo
   1
   pom
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2690/noclassdef-param/pom.xml b/its/core-it-suite/src/test/resources/mng-2690/noclassdef-param/pom.xml
index 5ea22c3041..b7744d9bb7 100644
--- a/its/core-it-suite/src/test/resources/mng-2690/noclassdef-param/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2690/noclassdef-param/pom.xml
@@ -5,7 +5,7 @@
   mng-2690-noclassdef-param
   1
   pom
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2690/requirement-complookup/pom.xml b/its/core-it-suite/src/test/resources/mng-2690/requirement-complookup/pom.xml
index fa022b31ff..59a58d89aa 100644
--- a/its/core-it-suite/src/test/resources/mng-2690/requirement-complookup/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2690/requirement-complookup/pom.xml
@@ -5,7 +5,7 @@
   mng-2690-requirement-complookup
   1
   pom
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2693/pom.xml b/its/core-it-suite/src/test/resources/mng-2693/pom.xml
index d2355723ab..b13c51af51 100644
--- a/its/core-it-suite/src/test/resources/mng-2693/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2693/pom.xml
@@ -26,11 +26,11 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-2693 
+  Maven Integration Test :: MNG-2693
   
     Verify that a plugin class/resource can be loaded from the plugin realm, also during the site lifecycle.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2695/pom.xml b/its/core-it-suite/src/test/resources/mng-2695/pom.xml
index e7bade0566..b1d2cd9ca9 100644
--- a/its/core-it-suite/src/test/resources/mng-2695/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2695/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test1
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-2695 
+  Maven Integration Test :: MNG-2695
   
     Verify that snapshot plugins which are scheduled for an update don't fail the build when in offline mode.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2720/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-2720/child1/pom.xml
index 8d585fbd24..33bfc68b64 100644
--- a/its/core-it-suite/src/test/resources/mng-2720/child1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2720/child1/pom.xml
@@ -7,9 +7,9 @@
     project-hierarchy
     1
   
-  
+
   child1
-  
+
   MNG-2720 Project Hierarchy 1 Child 1
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-2720/child2/pom.xml b/its/core-it-suite/src/test/resources/mng-2720/child2/pom.xml
index 22b68242b0..46363e4eac 100644
--- a/its/core-it-suite/src/test/resources/mng-2720/child2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2720/child2/pom.xml
@@ -7,9 +7,9 @@
     project-hierarchy
     1
   
-  
+
   child2
-  
+
   MNG-2720 Project Hierarchy 1 Child 2
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-2720/child3/pom.xml b/its/core-it-suite/src/test/resources/mng-2720/child3/pom.xml
index 81fd344236..3eae416106 100644
--- a/its/core-it-suite/src/test/resources/mng-2720/child3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2720/child3/pom.xml
@@ -7,9 +7,9 @@
     project-hierarchy
     1
   
-  
+
   child3
-  
+
   MNG-2720 Project Hierarchy 1 Child 3
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-2720/pom.xml b/its/core-it-suite/src/test/resources/mng-2720/pom.xml
index 87506c0a8b..17d133c874 100644
--- a/its/core-it-suite/src/test/resources/mng-2720/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2720/pom.xml
@@ -8,13 +8,13 @@
   pom
 
   MNG-2720 Project Hierarchy
-  
+
   
     child1
     child2
     child3
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2741/pom.xml b/its/core-it-suite/src/test/resources/mng-2741/pom.xml
index 4f7fd5f548..4a7789ceaa 100644
--- a/its/core-it-suite/src/test/resources/mng-2741/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2741/pom.xml
@@ -27,7 +27,7 @@ under the License.
   jar
   1
 
-  Maven Integration Test :: MNG-2741 
+  Maven Integration Test :: MNG-2741
   
     Tests that plugin prefix/version metadata resolution errors tell the underlying transport issue.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2744/pom.xml b/its/core-it-suite/src/test/resources/mng-2744/pom.xml
index 95288d596e..efa575636c 100644
--- a/its/core-it-suite/src/test/resources/mng-2744/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2744/pom.xml
@@ -27,7 +27,7 @@ under the License.
   jar
   1
 
-  Maven Integration Test :: MNG-2744 
+  Maven Integration Test :: MNG-2744
   
     Tests that hex digits of checksums are compared without regard to case.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2749/pom.xml b/its/core-it-suite/src/test/resources/mng-2749/pom.xml
index bd0b915454..9a75d52756 100644
--- a/its/core-it-suite/src/test/resources/mng-2749/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2749/pom.xml
@@ -26,7 +26,7 @@ under the License.
   maven-it-mng2749
   1.0
 
-  Maven Integration Test :: MNG-2749 
+  Maven Integration Test :: MNG-2749
   
     Verify that plugins can load classes/resources from a build extension.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2771/extension/pom.xml b/its/core-it-suite/src/test/resources/mng-2771/extension/pom.xml
index 9497d36ef6..dfa7b8adc1 100644
--- a/its/core-it-suite/src/test/resources/mng-2771/extension/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2771/extension/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0124 
+  Maven Integration Test :: it0124
   org.apache.maven.its.it0124
   maven-it-it0124-extension
   Project that provides an alternative ArtifactFactory implementation for testing.
diff --git a/its/core-it-suite/src/test/resources/mng-2771/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java b/its/core-it-suite/src/test/resources/mng-2771/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java
index 4f938638ba..222b6332e9 100644
--- a/its/core-it-suite/src/test/resources/mng-2771/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java
+++ b/its/core-it-suite/src/test/resources/mng-2771/extension/src/main/java/org/apache/maven/its/it0124/CustomArtifactFactory.java
@@ -23,7 +23,7 @@ import org.apache.maven.artifact.factory.DefaultArtifactFactory;
 
 /**
  * Simple alternative artifact factory implementation for testing.
- * 
+ *
  * @author Mark Hobson
  */
 public class CustomArtifactFactory
diff --git a/its/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml
index 9eafb2357a..cef06ce559 100644
--- a/its/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2771/plugin/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0124 
+  Maven Integration Test :: it0124
   org.apache.maven.its.it0124
   maven-it-it0124-plugin
   maven-plugin
diff --git a/its/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java b/its/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java
index 2c22f73c90..325283cc13 100644
--- a/its/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-2771/plugin/src/main/java/org/apache/maven/its/it0124/LookupMojo.java
@@ -46,19 +46,19 @@ public class LookupMojo extends AbstractMojo
      * @component
      */
     private ArtifactFactory artifactFactory;
-    
+
     /**
      * @parameter expression="${project.build.directory}"
      */
     private String buildDirectory;
-    
+
     /*
      * @see org.apache.maven.plugin.Mojo#execute()
      */
     public void execute() throws MojoExecutionException, MojoFailureException
     {
         File file = new File( buildDirectory, "lookup.log" );
-        
+
         if ( !file.getParentFile().mkdirs() )
         {
             throw new MojoExecutionException( "Cannot create build directory" );
diff --git a/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml b/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml
index 657f7923b6..7e887262aa 100644
--- a/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2771/project/pom.xml
@@ -1,6 +1,6 @@
 
   4.0.0
-  Maven Integration Test :: it0124 
+  Maven Integration Test :: it0124
   org.apache.maven.its.it0124
   maven-it-it0124
   Test that ensures the POM extensions can override default component implementations.
diff --git a/its/core-it-suite/src/test/resources/mng-2790/pom.xml b/its/core-it-suite/src/test/resources/mng-2790/pom.xml
index ecaabe1f35..3ed5e5a98c 100644
--- a/its/core-it-suite/src/test/resources/mng-2790/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2790/pom.xml
@@ -27,11 +27,11 @@ under the License.
   
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-2790 
+  Maven Integration Test :: MNG-2790
   
     Verify that the field lastUpdated of existing local repo metadata is updated upon install of new a snapshot.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2831/pom.xml b/its/core-it-suite/src/test/resources/mng-2831/pom.xml
index c68044d1b1..c0e577a0ea 100644
--- a/its/core-it-suite/src/test/resources/mng-2831/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2831/pom.xml
@@ -28,7 +28,7 @@ under the License.
   
   it-packaging
 
-  Maven Integration Test :: MNG-2831 
+  Maven Integration Test :: MNG-2831
   
     Test the use of a custom lifecycle from a plugin that is defined as a build extension.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2843/pom.xml b/its/core-it-suite/src/test/resources/mng-2843/pom.xml
index 01eb250728..c8ae1cbf53 100644
--- a/its/core-it-suite/src/test/resources/mng-2843/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2843/pom.xml
@@ -26,7 +26,7 @@ under the License.
   parent
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-2843 
+  Maven Integration Test :: MNG-2843
   
     Test that plugins can have the project properties injected via ${project.properties}.
   
@@ -45,11 +45,11 @@ under the License.
             
           
         
-            
+      
     
   
 
   
     PASSED
-   
+  
 
diff --git a/its/core-it-suite/src/test/resources/mng-2848/pom.xml b/its/core-it-suite/src/test/resources/mng-2848/pom.xml
index 0e24bbca4f..46a927a3d6 100644
--- a/its/core-it-suite/src/test/resources/mng-2848/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2848/pom.xml
@@ -26,11 +26,11 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-2848 
+  Maven Integration Test :: MNG-2848
   
     Test activation of a profile via environment variables.
   
-  
+
   
     
       test
diff --git a/its/core-it-suite/src/test/resources/mng-2865/central/pom.xml b/its/core-it-suite/src/test/resources/mng-2865/central/pom.xml
index 82f93b1a59..cc0a9a6f6a 100644
--- a/its/core-it-suite/src/test/resources/mng-2865/central/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2865/central/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-2
   0.1
 
-  Maven Integration Test :: MNG-2865 
+  Maven Integration Test :: MNG-2865
   
     Test that the mirror wildcard * matches any repo, in particular central.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2865/external/pom.xml b/its/core-it-suite/src/test/resources/mng-2865/external/pom.xml
index 79ae4484f3..175653eee8 100644
--- a/its/core-it-suite/src/test/resources/mng-2865/external/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2865/external/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-1c
   0.1
 
-  Maven Integration Test :: MNG-2865 :: C 
+  Maven Integration Test :: MNG-2865 :: C
   
     Test that the mirror wildcard * matches any repo.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2865/file/pom.xml b/its/core-it-suite/src/test/resources/mng-2865/file/pom.xml
index 6b69e0cbaa..4db02c19c3 100644
--- a/its/core-it-suite/src/test/resources/mng-2865/file/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2865/file/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-1a
   0.1
 
-  Maven Integration Test :: MNG-2865 :: A 
+  Maven Integration Test :: MNG-2865 :: A
   
     Test that the mirror wildcard * matches any repo.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2865/localhost/pom.xml b/its/core-it-suite/src/test/resources/mng-2865/localhost/pom.xml
index bb66b89240..9da7043094 100644
--- a/its/core-it-suite/src/test/resources/mng-2865/localhost/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2865/localhost/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-1b
   0.1
 
-  Maven Integration Test :: MNG-2865 :: B 
+  Maven Integration Test :: MNG-2865 :: B
   
     Test that the mirror wildcard * matches any repo.
   
diff --git a/its/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml
index d3a3daab3f..9c8432681e 100644
--- a/its/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2871/consumer/pom.xml
@@ -31,7 +31,7 @@ under the License.
   consumer
   jar
 
-  Maven Integration Test :: MNG-2871 :: Dependency Consumer 
+  Maven Integration Test :: MNG-2871 :: Dependency Consumer
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml b/its/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml
index c563c9fdf6..408eebb0f8 100644
--- a/its/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2871/ejbs/pom.xml
@@ -31,7 +31,7 @@ under the License.
   ejbs
   ejb
 
-  Maven Integration Test :: MNG-2871 :: EJB Client JAR Provider 
+  Maven Integration Test :: MNG-2871 :: EJB Client JAR Provider
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-2871/pom.xml b/its/core-it-suite/src/test/resources/mng-2871/pom.xml
index 6d4a2ff482..4a0ca564d2 100644
--- a/its/core-it-suite/src/test/resources/mng-2871/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2871/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-2871 :: Parent 
+  Maven Integration Test :: MNG-2871 :: Parent
   
     Verify that dependencies on not-yet-packaged sub artifacts in build phases prior to package can be satisfied
     from a module's output directory, i.e. with the loose class files.
diff --git a/its/core-it-suite/src/test/resources/mng-2878/pom.xml b/its/core-it-suite/src/test/resources/mng-2878/pom.xml
index e46f8ae44e..1fee750871 100644
--- a/its/core-it-suite/src/test/resources/mng-2878/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2878/pom.xml
@@ -26,11 +26,11 @@ under the License.
   test1
   1.0
 
-  Maven Integration Test :: MNG-2878 
+  Maven Integration Test :: MNG-2878
   
     Verify that a plugin can load default-report.xml from the core.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
index cb967d3931..e69f2af523 100644
--- a/its/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2883/dependency/pom.xml
@@ -5,7 +5,7 @@
   dependency-user
   jar
   1.0-SNAPSHOT
-  
+
   
     
       org.apache.maven.its.mng2883
@@ -13,7 +13,7 @@
       1.0-SNAPSHOT
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/poms/dep-1.0-SNAPSHOT.pom b/its/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/poms/dep-1.0-SNAPSHOT.pom
index 340a7bec67..e0a50fd9e2 100644
--- a/its/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/poms/dep-1.0-SNAPSHOT.pom
+++ b/its/core-it-suite/src/test/resources/mng-2883/dependency/repo/org.apache.maven.its.mng2883/poms/dep-1.0-SNAPSHOT.pom
@@ -5,7 +5,7 @@
   dep
   jar
   1.0-SNAPSHOT
-  
+
   
     
       junit
diff --git a/its/core-it-suite/src/test/resources/mng-2883/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-2883/parent/pom.xml
index f30ff4deba..dec9be6679 100644
--- a/its/core-it-suite/src/test/resources/mng-2883/parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2883/parent/pom.xml
@@ -1,13 +1,13 @@
 
   4.0.0
-  
+
   
     org.apache.maven.its.mng2883
     1.0-SNAPSHOT
     parent
   
-  
+
   snapshot-offline-parent-legacyRepo
 
 
diff --git a/its/core-it-suite/src/test/resources/mng-2883/parent/repo/org.apache.maven.its.mng2883/poms/parent-1.0-SNAPSHOT.pom b/its/core-it-suite/src/test/resources/mng-2883/parent/repo/org.apache.maven.its.mng2883/poms/parent-1.0-SNAPSHOT.pom
index 0d72387627..3ce2a2b1e9 100644
--- a/its/core-it-suite/src/test/resources/mng-2883/parent/repo/org.apache.maven.its.mng2883/poms/parent-1.0-SNAPSHOT.pom
+++ b/its/core-it-suite/src/test/resources/mng-2883/parent/repo/org.apache.maven.its.mng2883/poms/parent-1.0-SNAPSHOT.pom
@@ -1,11 +1,11 @@
 
   4.0.0
-  
+
   org.apache.maven.its.mng2883
   1.0-SNAPSHOT
   parent
-  
+
   pom
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/poms/plugin-1.0-SNAPSHOT.pom b/its/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/poms/plugin-1.0-SNAPSHOT.pom
index 0376a4ab30..1741e18ebc 100644
--- a/its/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/poms/plugin-1.0-SNAPSHOT.pom
+++ b/its/core-it-suite/src/test/resources/mng-2883/plugin/repo/org.apache.maven.its.mng2883/poms/plugin-1.0-SNAPSHOT.pom
@@ -5,7 +5,7 @@
   plugin
   jar
   1.0-SNAPSHOT
-  
+
   
     
       junit
diff --git a/its/core-it-suite/src/test/resources/mng-2892/pom.xml b/its/core-it-suite/src/test/resources/mng-2892/pom.xml
index 4b235a5d42..945529a43a 100644
--- a/its/core-it-suite/src/test/resources/mng-2892/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2892/pom.xml
@@ -26,11 +26,11 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-2892 
+  Maven Integration Test :: MNG-2892
   
     Verify that plugins can use their own version of plexus-utils and are not bound to the version bundled in the core.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
index 38dafd9c32..6c089ce3fb 100644
--- a/its/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-2921/consumer/pom.xml
@@ -31,7 +31,7 @@ under the License.
   consumer
   jar
 
-  Maven Integration Test :: MNG-2921 :: Dependency Consumer 
+  Maven Integration Test :: MNG-2921 :: Dependency Consumer
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-3099/settings-template.xml b/its/core-it-suite/src/test/resources/mng-3099/settings-template.xml
index d0340a4805..b6abadb641 100644
--- a/its/core-it-suite/src/test/resources/mng-3099/settings-template.xml
+++ b/its/core-it-suite/src/test/resources/mng-3099/settings-template.xml
@@ -1,9 +1,9 @@
 
-
-  
+
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml b/its/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml
index d066e756b8..57e1aad6a4 100644
--- a/its/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3401/without-mgmt/pom.xml
@@ -12,7 +12,7 @@
     Test that the configuration of an execution block with the id "default-cli" applies to direct CLI
     invocations of a goal as well.
   
-  
+
   
     
     
diff --git a/its/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
index 58136eeecb..dc741be236 100644
--- a/its/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3461/test-1/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-1
   0.1
 
-  Maven Integration Test :: MNG-3461 
+  Maven Integration Test :: MNG-3461
   
     Test that mirror definitions are properly evaluated. In particular, an exact match by id should always
     win over wildcard matches.
diff --git a/its/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml b/its/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml
index 77ac509acb..4bb6c5aaa6 100644
--- a/its/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3461/test-2/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-3
   0.1
 
-  Maven Integration Test :: MNG-3461 
+  Maven Integration Test :: MNG-3461
   
     Test that mirror definitions are properly evaluated. In particular, the wildcard external:* should not
     match file:// and localhost repos but only external repos.
diff --git a/its/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml b/its/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
index 2403c307d4..d8ba0c64e5 100644
--- a/its/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3461/test-3/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test-3
   0.1
 
-  Maven Integration Test :: MNG-3461 
+  Maven Integration Test :: MNG-3461
   
     Test that mirror definitions are properly evaluated. In particular, the wildcards within a single mirrorOf
     spec should not be greedy.
diff --git a/its/core-it-suite/src/test/resources/mng-3475/pom.xml b/its/core-it-suite/src/test/resources/mng-3475/pom.xml
index 7c5a2b2096..5e6d2688f7 100644
--- a/its/core-it-suite/src/test/resources/mng-3475/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3475/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-3475 
+  Maven Integration Test :: MNG-3475
   
     Verify that project directories are basedir aligned when queried by plugin parameter expressions.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3477/pom.xml b/its/core-it-suite/src/test/resources/mng-3477/pom.xml
index e3ee767702..37edc4cd4b 100644
--- a/its/core-it-suite/src/test/resources/mng-3477/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3477/pom.xml
@@ -27,7 +27,7 @@ under the License.
   jar
   1
 
-  Maven Integration Test :: MNG-3477 
+  Maven Integration Test :: MNG-3477
   
     Tests that dependency resolution errors tell the underlying transport issue.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3482/pom.xml b/its/core-it-suite/src/test/resources/mng-3482/pom.xml
index 482c1ac19d..0c6fc55cd6 100644
--- a/its/core-it-suite/src/test/resources/mng-3482/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3482/pom.xml
@@ -4,14 +4,14 @@
   mng-3482
   jar
   2
-  
+
   Integration Test Project for MNG-3482
   
     This project verifies that MNG-3482 is fixed. It is controlled by a JUnit test called org.apache.maven.it.MNG3482Test
   
-  
+
   https://issues.apache.org/jira/browse/MNG-3482
-  
+
   
     
       org.apache.maven.its.mng3482
diff --git a/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep/1/dep-1.pom b/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep/1/dep-1.pom
index 973bc02f3f..bad90fbe1d 100644
--- a/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep/1/dep-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep/1/dep-1.pom
@@ -3,7 +3,7 @@
   org.apache.maven.its.mng3482
   dep
   1
-  
+
   
     
       org.apache.maven.its.mng3482
diff --git a/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep2/1/dep2-1.pom b/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep2/1/dep2-1.pom
index 091ed2ac5c..ef1b7121c9 100644
--- a/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep2/1/dep2-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-3482/repo/org/apache/maven/its/mng3482/dep2/1/dep2-1.pom
@@ -3,5 +3,5 @@
   org.apache.maven.its.mng3482
   dep2
   1
-  
+
 
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-3485/src/main/java/org/apache/maven/its/mng3485/App.java b/its/core-it-suite/src/test/resources/mng-3485/src/main/java/org/apache/maven/its/mng3485/App.java
index faac444283..7ae62ede72 100644
--- a/its/core-it-suite/src/test/resources/mng-3485/src/main/java/org/apache/maven/its/mng3485/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3485/src/main/java/org/apache/maven/its/mng3485/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.its.mng3485;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java b/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java
index 6416ae8c17..03e13b2539 100644
--- a/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3485/src/test/java/org/apache/maven/its/mng3485/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3498/mng-3498-project/pom.xml b/its/core-it-suite/src/test/resources/mng-3498/mng-3498-project/pom.xml
index 4bd76aac9a..3f54243220 100644
--- a/its/core-it-suite/src/test/resources/mng-3498/mng-3498-project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3498/mng-3498-project/pom.xml
@@ -25,7 +25,7 @@ under the License.
   mng-3498-project
   jar
   1
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml
index be51cf6304..eb739074ba 100644
--- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/pom.xml
@@ -27,7 +27,7 @@ under the License.
     1
   
   mng-3506.1
-  
+
   
   coreit-1
 
diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java
index 2e519cba97..027cdbd617 100644
--- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/main/java/org/apache/maven/its/mng3506/App.java
@@ -22,7 +22,7 @@ package org.apache.maven.its.mng3506;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java
index 07b7f5f8ea..d2f3c7f838 100644
--- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.1/src/test/java/org/apache/maven/its/mng3506/AppTest.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml
index a59d0cda67..ee7f4b6a0b 100644
--- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/pom.xml
@@ -37,14 +37,14 @@ under the License.
       test
     
   
-  
+
   
     
       
         org.apache.maven.its.plugins
         maven-it-plugin-extension2
         2.1-SNAPSHOT
-        
+
         
         true
       
diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java
index 2e519cba97..027cdbd617 100644
--- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/main/java/org/apache/maven/its/mng3506/App.java
@@ -22,7 +22,7 @@ package org.apache.maven.its.mng3506;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java
index 07b7f5f8ea..d2f3c7f838 100644
--- a/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3506/mng-3506.2/src/test/java/org/apache/maven/its/mng3506/AppTest.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3506/pom.xml b/its/core-it-suite/src/test/resources/mng-3506/pom.xml
index 88d6bf9b96..2922c6c4b9 100644
--- a/its/core-it-suite/src/test/resources/mng-3506/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3506/pom.xml
@@ -28,14 +28,14 @@ under the License.
     mng-3506.1
     mng-3506.2
   
-  
+
   
     
       
         org.apache.maven.its.plugins
         maven-it-plugin-extension1
         2.1-SNAPSHOT
-        
+
         
         true
       
diff --git a/its/core-it-suite/src/test/resources/mng-3530/build-path/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3530/build-path/project/pom.xml
index e9d3e5d6fd..379d4b60b6 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/build-path/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3530/build-path/project/pom.xml
@@ -15,7 +15,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/main/java/tests/App.java b/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/main/java/tests/App.java
index 53e46ad9e0..b25f5c2b2e 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/main/java/tests/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/main/java/tests/App.java
@@ -4,7 +4,7 @@ package tests;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/test/java/tests/AppTest.java b/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/test/java/tests/AppTest.java
index c378ad2cd5..7bf277a3c7 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/test/java/tests/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3530/build-path/project/src/test/java/tests/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/pom.xml
index 7bb29c4763..fe119aefaa 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/pom.xml
@@ -15,11 +15,11 @@
       test
     
   
-  
+
   
     something
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/main/java/tests/App.java b/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/main/java/tests/App.java
index 53e46ad9e0..b25f5c2b2e 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/main/java/tests/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/main/java/tests/App.java
@@ -4,7 +4,7 @@ package tests;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/test/java/tests/AppTest.java b/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/test/java/tests/AppTest.java
index c378ad2cd5..7bf277a3c7 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/test/java/tests/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3530/pom-property/project/src/test/java/tests/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/pom.xml
index 29da1377dd..ac3620db27 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/pom.xml
@@ -15,11 +15,11 @@
       test
     
   
-  
+
   
     something
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/main/java/tests/App.java b/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/main/java/tests/App.java
index 53e46ad9e0..b25f5c2b2e 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/main/java/tests/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/main/java/tests/App.java
@@ -4,7 +4,7 @@ package tests;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/test/java/tests/AppTest.java b/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/test/java/tests/AppTest.java
index c378ad2cd5..7bf277a3c7 100644
--- a/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/test/java/tests/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3530/resource-object/project/src/test/java/tests/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java b/its/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
index ef3b37f139..4b1ffcedea 100644
--- a/its/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
+++ b/its/core-it-suite/src/test/resources/mng-3536/plugin/src/main/java/plugin/Mojo3563.java
@@ -45,18 +45,18 @@ public class Mojo3563
             throw new MojoExecutionException("Test file does not exist: File = " + testFile.getAbsolutePath() + "Property = " + property);
         }
         getLog().info("Property = " + property);
-        
+
         File f = new File( project.getBuild().getOutputDirectory(), "foo.txt" );
         getLog().info( "Creating test file using project.getBuild().getDirectory(): " + f );
-        
+
         String testValue = "" + System.currentTimeMillis();
-        
+
         FileWriter w = null;
         try
         {
             f.getParentFile().mkdirs();
             w = new FileWriter( f );
-            
+
             w.write( testValue );
         }
         catch ( IOException e )
@@ -67,7 +67,7 @@ public class Mojo3563
         {
             IOUtil.close( w );
         }
-        
+
         getLog().info( "Attempting to read test file using path from plugin parameter: " + foo );
         BufferedReader r = null;
         try
diff --git a/its/core-it-suite/src/test/resources/mng-3575/pom.xml b/its/core-it-suite/src/test/resources/mng-3575/pom.xml
index 81bb82d7d9..6241a566f2 100644
--- a/its/core-it-suite/src/test/resources/mng-3575/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3575/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-3575 
+  Maven Integration Test :: MNG-3575
   
     Verify that numeric plugin parameters can be configured using hexadecimal/octal notation.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3586/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-3586/test-1/pom.xml
index 42d15befde..7daaa68a20 100644
--- a/its/core-it-suite/src/test/resources/mng-3586/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3586/test-1/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test1
   1.0
 
-  Maven Integration Test :: MNG-3586 
+  Maven Integration Test :: MNG-3586
   
     Test that plugin dependencies with scope system are part of the plugin class realm.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3586/test-2/pom.xml b/its/core-it-suite/src/test/resources/mng-3586/test-2/pom.xml
index 8c4303549c..89c4af6e9e 100644
--- a/its/core-it-suite/src/test/resources/mng-3586/test-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3586/test-2/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test2
   1.0
 
-  Maven Integration Test :: MNG-3586 
+  Maven Integration Test :: MNG-3586
   
     Test that plugin dependencies with scope system are part of the plugin class realm.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3607/pom.xml b/its/core-it-suite/src/test/resources/mng-3607/pom.xml
index 3b4011477c..2018a3bbf8 100644
--- a/its/core-it-suite/src/test/resources/mng-3607/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3607/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-3607 
+  Maven Integration Test :: MNG-3607
   
     Test that class loaders created by Maven employ valid URLs, e.g. properly encode characters like spaces.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3641/child1/pom.xml b/its/core-it-suite/src/test/resources/mng-3641/child1/pom.xml
index 06c8a24c1c..9bdc10aafe 100644
--- a/its/core-it-suite/src/test/resources/mng-3641/child1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3641/child1/pom.xml
@@ -36,5 +36,5 @@ under the License.
     
       mng-3641-it-provided-profile-child
     
-    
+  
 
diff --git a/its/core-it-suite/src/test/resources/mng-3641/pom.xml b/its/core-it-suite/src/test/resources/mng-3641/pom.xml
index 9c84c2a480..b98c7ec89f 100644
--- a/its/core-it-suite/src/test/resources/mng-3641/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3641/pom.xml
@@ -33,7 +33,7 @@ under the License.
     
       mng-3641-it-provided-profile
     
-    
+  
 
   
     child1
diff --git a/its/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java b/its/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
index 684ff72374..6b649504f7 100644
--- a/its/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3652/test-plugin/src/main/java/org/apache/maven/its/mng3652/MyMojo.java
@@ -29,64 +29,64 @@ import org.codehaus.plexus.util.IOUtil;
  * a file in the output directory, for comparison in the unit tests assertions.
  *
  * @goal touch
- * 
+ *
  * @phase validate
  */
 public class MyMojo
     extends AbstractMojo
 {
-    
+
     private static final String LS = System.getProperty( "line.separator" );
-    
+
     /**
      * @parameter default-value="${project.build.directory}/touch.txt"
      */
     private File touchFile;
-    
+
     /**
      * @component
      */
     private ArtifactResolver resolver;
-    
+
     /**
      * @component
      */
     private ArtifactFactory artifactFactory;
-    
+
     /**
      * @component
      */
     private ArtifactRepositoryFactory repositoryFactory;
-    
+
     /**
      * @component
      */
     private ArtifactRepositoryLayout layout;
-    
+
     /**
      * @component
      */
     private RuntimeInformation runtimeInformation;
-    
+
     /**
      * @parameter expression="${testProtocol}" default-value="http"
      * @required
      */
     private String testProtocol;
-    
+
     /**
      * @parameter expression="${testPort}"
      * @required
      */
     private String testPort;
-    
+
     /**
      * @parameter default-value="${project.build.directory}/local-repo"
      * @required
      * @readonly
      */
     private File localRepoDir;
-    
+
     public void execute()
         throws MojoExecutionException
     {
@@ -98,7 +98,7 @@ public class MyMojo
         ArtifactRepository remote =
             repositoryFactory.createArtifactRepository( "test", testProtocol + "://localhost:" + testPort, layout,
                                                         policy, policy );
-        
+
         Artifact artifact = artifactFactory.createArtifact( "bad.group", "missing-artifact", "1", null, "jar" );
 
         try
@@ -108,7 +108,7 @@ public class MyMojo
             ArtifactRepository local =
                 repositoryFactory.createArtifactRepository( "local", localRepoDir.toURL().toExternalForm(), layout,
                                                             null, null );
-        
+
             getLog().info( "Retrieving " + artifact + " from " + remote + " to " + local );
 
             resolver.resolveAlways( artifact, Collections.singletonList( remote ), local );
@@ -132,7 +132,7 @@ public class MyMojo
         {
             throw new MojoExecutionException( e.getMessage(), e );
         }
-        
+
         String artifactVersion;
         InputStream resourceAsStream = null;
         try
@@ -159,13 +159,13 @@ public class MyMojo
         {
             IOUtil.close( resourceAsStream );
         }
-        
+
         FileWriter w = null;
         try
         {
             touchFile.getParentFile().mkdirs();
             w = new FileWriter( touchFile );
-            
+
             w.write( runtimeInformation.getApplicationVersion().toString() );
             w.write( LS );
             w.write( System.getProperty( "java.version" ) );
diff --git a/its/core-it-suite/src/test/resources/mng-3652/test-project/settings-no-config.xml b/its/core-it-suite/src/test/resources/mng-3652/test-project/settings-no-config.xml
index ef29ddc0e9..18b0e4050c 100644
--- a/its/core-it-suite/src/test/resources/mng-3652/test-project/settings-no-config.xml
+++ b/its/core-it-suite/src/test/resources/mng-3652/test-project/settings-no-config.xml
@@ -8,4 +8,4 @@
     
   
 
- 
+
diff --git a/its/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml b/its/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml
index bb720a4b89..fe28b647b0 100644
--- a/its/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml
+++ b/its/core-it-suite/src/test/resources/mng-3652/test-project/settings.xml
@@ -17,4 +17,4 @@
     
   
 
- 
+
diff --git a/its/core-it-suite/src/test/resources/mng-3671/pom.xml b/its/core-it-suite/src/test/resources/mng-3671/pom.xml
index df948ca4dc..b9dafc4496 100644
--- a/its/core-it-suite/src/test/resources/mng-3671/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3671/pom.xml
@@ -14,7 +14,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3671/src/main/java/testing/App.java b/its/core-it-suite/src/test/resources/mng-3671/src/main/java/testing/App.java
index 217a19b5d0..65ade62846 100644
--- a/its/core-it-suite/src/test/resources/mng-3671/src/main/java/testing/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3671/src/main/java/testing/App.java
@@ -4,7 +4,7 @@ package testing;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java b/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java
index 3a8780ff89..d9c8ff0f94 100644
--- a/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3671/src/test/java/testing/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3680/pom.xml b/its/core-it-suite/src/test/resources/mng-3680/pom.xml
index 2387558747..49d876420c 100644
--- a/its/core-it-suite/src/test/resources/mng-3680/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3680/pom.xml
@@ -7,7 +7,7 @@
   jar
   1
 
-  Maven Integration Test :: MNG-3680 
+  Maven Integration Test :: MNG-3680
   
     Verify that dependencies with invalid POMs can still be used without failing the build.
   
@@ -20,7 +20,7 @@
       0.1
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java
index 27a11cbca1..5a5977a684 100644
--- a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyMojo.java
@@ -55,16 +55,16 @@ public class MyMojo
         Map failedComparisons = new HashMap();
 
         check( "project.build.directory", projectBuild.getDirectory(), build.getDirectory(), failedComparisons );
-        
+
         check( "project.build.outputDirectory", projectBuild.getOutputDirectory(), build.getOutputDirectory(),
                failedComparisons );
-        
+
         check( "project.build.sourceDirectory", projectBuild.getSourceDirectory(), build.getSourceDirectory(),
                failedComparisons );
-        
+
         check( "project.build.testSourceDirectory", projectBuild.getTestSourceDirectory(),
                build.getTestSourceDirectory(), failedComparisons );
-        
+
         check( "project.build.scriptSourceDirectory", projectBuild.getScriptSourceDirectory(),
                build.getScriptSourceDirectory(), failedComparisons );
 
@@ -80,7 +80,7 @@ public class MyMojo
 
                 check( "project.build.resources[" + i + "].directory", projectRes.getDirectory(),
                        buildRes.getDirectory(), failedComparisons );
-                
+
                 check( "project.build.resources[" + i + "].targetPath", projectRes.getTargetPath(),
                        buildRes.getTargetPath(), failedComparisons );
             }
@@ -103,7 +103,7 @@ public class MyMojo
                 buffer.append( "\n\tShould be: \'" ).append( value[0] );
                 buffer.append( "\'\n\t Was: \'" ).append( value[1] ).append( "\'\n" );
             }
-            
+
             throw new MojoExecutionException( buffer.toString() );
         }
     }
diff --git a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java
index 0fc758894a..ea6ccf121d 100644
--- a/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java
+++ b/its/core-it-suite/src/test/resources/mng-3684/maven-mng3684-plugin/src/main/java/plugin/MyReport.java
@@ -57,16 +57,16 @@ public class MyReport
         Map failedComparisons = new HashMap();
 
         check( "project.build.directory", projectBuild.getDirectory(), build.getDirectory(), failedComparisons );
-        
+
         check( "project.build.outputDirectory", projectBuild.getOutputDirectory(), build.getOutputDirectory(),
                failedComparisons );
-        
+
         check( "project.build.sourceDirectory", projectBuild.getSourceDirectory(), build.getSourceDirectory(),
                failedComparisons );
-        
+
         check( "project.build.testSourceDirectory", projectBuild.getTestSourceDirectory(),
                build.getTestSourceDirectory(), failedComparisons );
-        
+
         check( "project.build.scriptSourceDirectory", projectBuild.getScriptSourceDirectory(),
                build.getScriptSourceDirectory(), failedComparisons );
 
@@ -82,7 +82,7 @@ public class MyReport
 
                 check( "project.build.resources[" + i + "].directory", projectRes.getDirectory(),
                        buildRes.getDirectory(), failedComparisons );
-                
+
                 check( "project.build.resources[" + i + "].targetPath", projectRes.getTargetPath(),
                        buildRes.getTargetPath(), failedComparisons );
             }
@@ -105,7 +105,7 @@ public class MyReport
                 buffer.append( "\n\tShould be: \'" ).append( value[0] );
                 buffer.append( "\'\n\t Was: \'" ).append( value[1] ).append( "\'\n" );
             }
-            
+
             throw new MavenReportException( buffer.toString() );
         }
     }
diff --git a/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml
index d62c49b367..c836081dc0 100644
--- a/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3684/project/pom.xml
@@ -5,7 +5,7 @@
   mng3684-project
   jar
   1
-  
+
   
     
       
@@ -32,7 +32,7 @@
       
     
   
-  
+
   
     true
     
diff --git a/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java b/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
index eb2f6e9a6f..4ddca61ec7 100644
--- a/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3693/maven-mng3693-plugin/src/main/java/plugin/MyMojo.java
@@ -41,10 +41,10 @@ public class MyMojo
         throws MojoExecutionException
     {
         File pomFile = project.getFile();
-        
+
         File movedPomFile = new File( project.getBuild().getDirectory(), "pom.xml" );
         movedPomFile.getParentFile().mkdirs();
-        
+
         try
         {
             FileUtils.copyFile( pomFile, movedPomFile );
@@ -53,7 +53,7 @@ public class MyMojo
         {
             throw new MojoExecutionException( "Failed to copy pom file: " + pomFile + " to: " + movedPomFile, e );
         }
-        
+
         project.setFile( movedPomFile );
     }
 }
diff --git a/its/core-it-suite/src/test/resources/mng-3693/projects/app/src/main/java/tests/app/App.java b/its/core-it-suite/src/test/resources/mng-3693/projects/app/src/main/java/tests/app/App.java
index 6c2b4490bb..292f49b01e 100644
--- a/its/core-it-suite/src/test/resources/mng-3693/projects/app/src/main/java/tests/app/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3693/projects/app/src/main/java/tests/app/App.java
@@ -6,7 +6,7 @@ import tests.dep.Dep;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml b/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml
index 311efa9e29..c9fc72f5a7 100644
--- a/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3693/projects/dep/pom.xml
@@ -15,7 +15,7 @@
         org.apache.maven.its.mng3693
         mavenit-mng3693-plugin
         1
-        
+
         
           
             move-pom
diff --git a/its/core-it-suite/src/test/resources/mng-3693/projects/dep/src/main/java/tests/dep/Dep.java b/its/core-it-suite/src/test/resources/mng-3693/projects/dep/src/main/java/tests/dep/Dep.java
index 7ccec18f08..94baa54685 100644
--- a/its/core-it-suite/src/test/resources/mng-3693/projects/dep/src/main/java/tests/dep/Dep.java
+++ b/its/core-it-suite/src/test/resources/mng-3693/projects/dep/src/main/java/tests/dep/Dep.java
@@ -4,7 +4,7 @@ package tests.dep;
  * Hello world!
  *
  */
-public class Dep 
+public class Dep
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
index 3c5c02db9c..250f37caa3 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3694/maven-mng3694-plugin/src/main/java/plugin/MyMojo.java
@@ -55,15 +55,15 @@ public class MyMojo
         for ( Iterator it = reactorProjects.iterator(); it.hasNext(); )
         {
             MavenProject project = (MavenProject) it.next();
-            
+
             String basedir = project.getBasedir().getAbsolutePath();
             List compileSourceRoots = project.getCompileSourceRoots();
-            
+
             System.out.println( " Compile-source roots for project: " + project + " are: " + project.getCompileSourceRoots() );
             for ( Iterator srcIt = compileSourceRoots.iterator(); srcIt.hasNext(); )
             {
                 String srcRoot = (String) srcIt.next();
-                
+
                 if ( !srcRoot.startsWith( basedir ) )
                 {
                     throw new MojoExecutionException( "Source root: " + srcRoot + " doesn't begin with project basedir: " + basedir );
diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/main/java/tests/App.java b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/main/java/tests/App.java
index 53e46ad9e0..b25f5c2b2e 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/main/java/tests/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/main/java/tests/App.java
@@ -4,7 +4,7 @@ package tests;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java
index c378ad2cd5..7bf277a3c7 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3694/projects/not-used/src/test/java/tests/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml
index ae306c6144..3966468d71 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3694/projects/project/pom.xml
@@ -14,7 +14,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/main/java/tests/App.java b/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/main/java/tests/App.java
index 53e46ad9e0..b25f5c2b2e 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/main/java/tests/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/main/java/tests/App.java
@@ -4,7 +4,7 @@ package tests;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java b/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java
index c378ad2cd5..7bf277a3c7 100644
--- a/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-3694/projects/project/src/test/java/tests/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-3701/pom.xml b/its/core-it-suite/src/test/resources/mng-3701/pom.xml
index a8a5ea0a27..d8dad0f695 100644
--- a/its/core-it-suite/src/test/resources/mng-3701/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3701/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-3701 
+  Maven Integration Test :: MNG-3701
   
     Verify that profiles without explicit id get a default id and in particular don't cause NPEs when
     they are active by default.
diff --git a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
index 8937ea6b10..e2b9a86aed 100644
--- a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/AbstractCheckMojo.java
@@ -28,16 +28,16 @@ import org.apache.maven.project.MavenProject;
 public abstract class AbstractCheckMojo
     extends AbstractMojo
 {
-    
+
     protected static boolean forkHasRun = false;
-    
+
     /**
      * @parameter default-value="${project}"
      * @required
      * @readonly
      */
     private MavenProject project;
-    
+
     /**
      * @parameter default-value="${executedProject}"
      * @required
@@ -52,23 +52,23 @@ public abstract class AbstractCheckMojo
         {
             throw new MojoExecutionException( "Basedir is null on the main project instance." );
         }
-        
+
         if ( getTestProject().getBasedir() == null )
         {
             throw new MojoExecutionException( "Basedir is null on the " + getTestProjectLabel() + " instance (during mojo execution)." );
         }
-        
+
         String executionBasedir = getTestProject().getBasedir().getAbsolutePath();
-        
+
         Map failedPaths = new LinkedHashMap();
-        
+
         checkListOfPaths( getTestProject().getCompileSourceRoots(), executionBasedir, "compileSourceRoots", failedPaths );
         checkListOfPaths( getTestProject().getTestCompileSourceRoots(), executionBasedir, "testCompileSourceRoots", failedPaths );
 
         // MNG-3741: Don't worry about relative paths in scriptSourceRoots.
         // checkListOfPaths( getTestProject().getScriptSourceRoots(), executionBasedir, "scriptSourceRoots", failedPaths );
-        
-        
+
+
         if ( !failedPaths.isEmpty() )
         {
             StringBuffer buffer = new StringBuffer();
@@ -76,28 +76,28 @@ public abstract class AbstractCheckMojo
             for ( Iterator it = failedPaths.entrySet().iterator(); it.hasNext(); )
             {
                 Map.Entry entry = (Map.Entry) it.next();
-                
+
                 buffer.append( "\n-  " ).append( entry.getKey() ).append( ": '" ).append( entry.getValue() ).append( "'" );
             }
-            
+
             throw new MojoExecutionException( buffer.toString() );
         }
-        
+
         forkHasRun = true;
     }
-    
+
     protected MavenProject getMainProject()
     {
         return project;
     }
-    
+
     protected MavenProject getExecutionProject()
     {
         return executionProject;
     }
-    
+
     protected abstract MavenProject getTestProject();
-    
+
     protected abstract String getTestProjectLabel();
 
     private void checkListOfPaths( List paths, String base, String label, Map failedPaths )
diff --git a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
index a81f6f6ec5..9db0c2ba52 100644
--- a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/CheckMojo.java
@@ -25,12 +25,12 @@ import org.apache.maven.project.MavenProject;
 public class CheckMojo
     extends AbstractCheckMojo
 {
-    
+
     protected MavenProject getTestProject()
     {
         return getExecutionProject();
     }
-    
+
     protected String getTestProjectLabel()
     {
         return "forked project";
diff --git a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java
index a4107e3bad..180f0ebd59 100644
--- a/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3703/maven-mng3703-plugin/src/main/java/jar/RunMojo.java
@@ -26,7 +26,7 @@ import org.apache.maven.project.MavenProject;
 public class RunMojo
     extends AbstractCheckMojo
 {
-    
+
     public void execute()
         throws MojoExecutionException
     {
@@ -35,7 +35,7 @@ public class RunMojo
             getLog().info( "Not running inside a forked execution; skipping this mojo's execution." );
             return;
         }
-        
+
         super.execute();
     }
 
@@ -48,6 +48,6 @@ public class RunMojo
     {
         return "main-project";
     }
-    
-    
+
+
 }
diff --git a/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml b/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml
index d5490aa592..fde24d1682 100644
--- a/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3703/project/pom.xml
@@ -13,7 +13,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3703/project/src/main/java/jar/App.java b/its/core-it-suite/src/test/resources/mng-3703/project/src/main/java/jar/App.java
index 9772ca4786..ab568abea2 100644
--- a/its/core-it-suite/src/test/resources/mng-3703/project/src/main/java/jar/App.java
+++ b/its/core-it-suite/src/test/resources/mng-3703/project/src/main/java/jar/App.java
@@ -4,7 +4,7 @@ package jar;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/java/org/apache/maven/lifecycle/MyMojo.java b/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/java/org/apache/maven/lifecycle/MyMojo.java
index 93e49ffd43..d70821f2b2 100644
--- a/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/java/org/apache/maven/lifecycle/MyMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/java/org/apache/maven/lifecycle/MyMojo.java
@@ -39,7 +39,7 @@ import org.codehaus.plexus.util.dag.CycleDetectedException;
 /**
  * Tests that the lifecycle executor with the out-of-date component configuration (missing some new component
  * requirements) will still work...
- * 
+ *
  * @goal run
  * @phase validate
  */
@@ -91,7 +91,7 @@ public class MyMojo
 
         List tasks = new ArrayList();
         tasks.add( "compile" );
-        
+
         ReactorManager rm;
         try
         {
@@ -105,7 +105,7 @@ public class MyMojo
         {
             throw new MojoExecutionException( "Failed to construct ReactorManager instance prior to lifecycle execution.", e );
         }
-        
+
         MavenSession s =
             new MavenSession( session.getContainer(), session.getSettings(), session.getLocalRepository(),
                               new DefaultEventDispatcher(), rm, tasks, session.getExecutionRootDirectory(),
diff --git a/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/resources/META-INF/plexus/components.xml b/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/resources/META-INF/plexus/components.xml
index ef24167965..dc9322dea1 100644
--- a/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-suite/src/test/resources/mng-3704/maven-mng3704-plugin/src/main/resources/META-INF/plexus/components.xml
@@ -14,7 +14,7 @@
         
           org.apache.maven.artifact.handler.manager.ArtifactHandlerManager
         
-        
     relative
diff --git a/its/core-it-suite/src/test/resources/mng-3748/pom.xml b/its/core-it-suite/src/test/resources/mng-3748/pom.xml
index b249098aea..f875e327a9 100644
--- a/its/core-it-suite/src/test/resources/mng-3748/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3748/pom.xml
@@ -4,11 +4,11 @@
   mng-3748
   pom
   1
-  
+
   Integration Test Project for MNG-3748
   
     This project verifies that MNG-3748 is fixed. It is controlled by a JUnit test called org.apache.maven.integrationtests.MNG3748Test
   
-  
+
   https://issues.apache.org/jira/browse/MNG-3748
 
diff --git a/its/core-it-suite/src/test/resources/mng-3760/pom.xml b/its/core-it-suite/src/test/resources/mng-3760/pom.xml
index 6adb554e92..4e8ef4d2bc 100644
--- a/its/core-it-suite/src/test/resources/mng-3760/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3760/pom.xml
@@ -26,7 +26,7 @@ under the License.
   child
   0.1
 
-  Maven Integration Test :: MNG-3760 
+  Maven Integration Test :: MNG-3760
   
     Test project.baseUri property.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3766/pom.xml b/its/core-it-suite/src/test/resources/mng-3766/pom.xml
index e9219ba4c8..cf1686cc7d 100644
--- a/its/core-it-suite/src/test/resources/mng-3766/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3766/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-3766 
+  Maven Integration Test :: MNG-3766
   
     Test toolchain discovery from build extensions.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3769/pom.xml b/its/core-it-suite/src/test/resources/mng-3769/pom.xml
index c2eca8af22..a42e2acbac 100644
--- a/its/core-it-suite/src/test/resources/mng-3769/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3769/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-3769 
+  Maven Integration Test :: MNG-3769
   
     Verify that dependency resolution considers dependency management also for relocated artifacts.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3796/pom.xml b/its/core-it-suite/src/test/resources/mng-3796/pom.xml
index 1a088e3c9c..3740a5255f 100644
--- a/its/core-it-suite/src/test/resources/mng-3796/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3796/pom.xml
@@ -26,11 +26,11 @@ under the License.
   project
   1.0
 
-  Maven Integration Test :: MNG-3796 
+  Maven Integration Test :: MNG-3796
   
     Verify that classes shared with the Maven core realm are properly imported into the plugin realm.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-3805/pom.xml b/its/core-it-suite/src/test/resources/mng-3805/pom.xml
index 22dcd1302c..68c6f954b5 100644
--- a/its/core-it-suite/src/test/resources/mng-3805/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3805/pom.xml
@@ -26,12 +26,12 @@ under the License.
   project
   1.0
 
-  Maven Integration Test :: MNG-3805 
+  Maven Integration Test :: MNG-3805
   
     Verify that the extension manager respects the ordering of the extension's dependencies when setting up the
     class realm.
   
-  
+
   
     
       
 
@@ -91,7 +91,7 @@ under the License.
       maven-core-it-a
     
 
-    
 
diff --git a/its/core-it-suite/src/test/resources/mng-3979/pom.xml b/its/core-it-suite/src/test/resources/mng-3979/pom.xml
index ed95efb09d..4db43cd413 100644
--- a/its/core-it-suite/src/test/resources/mng-3979/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3979/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-3979 
+  Maven Integration Test :: MNG-3979
   
     Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
     POM has a non-empty element and the child POM has an empty element to join.
diff --git a/its/core-it-suite/src/test/resources/mng-3979/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-3979/sub/pom.xml
index d6e261bab3..42e74479a7 100644
--- a/its/core-it-suite/src/test/resources/mng-3979/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3979/sub/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   child
 
-  Maven Integration Test :: MNG-3979 
+  Maven Integration Test :: MNG-3979
   
     Test that during inheritance the merging/joining of sub trees with equal identifier doesn't crash if the parent
     POM has a non-empty element and the child POM has an empty element to join.
diff --git a/its/core-it-suite/src/test/resources/mng-3983/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-3983/test-1/pom.xml
index 09c1020be5..743a612bfc 100644
--- a/its/core-it-suite/src/test/resources/mng-3983/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3983/test-1/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.1
 
-  Maven Integration Test :: MNG-3983 
+  Maven Integration Test :: MNG-3983
   
     Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in the POM.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3983/test-2/pom.xml b/its/core-it-suite/src/test/resources/mng-3983/test-2/pom.xml
index c770269a4e..3af19be043 100644
--- a/its/core-it-suite/src/test/resources/mng-3983/test-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3983/test-2/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.2
 
-  Maven Integration Test :: MNG-3983 
+  Maven Integration Test :: MNG-3983
   
     Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in profiles.xml.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3983/test-3/pom.xml b/its/core-it-suite/src/test/resources/mng-3983/test-3/pom.xml
index e811b1ea51..759300eca0 100644
--- a/its/core-it-suite/src/test/resources/mng-3983/test-3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3983/test-3/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.3
 
-  Maven Integration Test :: MNG-3983 
+  Maven Integration Test :: MNG-3983
   
     Test that plugins can be resolved from remote plugin repositories defined by (active) profiles in settings.xml.
   
diff --git a/its/core-it-suite/src/test/resources/mng-3998/pom.xml b/its/core-it-suite/src/test/resources/mng-3998/pom.xml
index a0d1f85c9d..ffb5f31279 100644
--- a/its/core-it-suite/src/test/resources/mng-3998/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-3998/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.1
 
-  Maven Integration Test :: MNG-3998 
+  Maven Integration Test :: MNG-3998
   
     Test that multiple plugin executions do not lose their configuration when plugin management is used.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4000/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-4000/test-1/pom.xml
index 9fcf91b16d..7910084f74 100644
--- a/its/core-it-suite/src/test/resources/mng-4000/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4000/test-1/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test1
   0.1
 
-  Maven Integration Test :: MNG-4000 
+  Maven Integration Test :: MNG-4000
   
     Test that plugin executions without id are not lost among other plugin executions.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4000/test-2/pom.xml b/its/core-it-suite/src/test/resources/mng-4000/test-2/pom.xml
index 4cbab22e5b..fbae181f66 100644
--- a/its/core-it-suite/src/test/resources/mng-4000/test-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4000/test-2/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test2
   0.1
 
-  Maven Integration Test :: MNG-4000 
+  Maven Integration Test :: MNG-4000
   
     Test that plugin executions without id are not lost among other plugin executions.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4007/pom.xml b/its/core-it-suite/src/test/resources/mng-4007/pom.xml
index fb82f294e6..8eff462284 100644
--- a/its/core-it-suite/src/test/resources/mng-4007/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4007/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4007 
+  Maven Integration Test :: MNG-4007
   
     Verify that paths to project directories use the platform-specific file separator.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4008/pom.xml b/its/core-it-suite/src/test/resources/mng-4008/pom.xml
index bd15b7774f..6f4df9acd8 100644
--- a/its/core-it-suite/src/test/resources/mng-4008/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4008/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-4008 
+  Maven Integration Test :: MNG-4008
   
     Verify that filter definitions are properly merged.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4008/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-4008/sub/pom.xml
index 7d11e4f132..12310c539d 100644
--- a/its/core-it-suite/src/test/resources/mng-4008/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4008/sub/pom.xml
@@ -33,7 +33,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4008 
+  Maven Integration Test :: MNG-4008
   
     Verify that filter definitions are properly merged.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4009/pom.xml b/its/core-it-suite/src/test/resources/mng-4009/pom.xml
index 225622d7d7..a68d8afcec 100644
--- a/its/core-it-suite/src/test/resources/mng-4009/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4009/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-4009 
+  Maven Integration Test :: MNG-4009
   
     Verify that the effects of profiles on a parent are inherited by children.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4009/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-4009/sub/pom.xml
index b4422d0bd9..33ccd8534d 100644
--- a/its/core-it-suite/src/test/resources/mng-4009/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4009/sub/pom.xml
@@ -33,7 +33,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4009 
+  Maven Integration Test :: MNG-4009
   
     Verify that the effects of profiles on a parent are inherited by children.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4016/pom.xml b/its/core-it-suite/src/test/resources/mng-4016/pom.xml
index 28f84d27c3..8bcb27d05c 100644
--- a/its/core-it-suite/src/test/resources/mng-4016/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4016/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-4016 
+  Maven Integration Test :: MNG-4016
   
     Test that expressions with the special prefixes "project.", "pom." and "env." can be interpolated from
     properties that include the prefix.
diff --git a/its/core-it-suite/src/test/resources/mng-4022/pom.xml b/its/core-it-suite/src/test/resources/mng-4022/pom.xml
index 86c7e1201a..e604556e47 100644
--- a/its/core-it-suite/src/test/resources/mng-4022/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4022/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-4022 
+  Maven Integration Test :: MNG-4022
   
     Test that merging of equal plugin configuration is idempotent. This is especially interesting for lists with
     empty elements.
diff --git a/its/core-it-suite/src/test/resources/mng-4023/pom.xml b/its/core-it-suite/src/test/resources/mng-4023/pom.xml
index 5dbac6ab5c..96b8de43f5 100644
--- a/its/core-it-suite/src/test/resources/mng-4023/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4023/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-4023 
+  Maven Integration Test :: MNG-4023
   
     Verify that profiles in a parent are only injected once during a reactor build that include the parent
     itself. The parent being part of the reactor makes it subject to project caching and proper use of the
diff --git a/its/core-it-suite/src/test/resources/mng-4023/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-4023/sub/pom.xml
index 6a1690a495..01cf1206ff 100644
--- a/its/core-it-suite/src/test/resources/mng-4023/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4023/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
   child
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4023 
+  Maven Integration Test :: MNG-4023
   
     Verify that profiles in a parent are only injected once during a reactor build that include the parent
     itself. The parent being part of the reactor makes it subject to project caching and proper use of the
diff --git a/its/core-it-suite/src/test/resources/mng-4034/pom.xml b/its/core-it-suite/src/test/resources/mng-4034/pom.xml
index b3305c76bd..88c9813af9 100644
--- a/its/core-it-suite/src/test/resources/mng-4034/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4034/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-4034 
+  Maven Integration Test :: MNG-4034
   
     Verify that dependencies defined in profiles are subject to the dependency management of the parent.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4034/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-4034/sub/pom.xml
index 219597e180..a77069ba8d 100644
--- a/its/core-it-suite/src/test/resources/mng-4034/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4034/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
   child
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4034 
+  Maven Integration Test :: MNG-4034
   
     Verify that dependencies defined in profiles are subject to the dependency management of the parent.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4040/pom.xml b/its/core-it-suite/src/test/resources/mng-4040/pom.xml
index 6bff784a9d..116bc6f3c5 100644
--- a/its/core-it-suite/src/test/resources/mng-4040/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4040/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-4040 
+  Maven Integration Test :: MNG-4040
   
     Verify that modules inside profiles are not accidentally inherited by the children.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4040/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-4040/sub/pom.xml
index 7c4c670af6..acfdd2b618 100644
--- a/its/core-it-suite/src/test/resources/mng-4040/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4040/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
   child
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4040 
+  Maven Integration Test :: MNG-4040
   
     Verify that modules inside profiles are not accidentally inherited by the children.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4048/pom.xml b/its/core-it-suite/src/test/resources/mng-4048/pom.xml
index 112d145c2c..da2f676262 100644
--- a/its/core-it-suite/src/test/resources/mng-4048/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4048/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-4048 
+  Maven Integration Test :: MNG-4048
   
     Verify that dependencies using version ranges can be resolved from the reactor.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4048/sub-1/pom.xml b/its/core-it-suite/src/test/resources/mng-4048/sub-1/pom.xml
index 9280d15ffc..10ebaf29b6 100644
--- a/its/core-it-suite/src/test/resources/mng-4048/sub-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4048/sub-1/pom.xml
@@ -32,7 +32,7 @@ under the License.
   sub-1
   1.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-4048 
+  Maven Integration Test :: MNG-4048
   
     Verify that dependencies using version ranges can be resolved from the reactor.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml b/its/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml
index 4695fc7193..29e3e22fb4 100644
--- a/its/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4048/sub-2/pom.xml
@@ -32,7 +32,7 @@ under the License.
   sub-2
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4048 
+  Maven Integration Test :: MNG-4048
   
     Verify that dependencies using version ranges can be resolved from the reactor.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4053/test-1/pom.xml b/its/core-it-suite/src/test/resources/mng-4053/test-1/pom.xml
index 628fe09f82..373a66d7fb 100644
--- a/its/core-it-suite/src/test/resources/mng-4053/test-1/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4053/test-1/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test1
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4053 
+  Maven Integration Test :: MNG-4053
   
     Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
     no plugin management is used.
diff --git a/its/core-it-suite/src/test/resources/mng-4053/test-2/pom.xml b/its/core-it-suite/src/test/resources/mng-4053/test-2/pom.xml
index 404fc2aeae..a16f60d100 100644
--- a/its/core-it-suite/src/test/resources/mng-4053/test-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4053/test-2/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test2
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4053 
+  Maven Integration Test :: MNG-4053
   
     Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
     plugin management is used.
diff --git a/its/core-it-suite/src/test/resources/mng-4053/test-3/pom.xml b/its/core-it-suite/src/test/resources/mng-4053/test-3/pom.xml
index 7b9edcd0ee..0d957aadf6 100644
--- a/its/core-it-suite/src/test/resources/mng-4053/test-3/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4053/test-3/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test3
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4053 
+  Maven Integration Test :: MNG-4053
   
     Verify that attributes in plugin configuration elements are not erroneously duplicated to other elements when
     plugin management and a profile are used.
diff --git a/its/core-it-suite/src/test/resources/mng-4068/pom.xml b/its/core-it-suite/src/test/resources/mng-4068/pom.xml
index 3874d95e80..6b49621693 100644
--- a/its/core-it-suite/src/test/resources/mng-4068/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4068/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4068 
+  Maven Integration Test :: MNG-4068
   
     Test that downloading of release/snapshot artifacts from an authenticated mirror works. This basically
     boils down to using the proper id for the mirrored repository when looking up the credentials.
diff --git a/its/core-it-suite/src/test/resources/mng-4070/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-4070/sub/pom.xml
index 8953cc1489..1a5cc83a36 100644
--- a/its/core-it-suite/src/test/resources/mng-4070/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4070/sub/pom.xml
@@ -33,7 +33,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4070 :: Child 
+  Maven Integration Test :: MNG-4070 :: Child
   
     Test that whitespace around artifact coordinates does not change artifact identity.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4072/pom-template.xml b/its/core-it-suite/src/test/resources/mng-4072/pom-template.xml
index 3e1011f0bc..32d1ce7987 100644
--- a/its/core-it-suite/src/test/resources/mng-4072/pom-template.xml
+++ b/its/core-it-suite/src/test/resources/mng-4072/pom-template.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4072 
+  Maven Integration Test :: MNG-4072
   
     Test that repositories from inactive profiles are actually not used for artifact resolution.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4087/pom-template.xml b/its/core-it-suite/src/test/resources/mng-4087/pom-template.xml
index e683c0be88..0d47a72e85 100644
--- a/its/core-it-suite/src/test/resources/mng-4087/pom-template.xml
+++ b/its/core-it-suite/src/test/resources/mng-4087/pom-template.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4087 
+  Maven Integration Test :: MNG-4087
   
     Test that deployment to a file:// repository decodes percent-encoded characters.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4106/pom.xml b/its/core-it-suite/src/test/resources/mng-4106/pom.xml
index b5afbb4f0f..b48bfe6abe 100644
--- a/its/core-it-suite/src/test/resources/mng-4106/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4106/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4106 
+  Maven Integration Test :: MNG-4106
   
     Test that interpolation uses the property values from the dominant (i.e. last) profile among a group
     of active profiles that define the same properties. This boils down to the proper order of profile
diff --git a/its/core-it-suite/src/test/resources/mng-4107/pom.xml b/its/core-it-suite/src/test/resources/mng-4107/pom.xml
index f96833f621..9ef6b6cb7e 100644
--- a/its/core-it-suite/src/test/resources/mng-4107/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4107/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4107 
+  Maven Integration Test :: MNG-4107
   
     Test that POM interpolation uses the property values from the dominant profile source (POM vs. profiles.xml
     vs. settings.xml). This boils down to the proper order of profile injection and interpolation, i.e.
diff --git a/its/core-it-suite/src/test/resources/mng-4112/pom.xml b/its/core-it-suite/src/test/resources/mng-4112/pom.xml
index da58d62720..c2f794d85d 100644
--- a/its/core-it-suite/src/test/resources/mng-4112/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4112/pom.xml
@@ -27,7 +27,7 @@ under the License.
   pom
   1.0
 
-  Maven Integration Test :: MNG-4112 
+  Maven Integration Test :: MNG-4112
   
     Test for ${maven.version} and ${maven.build.version} property
   
diff --git a/its/core-it-suite/src/test/resources/mng-4116/pom.xml b/its/core-it-suite/src/test/resources/mng-4116/pom.xml
index aced5b3bd0..03ac3a147f 100644
--- a/its/core-it-suite/src/test/resources/mng-4116/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4116/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4116 
+  Maven Integration Test :: MNG-4116
   
     Test that the project builder does not decode URLs (which must be done by the transport layer instead).
   
diff --git a/its/core-it-suite/src/test/resources/mng-4126/pom.xml b/its/core-it-suite/src/test/resources/mng-4126/pom.xml
index cb235067eb..d48bdce34b 100644
--- a/its/core-it-suite/src/test/resources/mng-4126/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4126/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-4126 :: Parent 
+  Maven Integration Test :: MNG-4126 :: Parent
   
     Verify that effects of active profiles from the profiles.xml of a local parent are inherited by children when
     parent and child are build together during a reactor invocation. This boils down to the reactor cache not
diff --git a/its/core-it-suite/src/test/resources/mng-4126/sub/pom.xml b/its/core-it-suite/src/test/resources/mng-4126/sub/pom.xml
index d89e57561a..d4cfaea669 100644
--- a/its/core-it-suite/src/test/resources/mng-4126/sub/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4126/sub/pom.xml
@@ -32,7 +32,7 @@ under the License.
   child
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4126 :: Child 
+  Maven Integration Test :: MNG-4126 :: Child
   
     Verify that effects of active profiles from the profiles.xml of a local parent are inherited by children when
     parent and child are build together during a reactor invocation. This boils down to the reactor cache not
diff --git a/its/core-it-suite/src/test/resources/mng-4150/pom.xml b/its/core-it-suite/src/test/resources/mng-4150/pom.xml
index 4e95afcd74..a5a6afbc61 100644
--- a/its/core-it-suite/src/test/resources/mng-4150/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4150/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-4150 
+  Maven Integration Test :: MNG-4150
   
     Test version range support.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4162/pom.xml b/its/core-it-suite/src/test/resources/mng-4162/pom.xml
index 5fb986ac17..c3383ac92a 100644
--- a/its/core-it-suite/src/test/resources/mng-4162/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4162/pom.xml
@@ -32,7 +32,7 @@ under the License.
     Verify that the legacy reporting section is automatically converted into ordinary plugin configuration of the
     Maven Site Plugin to ease migration.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4166/pom.xml b/its/core-it-suite/src/test/resources/mng-4166/pom.xml
index b700bd13e5..7f4b6be26c 100644
--- a/its/core-it-suite/src/test/resources/mng-4166/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4166/pom.xml
@@ -30,7 +30,7 @@ under the License.
   
     Verify that plugins can use their own version of commons-cli and are not bound to the version bundled in the core.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4189/src/main/java/org/apache/maven/its/mng4189/App.java b/its/core-it-suite/src/test/resources/mng-4189/src/main/java/org/apache/maven/its/mng4189/App.java
index 7e8f32600e..edf9506a16 100644
--- a/its/core-it-suite/src/test/resources/mng-4189/src/main/java/org/apache/maven/its/mng4189/App.java
+++ b/its/core-it-suite/src/test/resources/mng-4189/src/main/java/org/apache/maven/its/mng4189/App.java
@@ -24,13 +24,13 @@ import org.apache.maven.its.mng4189.dep.Calculator;
 /**
  * Sample project
  */
-public class App 
+public class App
 {
     public void testDependency()
     {
         Calculator calculator = new Calculator();
         int total = calculator.add( 1, 2 );
-        
+
         System.out.println( "Total : " + total );
     }
 }
diff --git a/its/core-it-suite/src/test/resources/mng-4196/pom.xml b/its/core-it-suite/src/test/resources/mng-4196/pom.xml
index 33430163a3..8e56727d4a 100644
--- a/its/core-it-suite/src/test/resources/mng-4196/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4196/pom.xml
@@ -26,11 +26,11 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-4196 
+  Maven Integration Test :: MNG-4196
   
     Verify that exclusions on a project-level plugin dependency are effective.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4233/pom.xml b/its/core-it-suite/src/test/resources/mng-4233/pom.xml
index 55fd680bd8..a3104cab6e 100644
--- a/its/core-it-suite/src/test/resources/mng-4233/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4233/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-4233 
+  Maven Integration Test :: MNG-4233
   
     Verify that artifact instances created directly by plugins (i.e. via the artifact factory) can be resolved
     from the reactor. This case is a subtle variation of MNG-2877, namely not using @requiresDependencyResolution
diff --git a/its/core-it-suite/src/test/resources/mng-4233/producer/pom.xml b/its/core-it-suite/src/test/resources/mng-4233/producer/pom.xml
index b852b40247..8d81f983e7 100644
--- a/its/core-it-suite/src/test/resources/mng-4233/producer/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4233/producer/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4233 :: Dependency Provider 
+  Maven Integration Test :: MNG-4233 :: Dependency Provider
 
   
     
diff --git a/its/core-it-suite/src/test/resources/mng-4238/pom.xml b/its/core-it-suite/src/test/resources/mng-4238/pom.xml
index e7818faf8f..eae7722e18 100644
--- a/its/core-it-suite/src/test/resources/mng-4238/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4238/pom.xml
@@ -4,14 +4,14 @@
   org.apache.maven.its.mng4238
   mng-4238
   1
-  
+
   
   coreit
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4238/src/main/java/org/apache/maven/it/mng4238/App.java b/its/core-it-suite/src/test/resources/mng-4238/src/main/java/org/apache/maven/it/mng4238/App.java
index d86190e2b8..5490073083 100644
--- a/its/core-it-suite/src/test/resources/mng-4238/src/main/java/org/apache/maven/it/mng4238/App.java
+++ b/its/core-it-suite/src/test/resources/mng-4238/src/main/java/org/apache/maven/it/mng4238/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.it.mng4238;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-4254/pom.xml b/its/core-it-suite/src/test/resources/mng-4254/pom.xml
index 452bb9e3d3..de44c8df4a 100644
--- a/its/core-it-suite/src/test/resources/mng-4254/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4254/pom.xml
@@ -5,14 +5,14 @@
   mng-4254
   1
   pom
-  
+
   
     
       test
       http://dummyhost.com/repository
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4269/pom.xml b/its/core-it-suite/src/test/resources/mng-4269/pom.xml
index d7e4751b6f..fa5f3d908c 100644
--- a/its/core-it-suite/src/test/resources/mng-4269/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4269/pom.xml
@@ -34,7 +34,7 @@ under the License.
   Maven Integration Test :: MNG-4269
   
     Test that dependency resolution from the reactor is not too eager and does not resolve plugin artifacts from
-    the build directory of their plugin project when the plugin project hasn't been built yet. The technical 
+    the build directory of their plugin project when the plugin project hasn't been built yet. The technical
     problem is that the mere existence of a project output directory like target/classes is no sufficient indicator
     that we can use that for artifact resolution. The project's output directory might just be a left over from a
     previous build and could be in any state, e.g. incomplete.
diff --git a/its/core-it-suite/src/test/resources/mng-4270/pom.xml b/its/core-it-suite/src/test/resources/mng-4270/pom.xml
index bb519cf9ac..0a7fcca190 100644
--- a/its/core-it-suite/src/test/resources/mng-4270/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4270/pom.xml
@@ -21,7 +21,7 @@ under the License.
 
   4.0.0
-  
+
   org.apache.maven.its.mng4270
   mng-4270
   1
@@ -35,14 +35,14 @@ under the License.
       test
     
   
-  
+
   
     
       
         org.apache.maven.its.plugins
         maven-it-plugin-extension1
         2.1-SNAPSHOT
-        
+
         
           
             org.apache.maven.its
@@ -50,7 +50,7 @@ under the License.
             2.1-SNAPSHOT
           
         
-        
+
         
         true
       
diff --git a/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java b/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java
index 2e519cba97..027cdbd617 100644
--- a/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java
+++ b/its/core-it-suite/src/test/resources/mng-4270/src/main/java/org/apache/maven/its/mng3506/App.java
@@ -22,7 +22,7 @@ package org.apache.maven.its.mng3506;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java b/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java
index 07b7f5f8ea..d2f3c7f838 100644
--- a/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-4270/src/test/java/org/apache/maven/its/mng3506/AppTest.java
@@ -25,7 +25,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-4279/pom.xml b/its/core-it-suite/src/test/resources/mng-4279/pom.xml
index c3762e5c19..1a4ab5da4d 100644
--- a/its/core-it-suite/src/test/resources/mng-4279/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4279/pom.xml
@@ -32,14 +32,14 @@ under the License.
     Test that wagon provider selection fails gracefully and uses protocol for roleHint if protocol-provider roleHint
     isn't available.
   
-  
+
   
     
       test
       coreit://foo.com/deploy
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4281/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-4281/dependency/pom.xml
index 24a77f89dc..e13a2986d1 100644
--- a/its/core-it-suite/src/test/resources/mng-4281/dependency/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4281/dependency/pom.xml
@@ -21,13 +21,13 @@ under the License.
 
 
   4.0.0
-  
+
   org.apache.maven.its.mng4281
   dependency
   
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-4281 :: Dependency 
+  Maven Integration Test :: MNG-4281 :: Dependency
   
     Test that remote snapshots are not preferred over snapshots that have just been locally built.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4281/project/pom.xml b/its/core-it-suite/src/test/resources/mng-4281/project/pom.xml
index f1bd82af4c..87bf4488b9 100644
--- a/its/core-it-suite/src/test/resources/mng-4281/project/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4281/project/pom.xml
@@ -21,12 +21,12 @@ under the License.
 
 
   4.0.0
-  
+
   org.apache.maven.its.mng4281
   test
   0.1-SNAPSHOT
 
-  Maven Integration Test :: MNG-4281 :: Project 
+  Maven Integration Test :: MNG-4281 :: Project
   
     Test that remote snapshots are not preferred over snapshots that have just been locally built.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4292/pom.xml b/its/core-it-suite/src/test/resources/mng-4292/pom.xml
index 49a29e85e7..e2d2b744b0 100644
--- a/its/core-it-suite/src/test/resources/mng-4292/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4292/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4292 
+  Maven Integration Test :: MNG-4292
   
     Test that mojo parameters can be configured with enums.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4309/pom.xml b/its/core-it-suite/src/test/resources/mng-4309/pom.xml
index 1bc072a7a2..3db6c5d60e 100644
--- a/its/core-it-suite/src/test/resources/mng-4309/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4309/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4309 
+  Maven Integration Test :: MNG-4309
   
     Verify that strict checksum verification applies to metadata as well and in particular fails the build
     during deployment when the previous metadata is corrupt.
diff --git a/its/core-it-suite/src/test/resources/mng-4321/pom.xml b/its/core-it-suite/src/test/resources/mng-4321/pom.xml
index 7a837435a7..b69646a72e 100644
--- a/its/core-it-suite/src/test/resources/mng-4321/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4321/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-4321 
+  Maven Integration Test :: MNG-4321
   
     Test that configuration from plugin management also applies to goals that are invoked directly from the
     CLI even when the invoked plugin is neither explicitly present in the build/plugins section nor part of
diff --git a/its/core-it-suite/src/test/resources/mng-4326/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-4326/dependency/pom.xml
index bbc1313161..0a599d180a 100644
--- a/its/core-it-suite/src/test/resources/mng-4326/dependency/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4326/dependency/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4326 
+  Maven Integration Test :: MNG-4326
   
     Verify that locally built/installed snapshot artifacts suppress remote update checks (as long as the local copy
     still satifies the update policy configured for the remote repository).
diff --git a/its/core-it-suite/src/test/resources/mng-4326/test/pom.xml b/its/core-it-suite/src/test/resources/mng-4326/test/pom.xml
index dbc6690864..0f32b82b00 100644
--- a/its/core-it-suite/src/test/resources/mng-4326/test/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4326/test/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4326 
+  Maven Integration Test :: MNG-4326
   
     Verify that locally built/installed snapshot artifacts suppress remote update checks (as long as the local copy
     still satifies the update policy configured for the remote repository).
diff --git a/its/core-it-suite/src/test/resources/mng-4328/pom.xml b/its/core-it-suite/src/test/resources/mng-4328/pom.xml
index 415ed58025..0dfd4b37ef 100644
--- a/its/core-it-suite/src/test/resources/mng-4328/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4328/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-4328 
+  Maven Integration Test :: MNG-4328
   
     Verify that plugin parameters that are of primitive types like boolean (not java.lang.Boolean) can be populated
     from expressions. In other words, the subtle difference between the runtime type of the expression value (which
diff --git a/its/core-it-suite/src/test/resources/mng-4335/pom.xml b/its/core-it-suite/src/test/resources/mng-4335/pom.xml
index 2a23432315..f1c7e8480f 100644
--- a/its/core-it-suite/src/test/resources/mng-4335/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4335/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   0.1
 
-  Maven Integration Test :: MNG-4335 
+  Maven Integration Test :: MNG-4335
   
     Test that offline mode is enabled when specified in the settings.xml
   
diff --git a/its/core-it-suite/src/test/resources/mng-4338/pom.xml b/its/core-it-suite/src/test/resources/mng-4338/pom.xml
index 300a0fda30..bb133d4d12 100644
--- a/its/core-it-suite/src/test/resources/mng-4338/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4338/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   it-packaging
 
-  Maven Integration Test :: MNG-4338 
+  Maven Integration Test :: MNG-4338
   
     Test that the optional-mojos element in custom lifecycle mappings is recognized and does not cause
     a configuration failure when loading the lifecycle.
diff --git a/its/core-it-suite/src/test/resources/mng-4341/pom.xml b/its/core-it-suite/src/test/resources/mng-4341/pom.xml
index 95cee78acd..5423a5e71a 100644
--- a/its/core-it-suite/src/test/resources/mng-4341/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4341/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4341 
+  Maven Integration Test :: MNG-4341
   
     Test that plugins bound to the same phase get executed in POM order even if one of the plugins participates
     in the default lifecycle bindings for the project's packaging.
diff --git a/its/core-it-suite/src/test/resources/mng-4342/pom.xml b/its/core-it-suite/src/test/resources/mng-4342/pom.xml
index 0f2d1a4bae..b5ebb83d95 100644
--- a/its/core-it-suite/src/test/resources/mng-4342/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4342/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4342 
+  Maven Integration Test :: MNG-4342
   
     Test that multiple goals within a single execution get their default configuration properly injected. In
     particular, the default values for one goal should not influence the default values of the other goal.
diff --git a/its/core-it-suite/src/test/resources/mng-4343/pom.xml b/its/core-it-suite/src/test/resources/mng-4343/pom.xml
index 5657fbe061..837a4deeee 100644
--- a/its/core-it-suite/src/test/resources/mng-4343/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4343/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4343 
+  Maven Integration Test :: MNG-4343
   
     Verify that checking for *missing* release artifacts respects the update policy that is configured in the
     release section for the respective repository or set globally via "-U".
diff --git a/its/core-it-suite/src/test/resources/mng-4344/pom.xml b/its/core-it-suite/src/test/resources/mng-4344/pom.xml
index 6b64c0a1dd..610f01bc3e 100644
--- a/its/core-it-suite/src/test/resources/mng-4344/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4344/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4344 
+  Maven Integration Test :: MNG-4344
   
     Test that custom executions from managed plugins which are part of the default lifecycle bindings get
     executed after executions from plugins that are defined in the regular build section and bound to the
diff --git a/its/core-it-suite/src/test/resources/mng-4345/pom.xml b/its/core-it-suite/src/test/resources/mng-4345/pom.xml
index 5db2b890b4..2cdf1b0569 100644
--- a/its/core-it-suite/src/test/resources/mng-4345/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4345/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4345 
+  Maven Integration Test :: MNG-4345
   
     Test that plugin executions contributed by default lifecycle mappings always execute first in the targetted
     lifecycle phase regardless of other plugin executions bound to the same phase and regardless of the POM
diff --git a/its/core-it-suite/src/test/resources/mng-4347/pom.xml b/its/core-it-suite/src/test/resources/mng-4347/pom.xml
index 0fcb49ed43..486f5ae7c1 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4347/pom.xml
@@ -34,7 +34,7 @@ under the License.
       1
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
index 6036cf677a..f575fbf86e 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/dep-with-import/1/dep-with-import-1.pom
@@ -38,7 +38,7 @@ under the License.
       
     
   
-  
+
   
     
       org.apache.maven.its.mng4347
diff --git a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
index 0b2f82c337..8db910130f 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4347/remote-repository/org/apache/maven/its/mng4347/import-dep/1-SNAPSHOT/import-dep-1-20090909.201000-1.pom
@@ -5,14 +5,14 @@
   import-dep
   1-SNAPSHOT
   pom
-  
+
   
     
       nexus
       http://localhost:8081/nexus/content/repositories/snapshots/
     
   
-  
+
   
     
       
@@ -22,5 +22,5 @@
       
     
   
-        
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java b/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java
index 309eb22ee1..81ca4296ae 100644
--- a/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java
+++ b/its/core-it-suite/src/test/resources/mng-4347/src/main/java/org/apache/maven/it/mng4347/App.java
@@ -19,7 +19,7 @@ package org.apache.maven.it.mng4347;
  * under the License.
  */
 
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-4348/pom.xml b/its/core-it-suite/src/test/resources/mng-4348/pom.xml
index 1f738b36ba..39ff37b145 100644
--- a/its/core-it-suite/src/test/resources/mng-4348/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4348/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4348 
+  Maven Integration Test :: MNG-4348
   
     Test that the (remote) repos are not accessed during execution of a mojo that does not require dependency
     resolution. In detail, Maven should neither touch POMs, JARs nor metadata.
diff --git a/its/core-it-suite/src/test/resources/mng-4349/pom.xml b/its/core-it-suite/src/test/resources/mng-4349/pom.xml
index 3abd4dab96..0e6be672f7 100644
--- a/its/core-it-suite/src/test/resources/mng-4349/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4349/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4349 
+  Maven Integration Test :: MNG-4349
   
     Test that relocation to an artifact with an invalid POM fails gracefully and still uses the relocated JAR
     (instead of the JAR for the unrelocated artifact).
diff --git a/its/core-it-suite/src/test/resources/mng-4350/pom.xml b/its/core-it-suite/src/test/resources/mng-4350/pom.xml
index 9bb8d57e4d..46ac7a80bb 100644
--- a/its/core-it-suite/src/test/resources/mng-4350/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4350/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   multi-goal-per-phase
 
-  Maven Integration Test :: MNG-4350 
+  Maven Integration Test :: MNG-4350
   
     Test that multiple goals bound to the same phase by a lifecycle mapping execute in the order given by
     the lifecycle mapping. In particular, the order of plugin declarations in the POM should have no influence
diff --git a/its/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml b/its/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml
index 617596b885..f1884ba71c 100644
--- a/its/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml
@@ -27,9 +27,9 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4360 
+  Maven Integration Test :: MNG-4360
   
-    Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more 
+    Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more
     that the Jackrabbit based wagon can be properly loaded and doesn't die due to some class realm issue.
   
 
diff --git a/its/core-it-suite/src/test/resources/mng-4360/slide/pom.xml b/its/core-it-suite/src/test/resources/mng-4360/slide/pom.xml
index 6b60d2c0ed..dc2f2406e6 100644
--- a/its/core-it-suite/src/test/resources/mng-4360/slide/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4360/slide/pom.xml
@@ -27,9 +27,9 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4360 
+  Maven Integration Test :: MNG-4360
   
-    Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more 
+    Verify that WebDAV works in principle. This test is not actually concerned about proper transfers but more
     that the Slide based wagon can be properly loaded and doesn't die due to some class realm issue.
   
 
diff --git a/its/core-it-suite/src/test/resources/mng-4365/pom.xml b/its/core-it-suite/src/test/resources/mng-4365/pom.xml
index 9461a11009..3a48cc243d 100644
--- a/its/core-it-suite/src/test/resources/mng-4365/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4365/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4365 
+  Maven Integration Test :: MNG-4365
   
     Test that the POM parser doesn't choke on attribute values that contain entities which resolve to markup.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4461/pom.xml b/its/core-it-suite/src/test/resources/mng-4461/pom.xml
index a824fbc3f1..ec8837f1e2 100644
--- a/its/core-it-suite/src/test/resources/mng-4461/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4461/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4461 
+  Maven Integration Test :: MNG-4461
   
     Test that deployment of an artifact gets logged via the transfer monitor.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4470/release/pom.xml b/its/core-it-suite/src/test/resources/mng-4470/release/pom.xml
index 46668204c0..a8851717e1 100644
--- a/its/core-it-suite/src/test/resources/mng-4470/release/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4470/release/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4470 
+  Maven Integration Test :: MNG-4470
   
     Test that deployment (of a release) to a proxy that requires authentication works.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4470/snapshot/pom.xml b/its/core-it-suite/src/test/resources/mng-4470/snapshot/pom.xml
index c1904f8d7a..068ce2d5d5 100644
--- a/its/core-it-suite/src/test/resources/mng-4470/snapshot/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4470/snapshot/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4470 
+  Maven Integration Test :: MNG-4470
   
     Test that deployment (of a snapshot) to a proxy that requires authentication works.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4474/pom.xml b/its/core-it-suite/src/test/resources/mng-4474/pom.xml
index 8af597cb04..424b4be32e 100644
--- a/its/core-it-suite/src/test/resources/mng-4474/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4474/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4474 
+  Maven Integration Test :: MNG-4474
   
     Verify that the wagon manager does not erroneously cache/reuse wagon instances that use per-lookup instantiation.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4633/subproject1/src/main/java/mng4633/AClass.java b/its/core-it-suite/src/test/resources/mng-4633/subproject1/src/main/java/mng4633/AClass.java
index 482b40e9b6..14641a7847 100644
--- a/its/core-it-suite/src/test/resources/mng-4633/subproject1/src/main/java/mng4633/AClass.java
+++ b/its/core-it-suite/src/test/resources/mng-4633/subproject1/src/main/java/mng4633/AClass.java
@@ -1,5 +1,5 @@
 package mng4633;
 
 public class AClass {
-    
+
 }
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-4633/subproject2/src/main/java/mng4633/BClass.java b/its/core-it-suite/src/test/resources/mng-4633/subproject2/src/main/java/mng4633/BClass.java
index dfc7297191..8875e1c87b 100644
--- a/its/core-it-suite/src/test/resources/mng-4633/subproject2/src/main/java/mng4633/BClass.java
+++ b/its/core-it-suite/src/test/resources/mng-4633/subproject2/src/main/java/mng4633/BClass.java
@@ -3,5 +3,5 @@ package mng4633;
 import mng4633.AClass;
 
 public class BClass {
-    
+
 }
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-4654/pom.xml b/its/core-it-suite/src/test/resources/mng-4654/pom.xml
index fee002d69a..2a3e59e70e 100644
--- a/its/core-it-suite/src/test/resources/mng-4654/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4654/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   mng4654
 
-  Maven Integration Test :: MNG-4654 
+  Maven Integration Test :: MNG-4654
   
     Test that the artifact handler for the project main artifact is selected via the handler's type/roleHint
     and not via the handler's packaging (the packaging only applies to the legacy repo layout).
diff --git a/its/core-it-suite/src/test/resources/mng-4745/pom.xml b/its/core-it-suite/src/test/resources/mng-4745/pom.xml
index 19c59735dc..810a3f7c67 100644
--- a/its/core-it-suite/src/test/resources/mng-4745/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4745/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-4745 
+  Maven Integration Test :: MNG-4745
   
     Verify that checks for plugin updates can be controlled via repository update policy and command line (-U).
   
diff --git a/its/core-it-suite/src/test/resources/mng-4755/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-4755/dependency/pom.xml
index 9f11990bca..4f8a47011d 100644
--- a/its/core-it-suite/src/test/resources/mng-4755/dependency/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4755/dependency/pom.xml
@@ -27,7 +27,7 @@ under the License.
   2
   jar
 
-  Maven Integration Test :: MNG-4755 
+  Maven Integration Test :: MNG-4755
   
     Verify that locally installed artifacts don't suppress fetching of g:a-level remote metadata which is required
     to locate alternative version (as required by version ranges).
diff --git a/its/core-it-suite/src/test/resources/mng-4755/test/pom.xml b/its/core-it-suite/src/test/resources/mng-4755/test/pom.xml
index 9a23e630d6..8edf6ec104 100644
--- a/its/core-it-suite/src/test/resources/mng-4755/test/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4755/test/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   jar
 
-  Maven Integration Test :: MNG-4755 
+  Maven Integration Test :: MNG-4755
   
     Verify that locally installed artifacts don't suppress fetching of g:a-level remote metadata which is required
     to locate alternative version (as required by version ranges).
diff --git a/its/core-it-suite/src/test/resources/mng-4761/pom.xml b/its/core-it-suite/src/test/resources/mng-4761/pom.xml
index 0523209936..adbc88cf00 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4761/pom.xml
@@ -2,7 +2,7 @@
 
   4.0.0
-  
+
   org.apache.maven.its.mng4761
   mng4761
   0.1
@@ -22,7 +22,7 @@
             0.1
           
         
-            
+
         
           
             test-run
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/deps/0.1/deps-0.1.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/deps/0.1/deps-0.1.pom
index e168c6e2c0..478d40c382 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/deps/0.1/deps-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/deps/0.1/deps-0.1.pom
@@ -1,16 +1,16 @@
 
 
   4.0.0
-  
+
   
     org.apache.maven.its.mng4761
     parent
     0.1
   
-  
+
   deps
   pom
-  
+
   
     required-dep
     middle-dep-0.1
@@ -18,5 +18,5 @@
     direct-dep
     override-dep
   
-  
+
 
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/direct-dep/0.1/direct-dep-0.1.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/direct-dep/0.1/direct-dep-0.1.pom
index 3c93042173..1ba5e87cd4 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/direct-dep/0.1/direct-dep-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/direct-dep/0.1/direct-dep-0.1.pom
@@ -14,7 +14,7 @@
   
     UTF-8
   
-  
+
   
     
       org.apache.maven.its.mng4761
@@ -33,7 +33,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/maven-mng4761-plugin/0.1/maven-mng4761-plugin-0.1.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/maven-mng4761-plugin/0.1/maven-mng4761-plugin-0.1.pom
index 87b9f24fca..2f1b027c64 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/maven-mng4761-plugin/0.1/maven-mng4761-plugin-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/maven-mng4761-plugin/0.1/maven-mng4761-plugin-0.1.pom
@@ -7,7 +7,7 @@
     parent
     0.1
   
-  
+
   maven-mng4761-plugin
   maven-plugin
 
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.1/middle-dep-0.1.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.1/middle-dep-0.1.pom
index a5a6357ae9..3fcb8acd2b 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.1/middle-dep-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.1/middle-dep-0.1.pom
@@ -10,7 +10,7 @@
 
   middle-dep
   middle-dep
-  
+
   
     UTF-8
   
@@ -27,7 +27,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.2/middle-dep-0.2.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.2/middle-dep-0.2.pom
index 76b8b63d6a..79295132d7 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.2/middle-dep-0.2.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/middle-dep/0.2/middle-dep-0.2.pom
@@ -15,7 +15,7 @@
   
     UTF-8
   
-  
+
   
     
       junit
@@ -24,7 +24,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/override-dep/0.1/override-dep-0.1.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/override-dep/0.1/override-dep-0.1.pom
index cb97b7214e..aa277fe95e 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/override-dep/0.1/override-dep-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/override-dep/0.1/override-dep-0.1.pom
@@ -14,7 +14,7 @@
   
     UTF-8
   
-  
+
   
     
       org.apache.maven.its.mng4761
@@ -28,7 +28,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/parent/0.1/parent-0.1.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/parent/0.1/parent-0.1.pom
index 2df3a79033..2915e10adb 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/parent/0.1/parent-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/parent/0.1/parent-0.1.pom
@@ -5,19 +5,19 @@
   parent
   0.1
   pom
-  
+
   
     plugin
     deps
   
-  
+
   
     
       test-repo
       file:///Users/jdcasey/temp/testbed/obscured-nearer-dep/repo
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/required-dep/0.1/required-dep-0.1.pom b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/required-dep/0.1/required-dep-0.1.pom
index 28516624f0..0e1b9e625a 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/required-dep/0.1/required-dep-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-4761/repo/org/apache/maven/its/mng4761/required-dep/0.1/required-dep-0.1.pom
@@ -14,7 +14,7 @@
   
     UTF-8
   
-  
+
   
     
       junit
@@ -23,7 +23,7 @@
       test
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-4761/settings-template.xml b/its/core-it-suite/src/test/resources/mng-4761/settings-template.xml
index b5c0ef90f4..e202574a1f 100644
--- a/its/core-it-suite/src/test/resources/mng-4761/settings-template.xml
+++ b/its/core-it-suite/src/test/resources/mng-4761/settings-template.xml
@@ -1,9 +1,9 @@
 
-
-  
+
   
     
       local-profile
@@ -33,9 +33,9 @@
       
     
   
-  
+
   
     local-profile
   
-  
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-4779/a/pom.xml b/its/core-it-suite/src/test/resources/mng-4779/a/pom.xml
index d0c2dc4c98..e05f869694 100644
--- a/its/core-it-suite/src/test/resources/mng-4779/a/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4779/a/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4779 :: A 
+  Maven Integration Test :: MNG-4779 :: A
   
     Test that dependency resolution doesn't error out when a dependency with a range satisfied from the local repo
     is seen more than once during the collection.
diff --git a/its/core-it-suite/src/test/resources/mng-4779/b/pom.xml b/its/core-it-suite/src/test/resources/mng-4779/b/pom.xml
index 12f2ea3d55..3aad237907 100644
--- a/its/core-it-suite/src/test/resources/mng-4779/b/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4779/b/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4779 :: B 
+  Maven Integration Test :: MNG-4779 :: B
   
     Test that dependency resolution doesn't error out when a dependency with a range satisfied from the local repo
     is seen more than once during the collection.
diff --git a/its/core-it-suite/src/test/resources/mng-4779/c/pom.xml b/its/core-it-suite/src/test/resources/mng-4779/c/pom.xml
index 6a8c81d3ea..f34db63b94 100644
--- a/its/core-it-suite/src/test/resources/mng-4779/c/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4779/c/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4779 :: C 
+  Maven Integration Test :: MNG-4779 :: C
   
     Test that dependency resolution doesn't error out when a dependency with a range satisfied from the local repo
     is seen more than once during the collection.
diff --git a/its/core-it-suite/src/test/resources/mng-4779/pom.xml b/its/core-it-suite/src/test/resources/mng-4779/pom.xml
index 574d1ce710..8f87716bda 100644
--- a/its/core-it-suite/src/test/resources/mng-4779/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4779/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   pom
 
-  Maven Integration Test :: MNG-4779 :: Aggregator 
+  Maven Integration Test :: MNG-4779 :: Aggregator
   
     Test that dependency resolution doesn't error out when a dependency with a range satisfied from the local repo
     is seen more than once during the collection.
diff --git a/its/core-it-suite/src/test/resources/mng-4779/test/pom.xml b/its/core-it-suite/src/test/resources/mng-4779/test/pom.xml
index d1d426d0dd..32af64fd3d 100644
--- a/its/core-it-suite/src/test/resources/mng-4779/test/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4779/test/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4779 :: Test 
+  Maven Integration Test :: MNG-4779 :: Test
   
     Test that dependency resolution doesn't error out when a dependency with a range satisfied from the local repo
     is seen more than once during the collection.
diff --git a/its/core-it-suite/src/test/resources/mng-4781/pom.xml b/its/core-it-suite/src/test/resources/mng-4781/pom.xml
index 6ae377e1d7..cb534d0d8d 100644
--- a/its/core-it-suite/src/test/resources/mng-4781/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4781/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1.0
   jar
 
-  Maven Integration Test :: MNG-4781 
+  Maven Integration Test :: MNG-4781
   
     Verify that deployment to a Nexus-like staging repository works. The subtle difference compared to an ordinary
     HTTP/WebDAV server is that those staging repos yield a HTTP 400 (and not 404) for every GET request until a
diff --git a/its/core-it-suite/src/test/resources/mng-4811/pom.xml b/its/core-it-suite/src/test/resources/mng-4811/pom.xml
index 46346cf8eb..35e6f269fc 100644
--- a/its/core-it-suite/src/test/resources/mng-4811/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4811/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-4811 
+  Maven Integration Test :: MNG-4811
   
     Verify that plugins can use custom component configurators.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4874/pom.xml b/its/core-it-suite/src/test/resources/mng-4874/pom.xml
index 0dc1e12721..3d11939fc7 100644
--- a/its/core-it-suite/src/test/resources/mng-4874/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4874/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1-SNAPSHOT
   maven-plugin
 
-  Maven Integration Test :: MNG-4874 
+  Maven Integration Test :: MNG-4874
   
     Verify that deployment of a plugin updates the metadata's "latest" field.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4877/pom.xml b/its/core-it-suite/src/test/resources/mng-4877/pom.xml
index 36adbe6aee..3654f5310d 100644
--- a/its/core-it-suite/src/test/resources/mng-4877/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4877/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   jar
 
-  Maven Integration Test :: MNG-4877 
+  Maven Integration Test :: MNG-4877
   
     Verify that configured private key and passphrase are used for (SSH) deployment.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4919/pom.xml b/its/core-it-suite/src/test/resources/mng-4919/pom.xml
index 1d539d35ff..7fdd7c4433 100644
--- a/its/core-it-suite/src/test/resources/mng-4919/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4919/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   same-goal-twice
 
-  Maven Integration Test :: MNG-4919 
+  Maven Integration Test :: MNG-4919
   
     Verify that lifecycle mappings can bind a goal twice, say in different phases.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4952/pom-template.xml b/its/core-it-suite/src/test/resources/mng-4952/pom-template.xml
index 9fbc407873..6704ba2ab9 100644
--- a/its/core-it-suite/src/test/resources/mng-4952/pom-template.xml
+++ b/its/core-it-suite/src/test/resources/mng-4952/pom-template.xml
@@ -27,7 +27,7 @@ under the License.
   @version@
   jar
 
-  Maven Integration Test :: MNG-4952 
+  Maven Integration Test :: MNG-4952
   
     Verify that the metadata's RELEASE field gets updated upon deployment of a new version.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4966/pom.xml b/its/core-it-suite/src/test/resources/mng-4966/pom.xml
index 3527a34bc9..eb4bd41381 100644
--- a/its/core-it-suite/src/test/resources/mng-4966/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4966/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0
 
-  Maven Integration Test :: MNG-4966 
+  Maven Integration Test :: MNG-4966
   
     Verify that URLs in the effective model retain successive slashes which are significant in certain domains.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4975/pom.xml b/its/core-it-suite/src/test/resources/mng-4975/pom.xml
index 5624c42192..8b71276ac8 100644
--- a/its/core-it-suite/src/test/resources/mng-4975/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4975/pom.xml
@@ -27,7 +27,7 @@ under the License.
   0.1
   pom
 
-  Maven Integration Test :: MNG-4975 
+  Maven Integration Test :: MNG-4975
   
     Test that plugin executions (in the same phase) are properly ordered after profile injection.
   
diff --git a/its/core-it-suite/src/test/resources/mng-4992/pom.xml b/its/core-it-suite/src/test/resources/mng-4992/pom.xml
index cc468758e8..5f8ceb3712 100644
--- a/its/core-it-suite/src/test/resources/mng-4992/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-4992/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-4992 
+  Maven Integration Test :: MNG-4992
   
     Verify that plugin parameters of type java.util.Properties can be configured like any other Map-style parameter.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5009/pom-2.xml b/its/core-it-suite/src/test/resources/mng-5009/pom-2.xml
index a0d560db79..25dfead7a7 100644
--- a/its/core-it-suite/src/test/resources/mng-5009/pom-2.xml
+++ b/its/core-it-suite/src/test/resources/mng-5009/pom-2.xml
@@ -27,7 +27,7 @@ under the License.
   1
   pom
 
-  Maven Integration Test :: MNG-5009 :: Child 
+  Maven Integration Test :: MNG-5009 :: Child
   
     Verify that aggregators POMs forming a cycle fail gracefully with a proper error message.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5009/pom.xml b/its/core-it-suite/src/test/resources/mng-5009/pom.xml
index 814a866a8a..b66e3094d1 100644
--- a/its/core-it-suite/src/test/resources/mng-5009/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5009/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1
   pom
 
-  Maven Integration Test :: MNG-5009 
+  Maven Integration Test :: MNG-5009
   
     Verify that aggregators POMs forming a cycle fail gracefully with a proper error message.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5011/pom.xml b/its/core-it-suite/src/test/resources/mng-5011/pom.xml
index 8a52aa4dcd..01688bb5c6 100644
--- a/its/core-it-suite/src/test/resources/mng-5011/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5011/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-5011 
+  Maven Integration Test :: MNG-5011
   
     Verify that plugin parameters of type array/collection can be configured using system properties from the CLI.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5012/pom.xml b/its/core-it-suite/src/test/resources/mng-5012/pom.xml
index 1cbd6238d1..7cc23d7f61 100644
--- a/its/core-it-suite/src/test/resources/mng-5012/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5012/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-5012 
+  Maven Integration Test :: MNG-5012
   
     Verify that plugin parameters of type array/collection can be configured from expressions/defaults that
     actually resolve to a collection/array.
diff --git a/its/core-it-suite/src/test/resources/mng-5013/pom.xml b/its/core-it-suite/src/test/resources/mng-5013/pom.xml
index 856bf5da53..eaf745d5b4 100644
--- a/its/core-it-suite/src/test/resources/mng-5013/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5013/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-5013 
+  Maven Integration Test :: MNG-5013
   
     Verify that plugin parameter beans can be configured from a single value.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5175/settings-template.xml b/its/core-it-suite/src/test/resources/mng-5175/settings-template.xml
index c942cdc15c..5e4f67cbd5 100644
--- a/its/core-it-suite/src/test/resources/mng-5175/settings-template.xml
+++ b/its/core-it-suite/src/test/resources/mng-5175/settings-template.xml
@@ -20,4 +20,4 @@
     
   
 
- 
+
diff --git a/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml b/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml
index fc65b337b6..78ab4e9fca 100755
--- a/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5207/application/pom.xml
@@ -15,12 +15,12 @@
     jar
     Issue Application
     
-    
+
     
         
             bugs.maven.issue
 			delegate
         
     
-    
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml b/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml
index 4aceaede6e..4840108a46 100755
--- a/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5207/delegate/pom.xml
@@ -15,7 +15,7 @@
     jar
     Issue EJB Delegate
     
-    
+
     
         
             bugs.maven.issue
@@ -24,5 +24,5 @@
 			ejb-client
         
     
-    
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml b/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml
index 56168e7e46..a684defb45 100755
--- a/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5207/ejb/pom.xml
@@ -15,7 +15,7 @@
     ejb
     Issue EJB
     
-    
+
     
         
             
@@ -32,12 +32,12 @@
             
         
     
-    
+
     
         
             commons-lang
             commons-lang
         
     
-    
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-5207/pom.xml b/its/core-it-suite/src/test/resources/mng-5207/pom.xml
index cb48175e20..cd8ca2c92b 100755
--- a/its/core-it-suite/src/test/resources/mng-5207/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5207/pom.xml
@@ -10,7 +10,7 @@
     pom
     Builder for Issue
     x-SNAPSHOT
-    
+
     
         application
         delegate
diff --git a/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom b/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom
index 0ba4151d7f..44429b2cf1 100755
--- a/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-5207/prepare/delegate-1.pom
@@ -15,7 +15,7 @@
     jar
     Issue EJB Delegate
     
-    
+
     
         
             bugs.maven.issue
@@ -24,5 +24,5 @@
 			ejb-client
         
     
-    
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom b/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom
index 1a056d94f8..7c5703595d 100755
--- a/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom
+++ b/its/core-it-suite/src/test/resources/mng-5207/prepare/ejb-1.pom
@@ -15,7 +15,7 @@
     ejb
     Issue EJB
     
-    
+
     
         
             
@@ -32,12 +32,12 @@
             
         
     
-    
+
     
         
             commons-lang
             commons-lang
         
     
-    
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml b/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml
index 770f634876..3008959760 100644
--- a/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5214/consumer/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   consumer
 
-  Maven Integration Test :: MNG-5214 :: Consumer 
+  Maven Integration Test :: MNG-5214 :: Consumer
   
     Test that a dependency on a type other than jar/test-jar/ejb is not mapped to target/classes.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml
index 6b947df03f..b61243b158 100644
--- a/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5214/dependency/pom.xml
@@ -27,10 +27,10 @@ under the License.
     parent
     1.0-SNAPSHOT
   
-  
+
   dependency
 
-  Maven Integration Test :: MNG-5214 :: Dependency 
+  Maven Integration Test :: MNG-5214 :: Dependency
   A very dull project, which exists only so that its g:a:v is in the reactor.
   
 
diff --git a/its/core-it-suite/src/test/resources/mng-5214/pom.xml b/its/core-it-suite/src/test/resources/mng-5214/pom.xml
index 975c891ed4..6ba3cce112 100644
--- a/its/core-it-suite/src/test/resources/mng-5214/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5214/pom.xml
@@ -27,14 +27,14 @@ under the License.
   1.0-SNAPSHOT
   pom
 
-  Maven Integration Test :: MNG-5214 
+  Maven Integration Test :: MNG-5214
   
-    Test that a dependency with a type other than jar, test-jar, or ejb-client 
-    *not* get assigned a reactor path (target/classes, e.g.) just 
+    Test that a dependency with a type other than jar, test-jar, or ejb-client
+    *not* get assigned a reactor path (target/classes, e.g.) just
     because the corresponding 'jar'
     artifact is in the reactor.
   
-  
+
   
     dependency
     consumer
diff --git a/its/core-it-suite/src/test/resources/mng-5224/settings.xml b/its/core-it-suite/src/test/resources/mng-5224/settings.xml
index 92507b212e..f0338aa3b6 100644
--- a/its/core-it-suite/src/test/resources/mng-5224/settings.xml
+++ b/its/core-it-suite/src/test/resources/mng-5224/settings.xml
@@ -24,4 +24,4 @@
     
   
 
- 
+
diff --git a/its/core-it-suite/src/test/resources/mng-5338/project/src/main/java/org/apache/maven/its/mng5338/App.java b/its/core-it-suite/src/test/resources/mng-5338/project/src/main/java/org/apache/maven/its/mng5338/App.java
index fd3f646a63..5329396220 100644
--- a/its/core-it-suite/src/test/resources/mng-5338/project/src/main/java/org/apache/maven/its/mng5338/App.java
+++ b/its/core-it-suite/src/test/resources/mng-5338/project/src/main/java/org/apache/maven/its/mng5338/App.java
@@ -23,7 +23,7 @@ package org.apache.maven.its.mng5338;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java b/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java
index cb900006d5..97dbd726a2 100644
--- a/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-5338/project/src/test/java/org/apache/maven/its/mng5338/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-5452-maven-build-timestamp-utc/pom.xml b/its/core-it-suite/src/test/resources/mng-5452-maven-build-timestamp-utc/pom.xml
index dff880207b..ab7b988ebf 100644
--- a/its/core-it-suite/src/test/resources/mng-5452-maven-build-timestamp-utc/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5452-maven-build-timestamp-utc/pom.xml
@@ -12,7 +12,7 @@
       
         src/main/resources
         true
-        
+      
     
   
 
\ No newline at end of file
diff --git a/its/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml b/its/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml
index 405f507bac..795b60ad00 100644
--- a/its/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5482/plugin-dependency/pom.xml
@@ -5,7 +5,7 @@
   mng-5482-plugin-site
   1
   pom
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-5482/plugin-site/pom.xml b/its/core-it-suite/src/test/resources/mng-5482/plugin-site/pom.xml
index 84485d1141..c0c8efa9cb 100644
--- a/its/core-it-suite/src/test/resources/mng-5482/plugin-site/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5482/plugin-site/pom.xml
@@ -5,7 +5,7 @@
   mng-5482-plugin-site
   1
   pom
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-5482/report-mpir/pom.xml b/its/core-it-suite/src/test/resources/mng-5482/report-mpir/pom.xml
index f4a3a0c055..35b2882234 100644
--- a/its/core-it-suite/src/test/resources/mng-5482/report-mpir/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5482/report-mpir/pom.xml
@@ -5,7 +5,7 @@
   mng-5482-plugin-site
   1
   pom
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestClassRealmManagerDelegate.java b/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestClassRealmManagerDelegate.java
index 979e6b681d..85afce2a0c 100644
--- a/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestClassRealmManagerDelegate.java
+++ b/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestClassRealmManagerDelegate.java
@@ -6,9 +6,9 @@ package org.apache.maven.its.mng5530.mojoexecutionscope.extension;
  * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License. You may obtain a
  * copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
diff --git a/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestMojoExecutionScopedComponent.java b/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestMojoExecutionScopedComponent.java
index b2c6b56ad1..fe18413cdb 100644
--- a/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestMojoExecutionScopedComponent.java
+++ b/its/core-it-suite/src/test/resources/mng-5530-mojo-execution-scope/extension/src/main/java/org/apache/maven/its/mng5530/mojoexecutionscope/extension/TestMojoExecutionScopedComponent.java
@@ -6,9 +6,9 @@ package org.apache.maven.its.mng5530.mojoexecutionscope.extension;
  * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License. You may obtain a
  * copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/main/java/org/apache/maven/its/mng5557/App.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/main/java/org/apache/maven/its/mng5557/App.java
index 727deafc71..ea407a7709 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/main/java/org/apache/maven/its/mng5557/App.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/main/java/org/apache/maven/its/mng5557/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.its.mng5557;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/test/java/org/apache/maven/its/mng5557/AppTest.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/test/java/org/apache/maven/its/mng5557/AppTest.java
index 422f488c66..231ccdc2a6 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/test/java/org/apache/maven/its/mng5557/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-0/src/test/java/org/apache/maven/its/mng5557/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/main/java/org/apache/maven/its/mng5557/App.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/main/java/org/apache/maven/its/mng5557/App.java
index 727deafc71..ea407a7709 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/main/java/org/apache/maven/its/mng5557/App.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/main/java/org/apache/maven/its/mng5557/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.its.mng5557;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/test/java/org/apache/maven/its/mng5557/AppTest.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/test/java/org/apache/maven/its/mng5557/AppTest.java
index 422f488c66..231ccdc2a6 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/test/java/org/apache/maven/its/mng5557/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-1/src/test/java/org/apache/maven/its/mng5557/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/main/java/org/apache/maven/its/mng5557/App.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/main/java/org/apache/maven/its/mng5557/App.java
index 727deafc71..ea407a7709 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/main/java/org/apache/maven/its/mng5557/App.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/main/java/org/apache/maven/its/mng5557/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.its.mng5557;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/test/java/org/apache/maven/its/mng5557/AppTest.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/test/java/org/apache/maven/its/mng5557/AppTest.java
index 422f488c66..231ccdc2a6 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/test/java/org/apache/maven/its/mng5557/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-2/src/test/java/org/apache/maven/its/mng5557/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/main/java/org/apache/maven/its/mng5557/App.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/main/java/org/apache/maven/its/mng5557/App.java
index 727deafc71..ea407a7709 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/main/java/org/apache/maven/its/mng5557/App.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/main/java/org/apache/maven/its/mng5557/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.its.mng5557;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/test/java/org/apache/maven/its/mng5557/AppTest.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/test/java/org/apache/maven/its/mng5557/AppTest.java
index 422f488c66..231ccdc2a6 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/test/java/org/apache/maven/its/mng5557/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-3/src/test/java/org/apache/maven/its/mng5557/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/main/java/org/apache/maven/its/mng5557/App.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/main/java/org/apache/maven/its/mng5557/App.java
index 727deafc71..ea407a7709 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/main/java/org/apache/maven/its/mng5557/App.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/main/java/org/apache/maven/its/mng5557/App.java
@@ -4,7 +4,7 @@ package org.apache.maven.its.mng5557;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/test/java/org/apache/maven/its/mng5557/AppTest.java b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/test/java/org/apache/maven/its/mng5557/AppTest.java
index 422f488c66..231ccdc2a6 100644
--- a/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/test/java/org/apache/maven/its/mng5557/AppTest.java
+++ b/its/core-it-suite/src/test/resources/mng-5557-properly-restricted-reactor/project-4/src/test/java/org/apache/maven/its/mng5557/AppTest.java
@@ -7,7 +7,7 @@ import junit.framework.TestSuite;
 /**
  * Unit test for simple App.
  */
-public class AppTest 
+public class AppTest
     extends TestCase
 {
     /**
diff --git a/its/core-it-suite/src/test/resources/mng-5572-reactor-plugin-extensions/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-5572-reactor-plugin-extensions/plugin/pom.xml
index b99e333163..226db24632 100644
--- a/its/core-it-suite/src/test/resources/mng-5572-reactor-plugin-extensions/plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5572-reactor-plugin-extensions/plugin/pom.xml
@@ -1,22 +1,22 @@
 
 
-
 
 
   4.0.0
-  
+
   
-  
+
   org.apache.maven.its.mng5572
   plugin
   1.0-SNAPSHOT
diff --git a/its/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml b/its/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml
index 979fea0764..42c3160a14 100644
--- a/its/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5576-cd-friendly-versions/pom.xml
@@ -5,7 +5,7 @@
   mng-5576
   
   1.0.0.${changelist}
-  Maven Integration Test :: mng-5576 
+  Maven Integration Test :: mng-5576
   
     Verifies that property references with dotted notation work within POM interpolation.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5578-session-scope/extension/src/main/java/org/apache/maven/its/mng5578/sessionscope/extension/TestSessionScopedComponent.java b/its/core-it-suite/src/test/resources/mng-5578-session-scope/extension/src/main/java/org/apache/maven/its/mng5578/sessionscope/extension/TestSessionScopedComponent.java
index b32ea2b647..e575d4197c 100644
--- a/its/core-it-suite/src/test/resources/mng-5578-session-scope/extension/src/main/java/org/apache/maven/its/mng5578/sessionscope/extension/TestSessionScopedComponent.java
+++ b/its/core-it-suite/src/test/resources/mng-5578-session-scope/extension/src/main/java/org/apache/maven/its/mng5578/sessionscope/extension/TestSessionScopedComponent.java
@@ -6,9 +6,9 @@ package org.apache.maven.its.mng5578.sessionscope.extension;
  * copyright ownership. The ASF licenses this file to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance with the License. You may obtain a
  * copy of the License at
- * 
+ *
  * http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software distributed under the License
  * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
  * or implied. See the License for the specific language governing permissions and limitations under
diff --git a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml
index b73945dd06..26b3d6a595 100644
--- a/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5581-lifecycle-mapping-delegate/basic/pom.xml
@@ -34,7 +34,7 @@ under the License.
       4.11
     
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-5716-toolchains-type/pom.xml b/its/core-it-suite/src/test/resources/mng-5716-toolchains-type/pom.xml
index 5fbe46bce0..9c41b3d3a9 100644
--- a/its/core-it-suite/src/test/resources/mng-5716-toolchains-type/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5716-toolchains-type/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1.0-SNAPSHOT
 
-  Maven Integration Test :: MNG-5716 
+  Maven Integration Test :: MNG-5716
   Test Toolchain type returned by ToolchainManagerPrivate.getToolchainsForType()
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojo.java b/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojo.java
index d527cff848..08c5a56544 100644
--- a/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojo.java
+++ b/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojo.java
@@ -38,13 +38,13 @@ public class TestMojo
 {
     @Parameter( defaultValue = "${project}", readonly = true )
     private MavenProject project;
-    
+
     @Parameter
     private String name;
-    
+
     public void execute()
         throws MojoExecutionException
-    {        
+    {
         try
         {
             File file = new File( project.getBasedir(), "configuration.txt" );
@@ -63,6 +63,6 @@ public class TestMojo
         {
             throw new MojoExecutionException( e.getMessage(), e );
         }
-        
+
     }
 }
diff --git a/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojoExecutionConfigurator.java b/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojoExecutionConfigurator.java
index 89076cf611..d0d1e79d11 100644
--- a/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojoExecutionConfigurator.java
+++ b/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/java/org/apache/maven/its/mng5753/plugin/TestMojoExecutionConfigurator.java
@@ -31,12 +31,12 @@ public class TestMojoExecutionConfigurator
     public void configure( MavenProject project, MojoExecution mojoExecution, boolean allowPluginLevelConfig )
     {
         // We do exactly what the default mojo execution configurator does
-        super.configure( project, mojoExecution, allowPluginLevelConfig );        
-        
+        super.configure( project, mojoExecution, allowPluginLevelConfig );
+
         // And now we'll insert some additional configuration that we can assert was placed
         // in the configuration in our test
         Xpp3Dom mojoConfiguration = mojoExecution.getConfiguration();
-        
-        mojoConfiguration.getChild( "name" ).setValue( "TRANSFORMED" );        
+
+        mojoConfiguration.getChild( "name" ).setValue( "TRANSFORMED" );
     }
 }
diff --git a/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/resources/META-INF/plexus/components.xml b/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/resources/META-INF/plexus/components.xml
index 46fcf16ae7..3d773df610 100644
--- a/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-suite/src/test/resources/mng-5753-custom-mojo-execution-configurator/plugin/src/main/resources/META-INF/plexus/components.xml
@@ -5,7 +5,7 @@
       org.codehaus.plexus.component.configurator.ComponentConfigurator
       test
       org.codehaus.plexus.component.configurator.BasicComponentConfigurator
-            
+    
     
       org.apache.maven.lifecycle.MojoExecutionConfigurator
       test
diff --git a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml
index ef65382cf8..b0b7f41eb5 100644
--- a/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5760-resume-feature/parent-dependent/module-c/pom.xml
@@ -40,7 +40,7 @@ under the License.
             ${project.version}
         
     
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-5768-cli-execution-id/pom.xml b/its/core-it-suite/src/test/resources/mng-5768-cli-execution-id/pom.xml
index a138eb8781..712c1c7e44 100644
--- a/its/core-it-suite/src/test/resources/mng-5768-cli-execution-id/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5768-cli-execution-id/pom.xml
@@ -26,7 +26,7 @@ under the License.
   test
   1
 
-  Maven Integration Test :: MNG-5768 
+  Maven Integration Test :: MNG-5768
   
     Verify that plugin execution id can be specified from command line.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/client/pom.xml b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/client/pom.xml
index b4048e9f66..fa398ca695 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/client/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/client/pom.xml
@@ -30,7 +30,7 @@ under the License.
   Maven Integration Test :: it-core-extensions
   
     Verify that Maven loads core extensions and components contributed by the extensions are available to regular
-    plugins. 
+    plugins.
   
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions-no-descriptor/pom.xml b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions-no-descriptor/pom.xml
index 5183fdfcab..f4e9f5d6d5 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions-no-descriptor/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions-no-descriptor/pom.xml
@@ -31,8 +31,8 @@ under the License.
   
     Maven core extensions components
   
-  
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions/pom.xml b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions/pom.xml
index 6fba8095c4..c2da347a7e 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-core-extensions/pom.xml
@@ -31,8 +31,8 @@ under the License.
   
     Maven core extensions components
   
-  
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-plugin-core-extensions-client/pom.xml b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-plugin-core-extensions-client/pom.xml
index dcedb51d5a..7b392ba2b2 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-plugin-core-extensions-client/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo-src/maven-it-plugin-core-extensions-client/pom.xml
@@ -32,7 +32,7 @@ under the License.
     Maven plugin that fails if expected components were not contributed by the core extension
   
 
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom
index 5183fdfcab..f4e9f5d6d5 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom
@@ -31,8 +31,8 @@ under the License.
   
     Maven core extensions components
   
-  
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom.sha1
index a8ee210f8c..b9b9e7b41e 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom.sha1
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions-no-descriptor/0.1/maven-it-core-extensions-no-descriptor-0.1.pom.sha1
@@ -1 +1 @@
-db764e765a0580beb29ef4d0e74b56f88928887e
\ No newline at end of file
+88a9ea10005b24ebe90b38cd30dffdc435b126e8
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
index 6fba8095c4..c2da347a7e 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
@@ -31,8 +31,8 @@ under the License.
   
     Maven core extensions components
   
-  
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom.sha1
index 967edecb9a..5945b3d9a6 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom.sha1
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom.sha1
@@ -1 +1 @@
-c57dc48d0a7e242faec365d9324cac5cd16f3a99
\ No newline at end of file
+8585d6a605ef22f8ba8674c193e774fc71b38941
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom
index dcedb51d5a..7b392ba2b2 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom
@@ -32,7 +32,7 @@ under the License.
     Maven plugin that fails if expected components were not contributed by the core extension
   
 
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom.sha1
index 51b7f0a31a..12a6eaf750 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom.sha1
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/repo/org/apache/maven/its/it-core-extensions/maven-it-plugin-core-extensions-client/0.1/maven-it-plugin-core-extensions-client-0.1.pom.sha1
@@ -1 +1 @@
-c33a9d78008055a9d826da70d62dc427a22d7337
\ No newline at end of file
+520e6cd05914cf86eae16861af23d00a854262a3
diff --git a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
index 60b8305de5..a338822c28 100644
--- a/its/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
+++ b/its/core-it-suite/src/test/resources/mng-5771-core-extensions/settings-template-mirror-auth.xml
@@ -1,12 +1,12 @@
 
-          
+  
     
       repoman
       maven
       secret
     
   
-  
+
   
     
       repoman
@@ -15,7 +15,7 @@
       external:*
     
   
-  
+
   
     
       development
diff --git a/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/.mvn/extensions.xml b/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/.mvn/extensions.xml
index 6e130c4743..80c0ec4a52 100644
--- a/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/.mvn/extensions.xml
+++ b/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/.mvn/extensions.xml
@@ -23,6 +23,6 @@ under the License.
   
     org.apache.maven.its.it-configuration-processors
     maven-it-configuration-processor-one
-    0.1  
+    0.1
   
 
diff --git a/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/pom.xml b/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/pom.xml
index 74cf1e437e..6e7109b369 100644
--- a/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-one-processor-valid/pom.xml
@@ -30,7 +30,7 @@ under the License.
   Maven Integration Test :: it-core-extensions
   
     Verify that Maven loads core extensions and components contributed by the extensions are available to regular
-    plugins. 
+    plugins.
   
 
   
@@ -38,8 +38,8 @@ under the License.
       
         src/main/resources
         true
-        
+      
     
   
-  
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-two-processors-invalid/pom.xml b/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-two-processors-invalid/pom.xml
index 8613bfb5c5..890505697f 100644
--- a/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-two-processors-invalid/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5774-configuration-processors/build-with-two-processors-invalid/pom.xml
@@ -30,7 +30,7 @@ under the License.
   Maven Integration Test :: it-core-extensions
   
     Verify that Maven loads core extensions and components contributed by the extensions are available to regular
-    plugins. 
+    plugins.
   
 
 
diff --git a/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/pom.xml b/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/pom.xml
index 8c53363270..36647b0f7b 100644
--- a/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration/pom.xml
@@ -27,7 +27,7 @@ under the License.
   mng-5805-pkg-type-mojo-configuration-project
   0.1
   mng5805
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml b/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml
index b7e12f15fc..927a8fc459 100644
--- a/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5805-pkg-type-mojo-configuration2/pom.xml
@@ -27,7 +27,7 @@ under the License.
   mng-5805-pkg-type-mojo-configuration-project2
   0.1
   mng5805
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent/pom.xml
index be57d3024a..fb3e50e9dd 100644
--- a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-negative/parent/pom.xml
@@ -8,7 +8,7 @@
   pom
 
   
-      
+    
   
 
 
diff --git a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent/pom.xml
index 773a082d60..c4c0b470ad 100644
--- a/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5840-relative-path-range-positive/parent/pom.xml
@@ -8,7 +8,7 @@
   pom
 
   
-    true  
+    true
   
 
 
diff --git a/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent/pom.xml b/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent/pom.xml
index 4caa7771e1..87eef90697 100644
--- a/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5840-relative-path-reactor-matching/parent/pom.xml
@@ -8,7 +8,7 @@
   pom
 
   
-      
+    
   
 
 
diff --git a/its/core-it-suite/src/test/resources/mng-5868/src/main/java/org/apache/maven/its/mng5338/App.java b/its/core-it-suite/src/test/resources/mng-5868/src/main/java/org/apache/maven/its/mng5338/App.java
index fd3f646a63..5329396220 100644
--- a/its/core-it-suite/src/test/resources/mng-5868/src/main/java/org/apache/maven/its/mng5338/App.java
+++ b/its/core-it-suite/src/test/resources/mng-5868/src/main/java/org/apache/maven/its/mng5338/App.java
@@ -23,7 +23,7 @@ package org.apache.maven.its.mng5338;
  * Hello world!
  *
  */
-public class App 
+public class App
 {
     public static void main( String[] args )
     {
diff --git a/its/core-it-suite/src/test/resources/mng-5889-find.mvn/pom.xml b/its/core-it-suite/src/test/resources/mng-5889-find.mvn/pom.xml
index 1495879ebf..54375a563f 100644
--- a/its/core-it-suite/src/test/resources/mng-5889-find.mvn/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5889-find.mvn/pom.xml
@@ -27,7 +27,7 @@ under the License.
   1
   pom
 
-  Maven Integration Test :: MNG-5889 
+  Maven Integration Test :: MNG-5889
   
     Verify that path/to/.mvn directory is found when using -f/--file path/to/[module/]pom.xml.
   
diff --git a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml
index ac532d3ed5..5a7dabeb29 100644
--- a/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5895-ci-friendly-usage-with-property/module-2/pom.xml
@@ -1,14 +1,14 @@
 
 
-
 
 
 
-
 
 test
   1
 
-  Maven Integration Test :: MNG-5937 
+  Maven Integration Test :: MNG-5937
 
 
diff --git a/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/bad/pom.xml b/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/bad/pom.xml
index d565ae0298..5ebe8c37ea 100644
--- a/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/bad/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/bad/pom.xml
@@ -27,7 +27,7 @@ under the License.
   mng-5958-lifecycle-phases-project
   0.1
   mng5958-bad
-  
+
   
     
       
@@ -49,5 +49,5 @@ under the License.
       
     
   
-  
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/good/pom.xml b/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/good/pom.xml
index 0419dcd109..64558f889b 100644
--- a/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/good/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-5958-lifecycle-phases/good/pom.xml
@@ -27,7 +27,7 @@ under the License.
   mng-5958-lifecycle-phases-project
   0.1
   mng5958-good
-  
+
   
     
       
@@ -49,5 +49,5 @@ under the License.
       
     
   
-  
+
 
diff --git a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml
index 5b99f84cb1..1dae572901 100644
--- a/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6090-ci-friendly/module-2/pom.xml
@@ -1,14 +1,14 @@
 
 
-
 
 
 
-
 
 
     Check that using maven-site-plugin reportPlugins parameter causes a warning.
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml
index 9cd5adb0a6..4e6a49cb89 100644
--- a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/client/pom.xml
@@ -30,7 +30,7 @@ under the License.
   Maven Integration Test :: it-core-extensions-custom-scopes
   
     Verify that Maven loads core extensions and components contributed by the extensions are available to regular
-    plugins. 
+    plugins.
   
 
   
diff --git a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml
index e2e1c18087..bcd2a695b0 100644
--- a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-core-extensions/pom.xml
@@ -31,8 +31,8 @@ under the License.
   
     Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes
   
-  
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml
index 5b65b0cff8..6e1adfde9a 100644
--- a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo-src/maven-it-plugin/pom.xml
@@ -32,7 +32,7 @@ under the License.
     Maven plugin that fails if expected components were not contributed by the core extension
   
 
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
index e2e1c18087..bcd2a695b0 100644
--- a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-core-extensions/0.1/maven-it-core-extensions-0.1.pom
@@ -31,8 +31,8 @@ under the License.
   
     Maven core extensions components that use @SessionScope and @MojoExecutionScope Guice scopes
   
-  
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom
index 5b65b0cff8..6e1adfde9a 100644
--- a/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-6210-core-extensions-scopes/repo/org/apache/maven/its/6210-core-extensions-scopes/maven-it-plugin/0.1/maven-it-plugin-0.1.pom
@@ -32,7 +32,7 @@ under the License.
     Maven plugin that fails if expected components were not contributed by the core extension
   
 
-  
 
diff --git a/its/core-it-suite/src/test/resources/mng-6562-default-bindings/pom.xml b/its/core-it-suite/src/test/resources/mng-6562-default-bindings/pom.xml
index 1384e36339..08bf499b6c 100644
--- a/its/core-it-suite/src/test/resources/mng-6562-default-bindings/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6562-default-bindings/pom.xml
@@ -27,11 +27,11 @@ under the License.
   0.1
 
   Maven Integration Test :: MNG-6562
-  
+
   
     UTF-8
   
-  
+
   
     
       
diff --git a/its/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml b/its/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
index 7971a94f08..bdb977a557 100644
--- a/its/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6566-execute-annotation-should-not-re-execute-goals/plugin/pom.xml
@@ -22,7 +22,7 @@ under the License.
 
   4.0.0
-  
+
   org.apache.maven.its.mng6566
   plugin
   1.0-SNAPSHOT
diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml
index 1455523481..5060c68b57 100644
--- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml
index f162121096..e2219e3e51 100644
--- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml
index 08baf8e76e..4c19d0d584 100644
--- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-weather/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml
index 9e9c0874ce..776d54d07b 100644
--- a/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6656-buildconsumer/simple-parent/simple-webapp/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom b/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom
index 5cc34864a9..43874119b2 100644
--- a/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom
@@ -21,12 +21,12 @@ under the License.
 
 
     4.0.0
-    
+
     org.apache.maven.its.mng6772
     b
     0.1
     pom
-    
+
     
         
             
diff --git a/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5 b/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5
index 15500e358b..df3058c971 100644
--- a/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5
+++ b/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5
@@ -1 +1 @@
-8c5db55c9360e70f15538d3f4ccae344
\ No newline at end of file
+41e65e1263946b235faf620172565687
diff --git a/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1
index 67db62a23e..a1ccf35054 100644
--- a/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1
+++ b/its/core-it-suite/src/test/resources/mng-6772-override-in-dependency/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1
@@ -1 +1 @@
-2bf91d3ebd6018cb572c2cfe4aa23adcf0338b96
\ No newline at end of file
+d2c3318bde4e19f9b4d8aedd01bf2edf061f73b9
diff --git a/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom b/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom
index 5cc34864a9..43874119b2 100644
--- a/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom
+++ b/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom
@@ -21,12 +21,12 @@ under the License.
 
 
     4.0.0
-    
+
     org.apache.maven.its.mng6772
     b
     0.1
     pom
-    
+
     
         
             
diff --git a/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5 b/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5
index 15500e358b..df3058c971 100644
--- a/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5
+++ b/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.md5
@@ -1 +1 @@
-8c5db55c9360e70f15538d3f4ccae344
\ No newline at end of file
+41e65e1263946b235faf620172565687
diff --git a/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1 b/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1
index 67db62a23e..a1ccf35054 100644
--- a/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1
+++ b/its/core-it-suite/src/test/resources/mng-6772-override-in-project/repo/org/apache/maven/its/mng6772/b/0.1/b-0.1.pom.sha1
@@ -1 +1 @@
-2bf91d3ebd6018cb572c2cfe4aa23adcf0338b96
\ No newline at end of file
+d2c3318bde4e19f9b4d8aedd01bf2edf061f73b9
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml
index 5acb7934ed..46c4767b96 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
index fb098e09b2..1d428c00af 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
index b9b32a4a87..3fab2e680b 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-testutils/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
index 4a1873c2e6..800d680633 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-weather/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
index 9e18a21175..b1068b7ce2 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/simple-webapp/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
index deb03d6702..d1d0c6ea98 100644
--- a/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
+++ b/its/core-it-suite/src/test/resources/mng-6957-buildconsumer/simple-parent/utils-parent/pom.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-
   4.0.0
diff --git a/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java b/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java
index b63f954e1c..c8bdd68ba2 100644
--- a/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java
+++ b/its/core-it-support/core-it-component/src/main/java/org/apache/maven/coreit/component/StatefulSingleton.java
@@ -23,7 +23,7 @@ import java.io.File;
 import java.io.IOException;
 
 /**
- * 
+ *
  */
 public interface StatefulSingleton
 {
diff --git a/its/core-it-support/core-it-javaagent/src/main/java/org/apache/maven/coreits/javaagent/mng5669/Premain.java b/its/core-it-support/core-it-javaagent/src/main/java/org/apache/maven/coreits/javaagent/mng5669/Premain.java
index ea4420f1c6..eece1490e3 100644
--- a/its/core-it-support/core-it-javaagent/src/main/java/org/apache/maven/coreits/javaagent/mng5669/Premain.java
+++ b/its/core-it-support/core-it-javaagent/src/main/java/org/apache/maven/coreits/javaagent/mng5669/Premain.java
@@ -32,7 +32,7 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.commons.AdviceAdapter;
 
 /**
- * 
+ *
  * @author Robert Scholte
  *
  */
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java
index 77332db81b..6b6907f7aa 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/CheckMojo.java
@@ -34,10 +34,10 @@ import java.util.Properties;
 
 /**
  * Checks the general retrieval of components from active component collections.
- * 
+ *
  * @goal check
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class CheckMojo
@@ -46,7 +46,7 @@ public class CheckMojo
 
     /**
      * Project base directory used for manual path alignment.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @readonly
      */
@@ -54,28 +54,28 @@ public class CheckMojo
 
     /**
      * The available components, as a map.
-     * 
+     *
      * @component role="org.apache.maven.plugin.coreit.Component"
      */
     private Map componentMap;
 
     /**
      * The available components, as a list.
-     * 
+     *
      * @component role="org.apache.maven.plugin.coreit.Component"
      */
     private List componentList;
 
     /**
      * The path to the properties file to create.
-     * 
+     *
      * @parameter property="collections.outputFile"
      */
     private File outputFile;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoFailureException If the output file could not be created.
      */
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/Component.java b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/Component.java
index c71b74809a..70f69048b9 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/Component.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/Component.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A simple interface for our test components.
- * 
+ *
  * @author Benjamin Bentmann
  */
 public interface Component
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
index f9ef388870..e218dc4f84 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-active-collection/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A simple test component.
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class DefaultComponent
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
index 7a9c620406..20747be4fb 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-all/src/main/java/org/apache/maven/plugin/coreit/AggregatorDependenciesMojo.java
@@ -37,7 +37,7 @@ public class AggregatorDependenciesMojo
 
     /**
      * The path to the touch file, relative to the project's base directory.
-     * 
+     *
      * @parameter property="aggregator.touchFile" default-value="${project.build.directory}/touch.txt"
      */
     private File touchFile;
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml
index 14fe67110c..8783cd2927 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-ant-based/src/main/scripts/touch.mojos.xml
@@ -26,7 +26,7 @@ under the License.
       true
       
         
-          touch.outputFile 
+          touch.outputFile
           outputFile
           target/touch.txt
           java.io.File
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 79ebb88e2d..a04fa38a5a 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
@@ -28,7 +28,7 @@ import java.util.Collection;
 
 /**
  * Provides common code for the install and deploy mojos.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -38,7 +38,7 @@ public abstract class AbstractRepoMojo
 
     /**
      * The project's main artifact.
-     * 
+     *
      * @parameter default-value="${project.artifact}"
      * @readonly
      * @required
@@ -47,7 +47,7 @@ public abstract class AbstractRepoMojo
 
     /**
      * The project's attached artifact.
-     * 
+     *
      * @parameter default-value="${project.attachedArtifacts}"
      * @readonly
      * @required
@@ -56,7 +56,7 @@ public abstract class AbstractRepoMojo
 
     /**
      * The packaging of the project.
-     * 
+     *
      * @parameter default-value="${project.packaging}"
      * @required
      * @readonly
@@ -65,7 +65,7 @@ public abstract class AbstractRepoMojo
 
     /**
      * The POM file of the project.
-     * 
+     *
      * @parameter default-value="${project.file}"
      * @required
      * @readonly
@@ -74,7 +74,7 @@ public abstract class AbstractRepoMojo
 
     /**
      * The local repository.
-     * 
+     *
      * @parameter default-value="${localRepository}"
      * @readonly
      * @required
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 c48498836f..6e18632bf9 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
@@ -29,10 +29,10 @@ import java.io.File;
 
 /**
  * Attaches a secondary artifact to the current project. This mimics source/javadoc attachments or other assemblies.
- * 
+ *
  * @goal attach
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class AttachMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @readonly
      * @required
@@ -51,14 +51,14 @@ public class AttachMojo
 
     /**
      * The Maven project helper.
-     * 
+     *
      * @component
      */
     private MavenProjectHelper helper;
 
     /**
      * The path to the file to attach, relative to the project base directory. The plugin will not validate this path.
-     * 
+     *
      * @parameter property="artifact.attachedFile"
      * @required
      */
@@ -66,7 +66,7 @@ public class AttachMojo
 
     /**
      * The type of the artifact to attach.
-     * 
+     *
      * @parameter property="artifact.artifactType"
      */
     private String artifactType;
@@ -74,14 +74,14 @@ public class AttachMojo
     /**
      * The classifier for the attached artifact. If unspecified, the default classifier for the specified artifact type
      * is used.
-     * 
+     *
      * @parameter property="artifact.artifactClassifier"
      */
     private String artifactClassifier;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoFailureException If the attached file has not been set.
      */
     public void execute()
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 2867080099..58b92b5848 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
@@ -30,10 +30,10 @@ import java.io.File;
 
 /**
  * Attaches a POM to the main artifact.
- * 
+ *
  * @goal attach-pom
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -43,7 +43,7 @@ public class AttachPomMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @readonly
      * @required
@@ -53,7 +53,7 @@ public class AttachPomMojo
     /**
      * The path to the POM file to attach to the main artifact, relative to the project base directory. The plugin will
      * not validate this path.
-     * 
+     *
      * @parameter property="artifact.pomFile" default-value="${project.file.path}"
      * @required
      */
@@ -61,7 +61,7 @@ public class AttachPomMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoFailureException If the artifact file has not been set.
      */
     public void execute()
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 2591d92da7..df1d064608 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
@@ -33,10 +33,10 @@ import java.io.File;
 
 /**
  * Deploys a user-supplied file to some repository. This mimics part of the Maven Deploy Plugin.
- * 
+ *
  * @goal deploy-file
  * @requiresProject false
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -46,77 +46,77 @@ public class DeployFileMojo
 
     /**
      * The file of the artifact to deploy.
-     * 
+     *
      * @parameter property="file"
      */
     private File file;
 
     /**
      * The group id of the artifact.
-     * 
+     *
      * @parameter property="groupId"
      */
     private String groupId;
 
     /**
      * The artifact id of the artifact.
-     * 
+     *
      * @parameter property="artifactId"
      */
     private String artifactId;
 
     /**
      * The version of the artifact.
-     * 
+     *
      * @parameter property="version"
      */
     private String version;
 
     /**
      * The URL of the repository to deploy to.
-     * 
+     *
      * @parameter property="repositoryUrl"
      */
     private String repositoryUrl;
 
     /**
      * The ID of the repository to deploy to.
-     * 
+     *
      * @parameter property="repositoryId"
      */
     private String repositoryId;
 
     /**
      * The repository factory.
-     * 
+     *
      * @component
      */
     private ArtifactRepositoryFactory repositoryFactory;
 
     /**
      * The repository layout.
-     * 
+     *
      * @component roleHint="default"
      */
     private ArtifactRepositoryLayout repositoryLayout;
 
     /**
      * The artifact factory.
-     * 
+     *
      * @component
      */
     private ArtifactFactory artifactFactory;
 
     /**
      * The artifact deployer.
-     * 
+     *
      * @component
      */
     private ArtifactDeployer deployer;
 
     /**
      * The local repository.
-     * 
+     *
      * @parameter default-value="${localRepository}"
      * @readonly
      * @required
@@ -125,7 +125,7 @@ public class DeployFileMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If any artifact could not be deployed.
      */
     public void execute()
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 789674fd59..26791977ed 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
@@ -26,9 +26,9 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Installs the project artifacts into a local repository with a custom base directory and a custom layout.
- * 
+ *
  * @goal install-custom
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -43,14 +43,14 @@ public class InstallCustomMojo
 
     /**
      * The base directory of the local repository to install to.
-     * 
+     *
      * @parameter property="install.localRepoDir"
      */
     private File localRepoDir;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If any artifact could not be installed.
      */
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/LatestMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/LatestMojo.java
index c8c56bee5e..dfdcc07547 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/LatestMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-artifact/src/main/java/org/apache/maven/plugin/coreit/LatestMojo.java
@@ -27,10 +27,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Marks the project's artifact as the latest version.
- * 
+ *
  * @goal latest
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class LatestMojo
@@ -39,7 +39,7 @@ public class LatestMojo
 
     /**
      * The main project artifact.
-     * 
+     *
      * @parameter default-value="${project.artifact}"
      * @readonly
      * @required
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 5e51f25736..b0545b7d8e 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
@@ -27,10 +27,10 @@ import org.apache.maven.project.MavenProject;
 
 /**
  * Marks the project's artifact as a release.
- * 
+ *
  * @goal release
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -40,7 +40,7 @@ public class ReleaseMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @readonly
      * @required
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 acabcf72d1..c166f0c3b8 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
@@ -30,10 +30,10 @@ import java.io.File;
 /**
  * Sets the main artifact's file. This is the essence of the Maven JAR Plugin and all the other packaging plugins.
  * Creating the actual file for the main artifact is a specific plugin job and not related to the Maven core.
- * 
+ *
  * @goal set
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -43,7 +43,7 @@ public class SetMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @readonly
      * @required
@@ -53,7 +53,7 @@ public class SetMojo
     /**
      * The path to the file to set as the main artifact, relative to the project base directory. The plugin will not
      * validate this path.
-     * 
+     *
      * @parameter property="artifact.mainFile"
      * @required
      */
@@ -61,7 +61,7 @@ public class SetMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoFailureException If the artifact file has not been set.
      */
     public void execute()
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 39490c5288..345ff4f475 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
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A test class that is unique to this artifact.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
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 ce1f091706..66ff79a988 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
@@ -22,7 +22,7 @@ package org.apache.maven.plugin.coreit;
 /**
  * A test class that is not unique to this artifact. Other artifacts will deliberately contain an equally named
  * class (with different members) to check class path ordering of dependencies.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
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 e3625eb7c2..4ba9301343 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
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A test class that is unique to this artifact.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
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 624dab1832..58c4e8ed9e 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
@@ -22,7 +22,7 @@ package org.apache.maven.plugin.coreit;
 /**
  * A test class that is not unique to this artifact. Other artifacts will deliberately contain an equally named
  * class (with different members) to check class path ordering of dependencies.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
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/Component.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/Component.java
index c71b74809a..70f69048b9 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/Component.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/Component.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A simple interface for our test components.
- * 
+ *
  * @author Benjamin Bentmann
  */
 public interface Component
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 bea3e2237e..f15620e728 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
@@ -30,11 +30,11 @@ import java.util.List;
 /**
  * Loads classes and/or resources from a custom class loader that holds the project dependencies and records the results
  * in a properties file.
- * 
+ *
  * @goal load-dependencies
  * @phase initialize
  * @requiresDependencyResolution compile
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -44,7 +44,7 @@ public class LoadDependenciesMojo
 
     /**
      * The project's class path to load classes/resources from.
-     * 
+     *
      * @parameter default-value="${project.compileClasspathElements}"
      * @readonly
      */
@@ -53,14 +53,14 @@ public class LoadDependenciesMojo
     /**
      * The path to the properties file used to track the results of the class/resource loading via the project class
      * loader.
-     * 
+     *
      * @parameter property="clsldr.projectClassLoaderOutput"
      */
     private File projectClassLoaderOutput;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
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 f323f059fe..7702a1c436 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
@@ -25,10 +25,10 @@ import java.io.File;
 
 /**
  * Loads classes and/or resources from the plugin class path and records the results in a properties file.
- * 
+ *
  * @goal load
  * @phase initialize
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -39,7 +39,7 @@ public class LoadMojo
     /**
      * The path to the properties file used to track the results of the class/resource loading via the plugin class
      * loader.
-     * 
+     *
      * @parameter property="clsldr.pluginClassLoaderOutput"
      */
     private File pluginClassLoaderOutput;
@@ -47,14 +47,14 @@ public class LoadMojo
     /**
      * The path to the properties file used to track the results of the class/resource loading via the thread's context
      * class loader.
-     * 
+     *
      * @parameter property="clsldr.contextClassLoaderOutput"
      */
     private File contextClassLoaderOutput;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
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 332dcc759b..dbdff7ff15 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
@@ -29,7 +29,7 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Assists in handling properties.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
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 b96b602dac..5754dd43c6 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
@@ -30,10 +30,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Appends this mojo's configuration into a properties file.
- * 
+ *
  * @goal append-config
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -43,7 +43,7 @@ public class AppendConfigMojo
 
     /**
      * The current project's base directory, used for path alignment.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @readonly
      */
@@ -52,7 +52,7 @@ public class AppendConfigMojo
     /**
      * The path to the properties file into which to save the mojo configuration. Note: This intentionally uses
      * another parameter name for the output file than {@link ConfigMojo}.
-     * 
+     *
      * @parameter property="config.outputFile"
      */
     private File outputFile;
@@ -60,70 +60,70 @@ public class AppendConfigMojo
     /**
      * A parameter with a constant default value. Note: This has intentionally a different default value than
      * the equally named parameter from {@link ConfigMojo}.
-     * 
+     *
      * @parameter default-value="test"
      */
     private String defaultParam;
 
     /**
      * A simple parameter of type {@link java.lang.String}.
-     * 
+     *
      * @parameter property="config.stringParam"
      */
     private String stringParam;
 
     /**
      * A simple parameter of type {@link java.io.File}.
-     * 
+     *
      * @parameter property="config.fileParam"
      */
     private File fileParam;
 
     /**
      * An array parameter of component type {@link java.lang.String}.
-     * 
+     *
      * @parameter
      */
     private String[] stringParams;
 
     /**
      * An array parameter of component type {@link java.io.File}.
-     * 
+     *
      * @parameter
      */
     private File[] fileParams;
 
     /**
      * A collection parameter of type {@link java.util.List}.
-     * 
+     *
      * @parameter
      */
     private List listParam;
 
     /**
      * A collection parameter of type {@link java.util.Set}.
-     * 
+     *
      * @parameter
      */
     private Set setParam;
 
     /**
      * A collection parameter of type {@link java.util.Map}.
-     * 
+     *
      * @parameter
      */
     private Map mapParam;
 
     /**
      * A collection parameter of type {@link java.util.Properties}.
-     * 
+     *
      * @parameter
      */
     private Properties propertiesParam;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
@@ -154,7 +154,7 @@ public class AppendConfigMojo
 
     /**
      * Dumps the mojo configuration into the specified properties.
-     * 
+     *
      * @param props The properties to dump the configuration into, must not be null.
      */
     private void dumpConfiguration( Properties props )
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 3f2303468e..8529d3a8dc 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
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A bean to receive mojo configuration.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
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 a295c68ec1..614f79b3d2 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
@@ -29,10 +29,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Dumps this mojo's configuration into a properties file.
- * 
+ *
  * @goal cli-config
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class CliConfigMojo
 
     /**
      * The current project's base directory, used for path alignment.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @readonly
      */
@@ -50,56 +50,56 @@ public class CliConfigMojo
 
     /**
      * The path to the properties file into which to save the mojo configuration.
-     * 
+     *
      * @parameter property="config.propertiesFile"
      */
     private File propertiesFile;
 
     /**
      * A simple parameter of type {@link java.lang.String}.
-     * 
+     *
      * @parameter property="config.stringParam"
      */
     private String stringParam;
 
     /**
      * A simple parameter of type {@link java.io.File}.
-     * 
+     *
      * @parameter property="config.fileParam"
      */
     private File fileParam;
 
     /**
      * An array parameter of component type {@link java.lang.String}.
-     * 
+     *
      * @parameter property="config.stringParams"
      */
     private String[] stringParams;
 
     /**
      * An array parameter of component type {@link java.io.File}.
-     * 
+     *
      * @parameter property="config.fileParams"
      */
     private File[] fileParams;
 
     /**
      * A collection parameter of type {@link java.util.List}.
-     * 
+     *
      * @parameter property="config.listParam"
      */
     private List listParam;
 
     /**
      * A collection parameter of type {@link java.util.Set}.
-     * 
+     *
      * @parameter property="config.setParam"
      */
     private Set setParam;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
@@ -130,7 +130,7 @@ public class CliConfigMojo
 
     /**
      * Dumps the mojo configuration into the specified properties.
-     * 
+     *
      * @param props The properties to dump the configuration into, must not be null.
      */
     private void dumpConfiguration( Properties props )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java
index c295209592..1d5a0e45b8 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/CustomComponentConfigurator.java
@@ -31,7 +31,7 @@ import org.codehaus.plexus.configuration.PlexusConfiguration;
 /**
  * A custom component configurator. Does not do much special compared to the basic one, but is sufficient to check
  * general support of the specific API.
- * 
+ *
  * @author Benjamin Bentmann
  */
 @Component ( role = org.codehaus.plexus.component.configurator.ComponentConfigurator.class, hint = "coreit" )
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 3fc60eea74..bbff02fd26 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
@@ -30,11 +30,11 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Dumps this mojo's configuration into a properties file. Note that this mojo uses a custom component configurator.
- * 
+ *
  * @goal custom-config
  * @phase validate
  * @configurator coreit
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -44,7 +44,7 @@ public class CustomConfigMojo
 
     /**
      * The current project's base directory, used for path alignment.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @readonly
      */
@@ -52,14 +52,14 @@ public class CustomConfigMojo
 
     /**
      * The path to the properties file into which to save the mojo configuration.
-     * 
+     *
      * @parameter property="config.propertiesFile"
      */
     private File propertiesFile;
 
     /**
      * A parameter being set only by the custom configurator as a proof of its execution.
-     * 
+     *
      * @parameter
      */
     String customParam;
@@ -67,70 +67,70 @@ public class CustomConfigMojo
     /**
      * A parameter with a constant default value. Note: This has intentionally a different default value than
      * the equally named parameter from {@link ConfigMojo}.
-     * 
+     *
      * @parameter default-value="test"
      */
     private String defaultParam;
 
     /**
      * A simple parameter of type {@link java.lang.String}.
-     * 
+     *
      * @parameter property="config.stringParam"
      */
     private String stringParam;
 
     /**
      * A simple parameter of type {@link java.io.File}.
-     * 
+     *
      * @parameter property="config.fileParam"
      */
     private File fileParam;
 
     /**
      * An array parameter of component type {@link java.lang.String}.
-     * 
+     *
      * @parameter
      */
     private String[] stringParams;
 
     /**
      * An array parameter of component type {@link java.io.File}.
-     * 
+     *
      * @parameter
      */
     private File[] fileParams;
 
     /**
      * A collection parameter of type {@link java.util.List}.
-     * 
+     *
      * @parameter
      */
     private List listParam;
 
     /**
      * A collection parameter of type {@link java.util.Set}.
-     * 
+     *
      * @parameter
      */
     private Set setParam;
 
     /**
      * A collection parameter of type {@link java.util.Map}.
-     * 
+     *
      * @parameter
      */
     private Map mapParam;
 
     /**
      * A collection parameter of type {@link java.util.Properties}.
-     * 
+     *
      * @parameter
      */
     private Properties propertiesParam;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
@@ -161,7 +161,7 @@ public class CustomConfigMojo
 
     /**
      * Dumps the mojo configuration into the specified properties.
-     * 
+     *
      * @param props The properties to dump the configuration into, must not be null.
      */
     private void dumpConfiguration( Properties props )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java
index 7081f62f0b..75ae9d63dd 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-configuration/src/main/java/org/apache/maven/plugin/coreit/RequiredConfigMojo.java
@@ -27,10 +27,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Dumps this mojo's configuration into a properties file.
- * 
+ *
  * @goal required-config
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class RequiredConfigMojo
@@ -39,7 +39,7 @@ public class RequiredConfigMojo
 
     /**
      * The current project's base directory, used for path alignment.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @readonly
      */
@@ -47,14 +47,14 @@ public class RequiredConfigMojo
 
     /**
      * The path to the properties file into which to save the mojo configuration.
-     * 
+     *
      * @parameter property="config.propertiesFile"
      */
     private File propertiesFile;
 
     /**
      * A required parameter to be set via plugin configuration in POM or system property from CLI.
-     * 
+     *
      * @parameter property="config.requiredParam"
      * @required
      */
@@ -62,7 +62,7 @@ public class RequiredConfigMojo
 
     /**
      * A required parameter that defaults to a non-mandatory value from the POM.
-     * 
+     *
      * @parameter default-value="${project.url}"
      * @required
      */
@@ -70,7 +70,7 @@ public class RequiredConfigMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
@@ -101,7 +101,7 @@ public class RequiredConfigMojo
 
     /**
      * Dumps the mojo configuration into the specified properties.
-     * 
+     *
      * @param props The properties to dump the configuration into, must not be null.
      */
     private void dumpConfiguration( Properties props )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
index cd891ad779..930873c2fc 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/CatchMojo.java
@@ -30,7 +30,7 @@ import java.io.Writer;
 /**
  * "Catch" a parameter "thrown" by the ThrowMojo through the plugin context, and
  * write a file based on it's value to the build output directory.
- * 
+ *
  * @goal catch
  */
 public class CatchMojo
@@ -43,12 +43,12 @@ public class CatchMojo
      * @readonly
      */
     private File outDir;
-    
+
     public File getOutDir()
     {
         return outDir;
     }
-    
+
     public void setOutDir( File outDir )
     {
         this.outDir = outDir;
@@ -63,16 +63,16 @@ public class CatchMojo
         {
             outDir.mkdirs();
         }
-        
+
         File outfile = new File( outDir, value );
 
         Writer writer = null;
         try
         {
             writer = new FileWriter( outfile );
-            
+
             writer.write( value );
-            
+
             writer.flush();
         }
         catch ( IOException e )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
index 685b9a752c..d0f485b99f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-context-passing/src/main/java/org/apache/maven/plugin/coreit/ThrowMojo.java
@@ -23,32 +23,32 @@ import org.apache.maven.plugin.AbstractMojo;
 import org.apache.maven.plugin.MojoExecutionException;
 
 /**
- * "Throw" a parameter into the plugin context, for the "catch" mojo to 
+ * "Throw" a parameter into the plugin context, for the "catch" mojo to
  * pickup and process.
- * 
+ *
  * @goal throw
  */
 public class ThrowMojo
     extends AbstractMojo
 {
-    
+
     public static final String THROWN_PARAMETER = "throw-parameter";
 
     /**
      * @parameter property="value" default-value="thrown"
      */
     private String value;
-    
+
     public void setValue( String value )
     {
         this.value = value;
     }
-    
+
     public String getValue()
     {
         return value;
     }
-    
+
     public void execute()
         throws MojoExecutionException
     {
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 62fbb2dc2a..52ddbca792 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal clean
  * @phase clean
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class CleanMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class CleanMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/clean-clean.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 118f0080ff..440181b676 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal compile
  * @phase compile
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class CompileMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class CompileMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/compiler-compile.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 cc0d78d606..8d5f1196c4 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal testCompile
  * @phase test-compile
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class TestCompileMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class TestCompileMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/compiler-test-compile.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 04ac241645..76c17e9ccb 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal deploy
  * @phase deploy
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class DeployMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class DeployMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/deploy-deploy.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 4e8281a5c6..8b8016073e 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal ear
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class EarMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class EarMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/ear-ear.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 81ef45c2c3..86362723ad 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal generate-application-xml
  * @phase generate-resources
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class GenerateApplicationXmlMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class GenerateApplicationXmlMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/ear-generate-application-xml.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 adf31ec6dc..607d58f153 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal ejb
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class EjbMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class EjbMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/ejb-ejb.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 9b07897ca0..7e85e3bf06 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal install
  * @phase install
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class InstallMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class InstallMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/install-install.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 ba7dba3b84..4c89e26373 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal jar
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class JarMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class JarMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/jar-jar.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 dfde4677bc..2e9c8d7e2b 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal jar
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class JarMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class JarMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/javadoc-jar.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 30e54e6c48..a3c2275832 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal addPluginArtifactMetadata
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class AddPluginArtifactMetadataMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class AddPluginArtifactMetadataMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/plugin-add-plugin-artifact-metadata.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 599571a8fe..3f732b5123 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal descriptor
  * @phase generate-resources
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class DescriptorMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class DescriptorMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/plugin-descriptor.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 ae5e7dd645..04fde10616 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal updateRegistry
  * @phase install
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class UpdateRegistryMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class UpdateRegistryMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/plugin-update-registry.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 ab06615726..0ac43a948d 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal rar
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class RarMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class RarMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/rar-rar.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 bd8964a3db..17cf737652 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal testResources
  * @phase process-test-resources
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class TestResourcesMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class TestResourcesMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/resources-test-resources.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 6e21b0d851..51305a1904 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal attach-descriptor
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class AttachDescriptorMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class AttachDescriptorMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/site-attach-descriptor.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 953c4ba41c..cf56c44c41 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal deploy
  * @phase site-deploy
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class DeployMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class DeployMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/site-deploy.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 da770a6c11..08ab0f9874 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal site
  * @phase site
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class SiteMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class SiteMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/site-site.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 e94854b058..9c869b8161 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal jar
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class JarMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class JarMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/source-jar.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 e70d52d708..0fca6936a9 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal test
  * @phase test
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class TestMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class TestMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/surefire-test.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 7399694698..ad23ea6978 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
@@ -29,10 +29,10 @@ import java.io.IOException;
 
 /**
  * Creates a text file in the project base directory.
- * 
+ *
  * @goal war
  * @phase package
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class WarMojo
 
     /**
      * The current Maven project.
-     * 
+     *
      * @parameter default-value="${project}"
      * @required
      * @readonly
@@ -51,14 +51,14 @@ public class WarMojo
 
     /**
      * The path to the output file, relative to the project base directory directory.
-     * 
+     *
      * @parameter
      */
     private String pathname = "target/war-war.txt";
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
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 055eb312a8..13d42c014a 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
@@ -24,10 +24,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Creates text files that list the dependencies with scope compile in the order returned from the Maven core.
- * 
+ *
  * @goal compile
  * @requiresDependencyCollection compile
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -40,7 +40,7 @@ public class CompileMojo
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
      * that do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.projectArtifacts"
      */
     private String projectArtifacts;
@@ -49,14 +49,14 @@ public class CompileMojo
      * The path to the output file for the compile artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.compileArtifacts"
      */
     private String compileArtifacts;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
      */
     public void execute()
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 466721f2e8..08a1042e5b 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
@@ -24,10 +24,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Creates text files that list the dependencies with scope runtime in the order returned from the Maven core.
- * 
+ *
  * @goal runtime
  * @requiresDependencyCollection runtime
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -40,7 +40,7 @@ public class RuntimeMojo
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk. Unlike the runtime artifacts, the collection of project artifacts additionally contains those artifacts
      * that do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.projectArtifacts"
      */
     private String projectArtifacts;
@@ -49,14 +49,14 @@ public class RuntimeMojo
      * The path to the output file for the runtime artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.runtimeArtifacts"
      */
     private String runtimeArtifacts;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
      */
     public void execute()
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 e470848e48..adb3da05ab 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
@@ -24,10 +24,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Creates text files that list the dependencies with scope test in the order returned from the Maven core.
- * 
+ *
  * @goal test
  * @requiresDependencyCollection test
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -40,7 +40,7 @@ public class TestMojo
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
      * do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.projectArtifacts"
      */
     private String projectArtifacts;
@@ -49,14 +49,14 @@ public class TestMojo
      * The path to the output file for the test artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.testArtifacts"
      */
     private String testArtifacts;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
      */
     public void execute()
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 e0b6021ab3..d50042dafc 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
@@ -26,10 +26,10 @@ import org.apache.maven.plugin.MojoExecutionException;
  * Creates text files that list the dependencies with scope compile in the order returned from the Maven core. The path
  * parameters of this mojo support the token @idx@ to dynamically insert a running index in order
  * to distinguish multiple executions of the same mojo.
- * 
+ *
  * @goal compile
  * @requiresDependencyResolution compile
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class CompileMojo
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
      * that do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.projectArtifacts"
      */
     private String projectArtifacts;
@@ -51,7 +51,7 @@ public class CompileMojo
      * The path to the output file for the compile artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.compileArtifacts"
      */
     private String compileArtifacts;
@@ -60,7 +60,7 @@ public class CompileMojo
      * The path to the output file for the compile class path, relative to the project base directory. Each line of
      * this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
      * will not be written to disk.
-     * 
+     *
      * @parameter property="depres.compileClassPath"
      */
     private String compileClassPath;
@@ -69,14 +69,14 @@ public class CompileMojo
      * The path to the properties file for the checksums of the compile class path elements, relative to the project
      * base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
      * the JAR. If not specified, the class path checksums will not be calculated.
-     * 
+     *
      * @parameter property="depres.compileClassPathChecksums"
      */
     private String compileClassPathChecksums;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
      */
     public void execute()
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 da2f1e5def..13f2d78f6a 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
@@ -26,10 +26,10 @@ import org.apache.maven.plugin.MojoExecutionException;
  * Creates text files that list the dependencies with scope compile and runtime in the order returned from the Maven
  * core. The path parameters of this mojo support the token @idx@ to dynamically insert a running
  * index in order to distinguish multiple executions of the same mojo.
- * 
+ *
  * @goal compile-runtime
  * @requiresDependencyResolution compile+runtime
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class CompileRuntimeMojo
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk. Unlike the compile artifacts, the collection of project artifacts additionally contains those artifacts
      * that do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.projectArtifacts"
      */
     private String projectArtifacts;
@@ -51,7 +51,7 @@ public class CompileRuntimeMojo
      * The path to the output file for the compile artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.compileArtifacts"
      */
     private String compileArtifacts;
@@ -60,7 +60,7 @@ public class CompileRuntimeMojo
      * The path to the output file for the compile class path, relative to the project base directory. Each line of
      * this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
      * will not be written to disk.
-     * 
+     *
      * @parameter property="depres.compileClassPath"
      */
     private String compileClassPath;
@@ -69,7 +69,7 @@ public class CompileRuntimeMojo
      * The path to the properties file for the checksums of the compile class path elements, relative to the project
      * base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
      * the JAR. If not specified, the class path checksums will not be calculated.
-     * 
+     *
      * @parameter property="depres.compileClassPathChecksums"
      */
     private String compileClassPathChecksums;
@@ -78,7 +78,7 @@ public class CompileRuntimeMojo
      * The path to the output file for the runtime artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.runtimeArtifacts"
      */
     private String runtimeArtifacts;
@@ -87,7 +87,7 @@ public class CompileRuntimeMojo
      * The path to the output file for the runtime class path, relative to the project base directory. Each line of
      * this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
      * will not be written to disk.
-     * 
+     *
      * @parameter property="depres.runtimeClassPath"
      */
     private String runtimeClassPath;
@@ -96,14 +96,14 @@ public class CompileRuntimeMojo
      * The path to the properties file for the checksums of the runtime class path elements, relative to the project
      * base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
      * the JAR. If not specified, the class path checksums will not be calculated.
-     * 
+     *
      * @parameter property="depres.runtimeClassPathChecksums"
      */
     private String runtimeClassPathChecksums;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
      */
     public void execute()
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 6ff2d707fe..ec2d1eab9b 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
@@ -24,10 +24,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Forks the "test" mojo to check interplay of forking and dependency resolution.
- * 
+ *
  * @goal fork-test
  * @execute goal="test"
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -37,7 +37,7 @@ public class ForkTestMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If an error occured.
      */
     public void execute()
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 0d15522f87..0d8be7f8f4 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
@@ -26,10 +26,10 @@ import org.apache.maven.plugin.MojoExecutionException;
  * Creates text files that list the dependencies with scope runtime in the order returned from the Maven core. The path
  * parameters of this mojo support the token @idx@ to dynamically insert a running index in order
  * to distinguish multiple executions of the same mojo.
- * 
+ *
  * @goal runtime
  * @requiresDependencyResolution runtime
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class RuntimeMojo
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk. Unlike the runtime artifacts, the collection of project artifacts additionally contains those artifacts
      * that do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.projectArtifacts"
      */
     private String projectArtifacts;
@@ -51,7 +51,7 @@ public class RuntimeMojo
      * The path to the output file for the runtime artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.runtimeArtifacts"
      */
     private String runtimeArtifacts;
@@ -60,7 +60,7 @@ public class RuntimeMojo
      * The path to the output file for the runtime class path, relative to the project base directory. Each line of
      * this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
      * will not be written to disk.
-     * 
+     *
      * @parameter property="depres.runtimeClassPath"
      */
     private String runtimeClassPath;
@@ -69,14 +69,14 @@ public class RuntimeMojo
      * The path to the properties file for the checksums of the runtime class path elements, relative to the project
      * base directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of
      * the JAR. If not specified, the class path checksums will not be calculated.
-     * 
+     *
      * @parameter property="depres.runtimeClassPathChecksums"
      */
     private String runtimeClassPathChecksums;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
      */
     public void execute()
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 8dbb18c6ed..85e9ebe6fa 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
@@ -26,10 +26,10 @@ import org.apache.maven.plugin.MojoExecutionException;
  * Creates text files that list the dependencies with scope test in the order returned from the Maven core. The path
  * parameters of this mojo support the token @idx@ to dynamically insert a running index in order
  * to distinguish multiple executions of the same mojo.
- * 
+ *
  * @goal test
  * @requiresDependencyResolution test
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -42,7 +42,7 @@ public class TestMojo
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk. Unlike the test artifacts, the collection of project artifacts additionally contains those artifacts that
      * do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.projectArtifacts"
      */
     private String projectArtifacts;
@@ -52,7 +52,7 @@ public class TestMojo
      * of this UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be
      * written to disk. Unlike the test artifacts, the collection of direct project artifacts additionally contains
      * those artifacts that do not contribute to the class path.
-     * 
+     *
      * @parameter property="depres.dependencyArtifacts"
      */
     private String dependencyArtifacts;
@@ -61,7 +61,7 @@ public class TestMojo
      * The path to the output file for the test artifacts, relative to the project base directory. Each line of this
      * UTF-8 encoded file specifies an artifact identifier. If not specified, the artifact list will not be written to
      * disk.
-     * 
+     *
      * @parameter property="depres.testArtifacts"
      */
     private String testArtifacts;
@@ -70,7 +70,7 @@ public class TestMojo
      * The path to the output file for the test class path, relative to the project base directory. Each line of
      * this UTF-8 encoded file specifies the absolute path to a class path element. If not specified, the class path
      * will not be written to disk.
-     * 
+     *
      * @parameter property="depres.testClassPath"
      */
     private String testClassPath;
@@ -79,14 +79,14 @@ public class TestMojo
      * The path to the properties file for the checksums of the test class path elements, relative to the project base
      * directory. The (trimmed) path to a JAR is used as the property key, the property value is the SHA-1 hash of the
      * JAR. If not specified, the class path checksums will not be calculated.
-     * 
+     *
      * @parameter property="depres.testClassPathChecksums"
      */
     private String testClassPathChecksums;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created or any dependency could not be resolved.
      */
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-error/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-error/pom.xml
index 0c703d6e6c..9c1bbbd42a 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-error/pom.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-error/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   maven-it-plugin-error
   maven-plugin
-  
+
   Maven IT Plugin :: Error Mojos
   
     A test plugin that throws various sorts of errors when loaded or executed. This plugin is designed to test Maven's ability
@@ -55,7 +55,7 @@ under the License.
       provided
     
   
-  
+
   
     
       
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java
index f19260a479..d824061487 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoComponentLookupExceptionMojo.java
@@ -30,7 +30,7 @@ import org.apache.maven.plugin.MojoFailureException;
 public class MojoComponentLookupExceptionMojo
     extends AbstractMojo
 {
-    
+
     public void execute()
         throws MojoExecutionException, MojoFailureException
     {
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java
index 48c7486bc2..4810153eb8 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/MojoFailureExceptionMojo.java
@@ -33,20 +33,20 @@ public class MojoFailureExceptionMojo
      * Message used in {@link MojoFailureException#MojoFailureException(String)}, unless longMessage
      * is supplied; then, this becomes the short message in
      * {@link MojoFailureException#MojoFailureException(Object, String, String)}.
-     * 
+     *
      * @parameter property="error.message" default-value="Planned MojoExecutionException."
      * @required
      */
     private String message;
-    
+
     /**
      * If supplied, The form {@link MojoFailureException#MojoFailureException(Object, String, String)} will be used.
-     * 
+     *
      * @parameter property="error.longMessage"
      * @required
      */
     private String longMessage;
-    
+
     /**
      * @parameter property="error.source"
      */
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorComponentMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorComponentMojo.java
index 85350f7a09..d220ffae93 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorComponentMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorComponentMojo.java
@@ -28,14 +28,14 @@ import junit.framework.TestCase;
 /**
  * Takes a parameter with a class from a provided-scope dependency, so that the mojo class itself won't be
  * loadable when that dependency is missing (in the runtime environment).
- * 
+ *
  * @goal no-class-def-found-error-param
  * @requiresProject false
  */
 public class NoClassDefFoundErrorComponentMojo
     extends AbstractMojo
 {
-    
+
     /**
      * @parameter default-value="foo"
      */
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorInterfaceMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorInterfaceMojo.java
index aca13a6b1f..6f88645e90 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorInterfaceMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/NoClassDefFoundErrorInterfaceMojo.java
@@ -29,7 +29,7 @@ import junit.framework.TestCase;
 /**
  * Implements a class from a provided-scope dependency, so that the mojo class itself won't be
  * loadable when that dependency is missing (in the runtime environment).
- * 
+ *
  * @goal no-class-def-found-error-mojo
  * @requiresProject false
  */
@@ -37,7 +37,7 @@ public class NoClassDefFoundErrorInterfaceMojo
     extends TestCase
     implements Mojo
 {
-    
+
     private Log log;
 
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/RequirementComponentLookupExceptionMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/RequirementComponentLookupExceptionMojo.java
index a685ecd11d..d1a7722fa3 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/RequirementComponentLookupExceptionMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-error/src/main/java/org/apache/maven/plugin/coreit/RequirementComponentLookupExceptionMojo.java
@@ -31,7 +31,7 @@ import org.apache.maven.plugin.MojoFailureException;
 public class RequirementComponentLookupExceptionMojo
     extends AbstractMojo
 {
-    
+
     /**
      * @component role="missing-component" roleHint="triggers-error"
      */
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-extension-consumer/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-extension-consumer/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java
index 6951589ee9..5e204a874a 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-extension-consumer/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-extension-consumer/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java
@@ -28,10 +28,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Updates the state of the singleton component and optionally dumps the updated state to a properties file.
- * 
+ *
  * @goal update-singleton
  * @phase initialize
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class UpdateSingletonMojo
@@ -60,7 +60,7 @@ public class UpdateSingletonMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-extension-provider/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-extension-provider/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java
index ba6ce899ec..76ba4b926e 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-extension-provider/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-extension-provider/src/main/java/org/apache/maven/plugin/coreit/UpdateSingletonMojo.java
@@ -28,10 +28,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Updates the state of the singleton component and optionally dumps the updated state to a properties file.
- * 
+ *
  * @goal update-singleton
  * @phase initialize
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class UpdateSingletonMojo
@@ -60,7 +60,7 @@ public class UpdateSingletonMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/pom.xml
index 59f03a50ef..74a1524615 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/pom.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/pom.xml
@@ -30,7 +30,7 @@ under the License.
 
   maven-it-plugin-extension1
   maven-plugin
-  
+
   Maven IT Plugin :: Extension 1
   
     A test plugin that contribute an artifact handler.
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/src/main/resources/META-INF/plexus/components.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/src/main/resources/META-INF/plexus/components.xml
index 6b20fad6d4..de542bea6f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-extension1/src/main/resources/META-INF/plexus/components.xml
@@ -30,7 +30,7 @@ under the License.
         coreit-1
       
     
-    
+
     
       org.apache.maven.lifecycle.mapping.LifecycleMapping
       coreit-1
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-extension2/src/main/resources/META-INF/plexus/components.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-extension2/src/main/resources/META-INF/plexus/components.xml
index f00dbe1e9f..aa5ccb9da1 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-extension2/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-extension2/src/main/resources/META-INF/plexus/components.xml
@@ -30,7 +30,7 @@ under the License.
         coreit-2
       
     
-    
+
     
       org.apache.maven.lifecycle.mapping.LifecycleMapping
       coreit-2
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleNoProjectMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleNoProjectMojo.java
index 7a41e032d8..112b14ce8d 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleNoProjectMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/ForkLifecycleNoProjectMojo.java
@@ -27,7 +27,7 @@ import java.io.File;
 /**
  * @goal fork-lifecycle-no-project
  * @requiresProject false
- * 
+ *
  * @execute phase="generate-sources" lifecycle="foo"
  */
 public class ForkLifecycleNoProjectMojo
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
index 5401d48070..3c7f4b857d 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-fork/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
@@ -30,7 +30,7 @@ import java.io.IOException;
 
 /**
  * @goal touch
- * 
+ *
  * @phase process-sources
  */
 public class TouchMojo
@@ -73,15 +73,15 @@ public class TouchMojo
              {
                  dir.mkdirs();
              }
-             
+
              File touch = new File( dir, file );
 
              // NOTE: Using append mode to track execution count
              OutputStreamWriter w = new OutputStreamWriter( new FileOutputStream( touch, true ), "UTF-8" );
-             
+
              w.write( file );
              w.write( "\n" );
-             
+
              w.close();
         }
         catch ( IOException e )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml b/its/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml
index 4dd1b7c116..03be793112 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-invalid-descriptor/pom.xml
@@ -61,14 +61,14 @@ under the License.
             
             
               ${project.build.outputDirectory}
-                        
+              
                 
                   src/main/resources
                   
                   true
                 
-                            
-                        
+              
+            
           
         
       
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 585b552835..7a5239683a 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
@@ -31,7 +31,7 @@ import java.io.OutputStreamWriter;
 
 /**
  * Provides common services for the mojos of this plugin.
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -41,7 +41,7 @@ public abstract class AbstractLogMojo
 
     /**
      * The project's base directory, used for manual path translation.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @readonly
      */
@@ -49,7 +49,7 @@ public abstract class AbstractLogMojo
 
     /**
      * The path to the output file, relative to the project's base directory.
-     * 
+     *
      * @parameter property="log.logFile"
      */
     private File logFile;
@@ -61,7 +61,7 @@ public abstract class AbstractLogMojo
 
     /**
      * Gets the absolute path to the log file.
-     * 
+     *
      * @return The absolute path to the log file, never null.
      */
     private File getLogFile()
@@ -76,7 +76,7 @@ public abstract class AbstractLogMojo
      * Appends the string representation of the specified object to the log file. Logging null has no other
      * effect than touching the file. For each value different from null, a line terminator will be
      * appended to the value's string representation.
-     * 
+     *
      * @param value The object to log, may be null.
      * @throws MojoExecutionException If the log file could not be updated.
      */
@@ -120,7 +120,7 @@ public abstract class AbstractLogMojo
 
     /**
      * Clears the contents of the log file by creating a new empty log file.
-     * 
+     *
      * @throws MojoExecutionException If the log file could not be reset.
      */
     protected void reset()
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 ddba423a88..1cbca475e8 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
@@ -23,10 +23,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Appends a string to the log file.
- * 
+ *
  * @goal log-string
  * @phase initialize
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -36,14 +36,14 @@ public class LogStringMojo
 
     /**
      * The string to append to the log file.
-     * 
+     *
      * @parameter property="log.string"
      */
     private String string;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
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 a9ebe19bba..3c2a32e252 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
@@ -23,10 +23,10 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Clears the contents of the log file by creating a new empty log file.
- * 
+ *
  * @goal reset
  * @phase initialize
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -36,7 +36,7 @@ public class ResetMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
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 0bffe919da..adb8428cef 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
@@ -32,9 +32,9 @@ import org.apache.maven.plugin.MojoExecutionException;
 
 /**
  * Resolves an artifact and has an (unused) dependency on log4j.
- * 
+ *
  * @goal it
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -83,7 +83,7 @@ public class ItMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/Component.java b/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/Component.java
index ea6d48f903..3e4af15b8f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/Component.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/Component.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A dummy component.
- * 
+ *
  * @author Benjamin Bentmann
  */
 public interface Component
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java b/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java
index baecacb8f8..4e2f75615f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-no-default-comp/src/main/java/org/apache/maven/plugin/coreit/ConcreteComponent.java
@@ -23,7 +23,7 @@ import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * A dummy component whose role hint is not "default", yet should be used to satisfy an ordinary component requirement.
- * 
+ *
  * @author Benjamin Bentmann
  */
 @Component ( role = org.apache.maven.plugin.coreit.Component.class, hint = "concrete" )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
index 752686c82b..65757a740c 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-no-project/src/main/java/org/apache/maven/plugin/coreit/NoProjectMojo.java
@@ -28,10 +28,10 @@ import java.io.IOException;
 
 /**
  * Mojo which touches a file without requiring a project.
- * 
+ *
  * @goal light-touch
  * @requiresProject false
- * 
+ *
  */
 public class NoProjectMojo
     extends AbstractMojo
@@ -62,15 +62,15 @@ public class NoProjectMojo
              {
                  dir.mkdirs();
              }
-             
+
              File touch = new File( dir, file );
-             
+
              getLog().info( "Touching: " + touch );
-     
+
              FileWriter w = new FileWriter( touch );
-             
+
              w.write( file );
-             
+
              w.close();
         }
         catch ( IOException e )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
index 4912802efd..2b4b3ef0d9 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-online/src/main/java/org/apache/maven/plugin/coreit/TouchMojo.java
@@ -27,11 +27,11 @@ import java.io.IOException;
 
 /**
  * Creates an empty file with a user-specified name. NOTE: This mojo requires online mode.
- * 
+ *
  * @goal touch
  * @phase validate
  * @requiresOnline true
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class TouchMojo
@@ -40,14 +40,14 @@ public class TouchMojo
 
     /**
      * The path to the output file.
-     * 
+     *
      * @parameter property="touch.outputFile" default-value="target/touch.txt"
      */
     private File outputFile;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
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 bbe4427237..59ffa0b8bd 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
@@ -27,7 +27,7 @@ import java.io.IOException;
 
 /**
  * Creates an empty file to prove this goal was executed.
- * 
+ *
  * @author Brett Porter
  *
  * @goal package
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/AnImplementation.java b/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/AnImplementation.java
index 19dfecf576..378d777926 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/AnImplementation.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-parameter-implementation/src/main/java/org/apache/maven/plugin/coreit/sub/AnImplementation.java
@@ -30,12 +30,12 @@ public class AnImplementation
 
     public String getField()
     {
-        return field; 
+        return field;
     }
 
     public void setField( String field )
     {
-        this.field = field; 
+        this.field = field;
     }
 
     public String toString()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-11/src/main/java/org/apache/maven/its/plugins/SerializeMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-11/src/main/java/org/apache/maven/its/plugins/SerializeMojo.java
index 8d26a3a8a4..ffb5d6c1eb 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-11/src/main/java/org/apache/maven/its/plugins/SerializeMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-11/src/main/java/org/apache/maven/its/plugins/SerializeMojo.java
@@ -58,7 +58,7 @@ public class SerializeMojo
             s.setOutput( writer );
 
             Xpp3Dom dom = new Xpp3Dom( "root" );
-            
+
             dom.writeToSerializer( "", s );
         }
         catch ( IOException e )
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
index b2d1f548e5..c87c0dec93 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/Xpp3Dom.java
@@ -24,7 +24,7 @@ import java.io.IOException;
 import org.codehaus.plexus.util.xml.pull.XmlSerializer;
 
 /**
- * 
+ *
  */
 public class Xpp3Dom
 {
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java
index bcbd797369..bca0dfa083 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/MXSerializer.java
@@ -24,7 +24,7 @@ import java.io.OutputStream;
 import java.io.Writer;
 
 /**
- * 
+ *
  */
 public class MXSerializer
     implements XmlSerializer
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java
index e8c8be5b42..3de35068e6 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plexus-utils-new/src/main/java/org/codehaus/plexus/util/xml/pull/XmlSerializer.java
@@ -24,7 +24,7 @@ import java.io.OutputStream;
 import java.io.Writer;
 
 /**
- * 
+ *
  */
 public interface XmlSerializer
 {
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-plugin-dependency/src/main/java/org/apache/maven/plugin/coreit/DerivedItMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-plugin-dependency/src/main/java/org/apache/maven/plugin/coreit/DerivedItMojo.java
index ee8078c773..f130452c70 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-plugin-dependency/src/main/java/org/apache/maven/plugin/coreit/DerivedItMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-plugin-dependency/src/main/java/org/apache/maven/plugin/coreit/DerivedItMojo.java
@@ -35,7 +35,7 @@ public class DerivedItMojo
      * The path to the output file for the properties with the expression values. For each expression given by the
      * parameter {@link #expressions} an similar named properties key will be used to save the expression value. If an
      * expression evaluated to null, there will be no corresponding key in the properties file.
-     * 
+     *
      * @parameter
      */
     private File file;
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
index 39428a9dcf..c06e4dfb4d 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PluginParamInterpolationMojo.java
@@ -27,7 +27,7 @@ import org.apache.maven.project.MavenProject;
 
 /**
  * @goal check-plugin
- * 
+ *
  * @phase validate
  */
 public class PluginParamInterpolationMojo
@@ -44,7 +44,7 @@ public class PluginParamInterpolationMojo
     {
         myDirectory = normalize( myDirectory );
         String value = normalize( new File( project.getBuild().getDirectory(), "foo" ).getAbsolutePath() );
-        
+
         if ( !myDirectory.equals( value ) )
         {
             throw new MojoExecutionException( "Directory supplied: " + myDirectory
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
index 2676488be2..2bff6cd811 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-project-interpolation/src/main/java/org/apache/maven/plugin/coreit/PropertyInterpolationMojo.java
@@ -27,13 +27,13 @@ import org.apache.maven.project.MavenProject;
 
 /**
  * @goal check-property
- * 
+ *
  * @phase validate
  */
 public class PropertyInterpolationMojo
     extends AbstractMojo
 {
-    
+
     /** @parameter default-value="${project}" */
     private MavenProject project;
 
@@ -42,14 +42,14 @@ public class PropertyInterpolationMojo
     {
         String value = normalize( project.getProperties().getProperty( "myDirectory" ) );
         String targetValue = normalize( new File( project.getBuild().getDirectory(), "foo" ).getAbsolutePath() );
-        
+
         if ( !value.equals( targetValue ) )
         {
             throw new MojoExecutionException( "Property value of 'myDirectory': " + value
                 + " should equal the 'foo' subpath of the project build directory: " + targetValue );
         }
     }
-    
+
     private String normalize( String src )
     {
         return src.replace( '/', File.separatorChar ).replace( '\\', File.separatorChar );
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java b/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java
index ea6d48f903..3e4af15b8f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/Component.java
@@ -21,7 +21,7 @@ package org.apache.maven.plugin.coreit;
 
 /**
  * A dummy component.
- * 
+ *
  * @author Benjamin Bentmann
  */
 public interface Component
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java b/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
index 41e226bc9a..da9387fd28 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-singleton-component/src/main/java/org/apache/maven/plugin/coreit/DefaultComponent.java
@@ -23,7 +23,7 @@ import org.codehaus.plexus.component.annotations.Component;
 
 /**
  * A stateful singleton.
- * 
+ *
  * @author Benjamin Bentmann
  */
 @Component ( role = org.apache.maven.plugin.coreit.Component.class )
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 74149db4c6..4d28b60b5e 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
@@ -36,9 +36,9 @@ import java.util.Properties;
 
 /**
  * Creates a properties file in the site output directory.
- * 
+ *
  * @goal info
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -49,7 +49,7 @@ public class InfoReport
 
     /**
      * The base directory of the current Maven project.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @required
      * @readonly
@@ -60,14 +60,14 @@ public class InfoReport
      * The path to the properties file, relative to the output directory of the site. The keys
      * locale.language, locale.country and locale.variant indicate the report's
      * locale.
-     * 
+     *
      * @parameter default-value="info.properties"
      */
     private String infoFile = "info.properties";
 
     /**
      * The path to the output directory of the site.
-     * 
+     *
      * @parameter default-value="${project.reporting.outputDirectory}"
      */
     private File outputDirectory;
@@ -79,7 +79,7 @@ public class InfoReport
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      * @throws MojoFailureException If the output file has not been set.
      */
@@ -141,7 +141,7 @@ public class InfoReport
 
     /**
      * Runs this report.
-     * 
+     *
      * @throws MavenReportException If the report could not be created.
      */
     public void generate( Sink sink, Locale locale )
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 3d7933716b..5554e7b724 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
@@ -32,11 +32,11 @@ import java.util.Properties;
 
 /**
  * Lists the available/configured reports in a properties file.
- * 
+ *
  * @goal list
  * @phase initialize
  * @requiresReports true
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -48,14 +48,14 @@ public class ListMojo
      * The path to the properties file used to list the available reports. The properties file will have a key named
      * reports that gives the total count of reports. The keys reports.0,
      * reports.1 etc. will be used to denote the qualified class names of the reports.
-     * 
+     *
      * @parameter property="site.properties" default-value="target/reports.properties"
      */
     private File reportsFile;
 
     /**
      * The reports configured for the current build.
-     * 
+     *
      * @parameter default-value="${reports}"
      * @required
      * @readonly
@@ -64,7 +64,7 @@ public class ListMojo
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java
index 06fec9fe80..651fec9f1a 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-toolchain/src/main/java/org/apache/maven/plugin/coreit/FindToolMojo.java
@@ -34,7 +34,7 @@ import org.apache.maven.toolchain.ToolchainManager;
 /**
  * Finds a tool from a previously selected toolchain. This tests the public API just like toolchain-enabled plugins
  * would do.
- * 
+ *
  * @goal find-tool
  * @phase validate
  */
@@ -49,7 +49,7 @@ public class FindToolMojo
 
     /**
      * The current Maven session holding the selected toolchain.
-     * 
+     *
      * @parameter default-value="${session}"
      * @required
      * @readonly
@@ -58,21 +58,21 @@ public class FindToolMojo
 
     /**
      * The path to the output file for the properties.
-     * 
+     *
      * @parameter property="toolchain.outputFile" default-value="${project.build.directory}/tool.properties"
      */
     private File outputFile;
 
     /**
      * The type identifier of the toolchain, e.g. "jdk".
-     * 
+     *
      * @parameter property="toolchain.type"
      */
     private String type;
 
     /**
      * The name of the tool, e.g. "javac".
-     * 
+     *
      * @parameter property="toolchain.tool"
      */
     private String tool;
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java
index 460e9c8c2f..708685f70a 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-touch/src/main/java/org/apache/maven/plugin/coreit/CoreItTouchMojo.java
@@ -32,7 +32,7 @@ import java.util.Map;
 /**
  * Mojo that creates one touch.txt or more files with configured filenames in target/
  * directory, or cause failure if desired, and set build final name to 'coreitified'
- * 
+ *
  * @goal touch
  * @phase process-sources
  */
@@ -159,7 +159,7 @@ public class CoreItTouchMojo
 
              w.close();
         }
-        
+
         catch ( IOException e )
         {
             throw new MojoExecutionException( "Error touching file", e );
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java
index c10e1ffda0..6b67aa023f 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-properties/src/main/java/org/apache/maven/plugin/coreit/UsesPropertiesMojo.java
@@ -37,7 +37,7 @@ public class UsesPropertiesMojo
      * @parameter default-value="${basedir}"
      */
     private File basedir;
-    
+
     /**
      * @parameter default-value="${project.properties}"
      */
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java
index 7b02347cec..87578c006c 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/DumpVersionMojo.java
@@ -32,10 +32,10 @@ import java.util.Properties;
 
 /**
  * Dumps the version info for a wagon provider to a properties file.
- * 
+ *
  * @goal dump-version
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  */
 public class DumpVersionMojo
@@ -44,7 +44,7 @@ public class DumpVersionMojo
 
     /**
      * Project base directory used for manual path alignment.
-     * 
+     *
      * @parameter default-value="${basedir}"
      * @readonly
      */
@@ -52,42 +52,42 @@ public class DumpVersionMojo
 
     /**
      * The Wagon manager used to lookup the wagon of interest.
-     * 
+     *
      * @component
      */
     private WagonManager wagonManager;
 
     /**
      * The path to the properties file used to dump the auth infos.
-     * 
+     *
      * @parameter property="wagon.propertiesFile"
      */
     private File propertiesFile;
 
     /**
      * The role hint for the provider of interest.
-     * 
+     *
      * @parameter property="wagon.providerHint"
      */
     private String providerHint;
 
     /**
      * The group id for the provider of interest.
-     * 
+     *
      * @parameter property="wagon.providerGroupId"
      */
     private String providerGroupId;
 
     /**
      * The artifact id for the provider of interest.
-     * 
+     *
      * @parameter property="wagon.providerArtifactId"
      */
     private String providerArtifactId;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoExecutionException If the output file could not be created.
      */
     public void execute()
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 8ebf3de051..c1be36ded4 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
@@ -35,10 +35,10 @@ import java.util.Properties;
 /**
  * Loads resources from a class loader used to load a wagon provider. The wagon is merely used to access the extension
  * class loader it came from which is otherwise not accessible to a plugin.
- * 
+ *
  * @goal lookup-wagon
  * @phase validate
- * 
+ *
  * @author Benjamin Bentmann
  *
  */
@@ -48,28 +48,28 @@ public class LookupWagonMojo
 
     /**
      * The Wagon manager used to retrieve wagon providers.
-     * 
+     *
      * @component
      */
     private WagonManager wagonManager;
 
     /**
      * The path to the properties file used to track the results of the wagon lookups.
-     * 
+     *
      * @parameter property="wagon.outputFile"
      */
     private File outputFile;
 
     /**
      * The URLs for which to look up wagons.
-     * 
+     *
      * @parameter
      */
     private String[] urls;
 
     /**
      * Runs this mojo.
-     * 
+     *
      * @throws MojoFailureException If the attached file has not been set.
      */
     public void execute()
diff --git a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
index 34427dbc0f..a4813225f9 100644
--- a/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
+++ b/its/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/src/main/java/org/apache/maven/plugin/coreit/UsesWagonMojo.java
@@ -38,7 +38,7 @@ public class UsesWagonMojo
      * @component
      */
     private WagonManager wagonManager;
-    
+
     public void execute()
         throws MojoExecutionException
     {
diff --git a/its/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml b/its/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml
index e7fb615fb5..8d6421e3e8 100644
--- a/its/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-support/core-it-plugins/mng5805-extension/src/main/resources/META-INF/plexus/components.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
   
-  
+
     
       org.apache.maven.lifecycle.mapping.LifecycleMapping
       mng5805
@@ -53,7 +53,7 @@ under the License.
         
       
     
-    
+
     
       org.apache.maven.artifact.handler.ArtifactHandler
       mng5805
@@ -66,6 +66,6 @@ under the License.
         mng5805
       
     
-    
+
   
 
diff --git a/its/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml b/its/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml
index a07744df09..2bfe8d2d29 100644
--- a/its/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-support/core-it-plugins/mng5805-extension2/src/main/resources/META-INF/plexus/components.xml
@@ -19,7 +19,7 @@ under the License.
 -->
 
   
-  
+
     
       org.apache.maven.lifecycle.mapping.LifecycleMapping
       mng5805
@@ -53,7 +53,7 @@ under the License.
         
       
     
-    
+
     
       org.apache.maven.artifact.handler.ArtifactHandler
       mng5805
@@ -66,6 +66,6 @@ under the License.
         mng5805
       
     
-    
+
   
 
diff --git a/its/core-it-support/core-it-plugins/mng5958-extension/pom.xml b/its/core-it-support/core-it-plugins/mng5958-extension/pom.xml
index 5f412948a7..1bd85d291a 100644
--- a/its/core-it-support/core-it-plugins/mng5958-extension/pom.xml
+++ b/its/core-it-support/core-it-plugins/mng5958-extension/pom.xml
@@ -33,7 +33,7 @@ under the License.
   jar
 
   Maven IT Plugin :: mng-5958 extension
-  
+
   
     
       org.apache.maven
diff --git a/its/core-it-support/core-it-plugins/mng5958-extension/src/main/resources/META-INF/plexus/components.xml b/its/core-it-support/core-it-plugins/mng5958-extension/src/main/resources/META-INF/plexus/components.xml
index e61d294637..1dbe8caaa3 100644
--- a/its/core-it-support/core-it-plugins/mng5958-extension/src/main/resources/META-INF/plexus/components.xml
+++ b/its/core-it-support/core-it-plugins/mng5958-extension/src/main/resources/META-INF/plexus/components.xml
@@ -19,13 +19,13 @@ under the License.
 -->
 
   
-  
+
     
       org.apache.maven.lifecycle.mapping.LifecycleMapping
       mng5958-good
       org.apache.maven.its.mng5958.GoodLifecycleMapping
     
-    
+
     
       org.apache.maven.artifact.handler.ArtifactHandler
       mng5958
@@ -38,13 +38,13 @@ under the License.
         mng5858-good
       
     
-    
+
     
       org.apache.maven.lifecycle.mapping.LifecycleMapping
       mng5958-bad
       org.apache.maven.its.mng5958.BadLifecycleMapping
     
-    
+
     
       org.apache.maven.artifact.handler.ArtifactHandler
       mng5958-bad
@@ -57,6 +57,6 @@ under the License.
         mng5858-bad
       
     
-    
+
   
 
diff --git a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support-old-location/1.1/maven-core-it-support-old-location-1.1.pom b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support-old-location/1.1/maven-core-it-support-old-location-1.1.pom
index 90f87584a2..3e1aa53dfd 100644
--- a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support-old-location/1.1/maven-core-it-support-old-location-1.1.pom
+++ b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support-old-location/1.1/maven-core-it-support-old-location-1.1.pom
@@ -19,13 +19,13 @@
 
   4.0.0
-  org.apache.maven.its                                                                                                                            
+  org.apache.maven.its
   maven-core-it-support-old-location
   1.1
   
     
       maven-core-it-support
-      Testing      
+      Testing
     
   
 
diff --git a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.0/maven-core-it-support-1.0.pom b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.0/maven-core-it-support-1.0.pom
index 14d347fc49..829bd93266 100644
--- a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.0/maven-core-it-support-1.0.pom
+++ b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.0/maven-core-it-support-1.0.pom
@@ -19,7 +19,7 @@
 
   4.0.0
-  org.apache.maven.its                                                                                                                            
+  org.apache.maven.its
   maven-core-it-support
   1.0
 
diff --git a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.1/maven-core-it-support-1.1.pom b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.1/maven-core-it-support-1.1.pom
index b1dcceb05e..df42841665 100644
--- a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.1/maven-core-it-support-1.1.pom
+++ b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.1/maven-core-it-support-1.1.pom
@@ -19,7 +19,7 @@
 
   4.0.0
-  org.apache.maven.its                                                                                                                            
+  org.apache.maven.its
   maven-core-it-support
   1.1
 
diff --git a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.2/maven-core-it-support-1.2.pom b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.2/maven-core-it-support-1.2.pom
index 3992663d6c..3d92a9ce65 100644
--- a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.2/maven-core-it-support-1.2.pom
+++ b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.2/maven-core-it-support-1.2.pom
@@ -19,7 +19,7 @@
 
   4.0.0
-  org.apache.maven.its                                                                                                                            
+  org.apache.maven.its
   maven-core-it-support
   it-packaging
   1.2
diff --git a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.3/maven-core-it-support-1.3.pom b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.3/maven-core-it-support-1.3.pom
index bafb14c5ab..3fc759be0e 100644
--- a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.3/maven-core-it-support-1.3.pom
+++ b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.3/maven-core-it-support-1.3.pom
@@ -19,7 +19,7 @@
 
   4.0.0
-  org.apache.maven.its                                                                                                                            
+  org.apache.maven.its
   maven-core-it-support
   1.3
   
diff --git a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.4/maven-core-it-support-1.4.pom b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.4/maven-core-it-support-1.4.pom
index e3a4cf770e..1ab4e9b5e4 100644
--- a/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.4/maven-core-it-support-1.4.pom
+++ b/its/core-it-support/core-it-support-artifacts/src/main/repo/org/apache/maven/its/maven-core-it-support/1.4/maven-core-it-support-1.4.pom
@@ -19,7 +19,7 @@
 
   4.0.0
-  org.apache.maven.its                                                                                                                            
+  org.apache.maven.its
   maven-core-it-support
   1.4
   
diff --git a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
index abe02a380a..57426a6839 100644
--- a/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
+++ b/its/core-it-support/maven-it-helper/src/main/java/org/apache/maven/it/AbstractMavenIntegrationTestCase.java
@@ -610,7 +610,7 @@ public abstract class AbstractMavenIntegrationTestCase
         {
             // noop
         }
-        
+
         return verifier;
     }
 
diff --git a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java
index db2a28d1da..50aa5c8ed2 100644
--- a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java
+++ b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/java/MavenITmngXXXXDescriptionOfProblemTest.java
@@ -38,7 +38,7 @@ import ${package}.util.ResourceExtractor;
  * project in the resources folder. It then checks the
  * results. This is a non-trivial example that shows two
  * phases. See more information inline in the code.
- * 
+ *
  * @author Brian Fox
  * @version ${symbol_dollar}Id: MavenITmngXXXXDescriptionOfProblemTest.java 707999 2008-10-26 14:42:38Z bentmann ${symbol_dollar}
  */
diff --git a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml
index 1976ebff24..e38360a0f0 100644
--- a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml
+++ b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml
@@ -30,9 +30,9 @@ under the License.
   This ruleset checks EPHS code
   
 
-    
+  
+
 
-  
   
 
   
@@ -66,16 +66,16 @@ under the License.
  
   
  
- 
+
   
   
-  
+
   
   
 
-    
-  
-  
+  
+
+
   
   
   
@@ -116,17 +116,17 @@ under the License.
   
   
   
-  
+
   
-    
+  
   
 
 
   
   
-  
+
   
-  
+
 
   
 
diff --git a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml
index 6fdf5628da..88c0375dca 100644
--- a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml
+++ b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml
@@ -80,8 +80,8 @@
     
 
 
-     
-       
+    
+      
       
       
       
@@ -105,17 +105,17 @@
     
     
+      -->
 
 
 
diff --git a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/pom.xml b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/pom.xml
index d64c4adb9c..3a89204aae 100644
--- a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/pom.xml
+++ b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/pom.xml
@@ -47,9 +47,9 @@ under the License.
     
 
   
     
       
diff --git a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java
index 49a95de7e9..01748be45a 100644
--- a/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java
+++ b/its/core-it-support/maven-it-sample-archetype/src/main/resources/archetype-resources/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java
@@ -27,5 +27,5 @@ public static void main(String[] args)
 {
   System.out.println("hello");
   }
-  
+
 }
\ No newline at end of file
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 f8026864d4..311d02b478 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
@@ -35,7 +35,7 @@ import org.apache.maven.it.util.ResourceExtractor;
  * project in the resources folder. It then checks the
  * results. This is a non-trivial example that shows two
  * phases. See more information inline in the code.
- * 
+ *
  * @author Brian Fox
  *
  */
diff --git a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml
index c03a644f0a..8cbc876d08 100644
--- a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml
+++ b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/rule_set.xml
@@ -27,9 +27,9 @@ under the License.
   This ruleset checks EPHS code
   
 
-    
+  
+
 
-  
   
 
   
@@ -63,16 +63,16 @@ under the License.
  
   
  
- 
+
   
   
-  
+
   
   
 
-    
-  
-  
+  
+
+
   
   
   
@@ -113,17 +113,17 @@ under the License.
   
   
   
-  
+
   
-    
+  
   
 
 
   
   
-  
+
   
-  
+
 
   
 
diff --git a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml
index 5771c53f60..c43c01cd07 100644
--- a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml
+++ b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-assembly/src/main/resources/stc_checks.xml
@@ -95,8 +95,8 @@ under the License.
     
 
 
-     
-       
+    
+      
       
       
       
@@ -120,17 +120,17 @@ under the License.
     
     
+      -->
 
 
 
diff --git a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/pom.xml b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/pom.xml
index 9aabb09aba..d6a69b84a3 100644
--- a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/pom.xml
+++ b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/pom.xml
@@ -44,9 +44,9 @@ under the License.
     
 
   
     
       
diff --git a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java
index 9dfe4d7041..f22e6c3a01 100644
--- a/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java
+++ b/its/core-it-support/maven-it-sample/src/test/resources/mng-xxxx/checkstyle-test/src/main/java/Class.java
@@ -23,5 +23,5 @@ public static void main(String[] args)
 {
   System.out.println("hello");
   }
-  
+
 }
\ No newline at end of file
diff --git a/its/pom.xml b/its/pom.xml
index dcef45c414..49ecbb8658 100644
--- a/its/pom.xml
+++ b/its/pom.xml
@@ -40,7 +40,7 @@ under the License.
   
     
       Mark Ingram
-      
+    
   
 
   
@@ -68,7 +68,7 @@ under the License.
     ${user.home}/maven-sites
     true
     1.7
-    1.7    
+    1.7
   
 
   
@@ -150,7 +150,7 @@ under the License.
             apache.releases.https
           
         
-        
         
           org.eclipse.m2e