[maven-release] branch master updated: Clean up code, no implementation changes

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[maven-release] branch master updated: Clean up code, no implementation changes

rfscholte
This is an automated email from the ASF dual-hosted git repository.

rfscholte pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-release.git


The following commit(s) were added to refs/heads/master by this push:
     new b98f634  Clean up code, no implementation changes
b98f634 is described below

commit b98f634cdd194b7d80f48265bd990313e64fe7a5
Author: rfscholte <[hidden email]>
AuthorDate: Fri Jan 12 12:20:29 2018 +0100

    Clean up code, no implementation changes
---
 .../shared/release/DefaultReleaseManagerTest.java  | 41 ++++++-------
 .../maven/shared/release/PlexusJUnit4TestCase.java |  6 +-
 .../PropertiesReleaseDescriptorStoreTest.java      | 13 ++--
 .../release/config/ReleaseDescriptorStoreStub.java |  3 +
 .../shared/release/config/ReleaseUtilsTest.java    | 26 ++++----
 .../release/exec/CommandLineFactoryTest.java       |  1 +
 .../release/exec/ForkedMavenExecutorTest.java      | 37 ++++++------
 .../release/exec/InvokerMavenExecutorTest.java     | 11 ++--
 .../maven/shared/release/exec/TeeConsumerTest.java |  1 +
 .../shared/release/exec/TeeOutputStreamTest.java   |  3 +-
 .../release/phase/AbstractBackupPomsPhaseTest.java |  3 +-
 .../release/phase/AbstractReleaseTestCase.java     | 54 ++++++++---------
 .../AbstractRewritingReleasePhaseTestCase.java     | 16 ++---
 .../phase/BranchInputVariablesPhaseTest.java       |  9 +--
 .../phase/CheckDependencySnapshotsPhaseTest.java   |  1 +
 .../shared/release/phase/CheckPomPhaseTest.java    |  1 +
 .../release/phase/CheckoutProjectFromScmTest.java  | 13 ++--
 .../release/phase/CreateBackupPomsPhaseTest.java   |  1 +
 .../shared/release/phase/EndReleasePhaseTest.java  |  1 +
 .../phase/GenerateReleasePomsPhaseTest.java        | 16 ++++-
 .../release/phase/InputVariablesPhaseTest.java     |  1 +
 .../shared/release/phase/IsScmFileSetEquals.java   |  2 +-
 .../phase/MapDevelopmentVersionPhaseIT.java        |  6 +-
 .../shared/release/phase/MapVersionsPhaseTest.java | 13 ++--
 .../shared/release/phase/ReleasePhaseStub.java     |  5 ++
 .../release/phase/RemoveReleasePomsPhaseTest.java  |  3 +-
 .../release/phase/RestoreBackupPomsPhaseTest.java  |  1 +
 .../phase/RewritePomsForBranchPhaseTest.java       |  8 +++
 .../phase/RewritePomsForDevelopmentPhaseTest.java  | 10 +++-
 .../phase/RewritePomsForReleasePhaseTest.java      |  8 +++
 .../release/phase/RunCompleteGoalsPhaseTest.java   |  3 +-
 .../release/phase/RunPerformGoalsPhaseTest.java    | 69 +++++++++++-----------
 .../release/phase/RunPrepareGoalsPhaseTest.java    |  7 ++-
 .../shared/release/phase/ScmBranchPhaseTest.java   |  1 +
 .../phase/ScmCheckModificationsPhaseTest.java      |  3 +-
 .../phase/ScmCommitDevelopmentPhaseTest.java       |  1 +
 .../phase/ScmCommitPreparationPhaseTest.java       |  5 +-
 .../shared/release/phase/ScmTagPhaseTest.java      |  3 +-
 .../release/policies/DefaultNamingPolicyTest.java  |  4 +-
 .../release/scm/ClearCaseScmTranslatorTest.java    |  8 +--
 .../shared/release/scm/CvsScmTranslatorTest.java   |  8 +--
 .../scm/DefaultScmRepositoryConfiguratorTest.java  |  1 +
 .../shared/release/scm/GitScmTranslatorTest.java   |  2 +-
 .../shared/release/scm/HgScmTranslatorTest.java    |  8 +--
 .../shared/release/scm/JazzScmTranslatorTest.java  |  4 +-
 .../release/scm/SubversionScmTranslatorTest.java   |  6 +-
 .../shared/release/stubs/MavenExecutorWrapper.java |  2 +-
 .../maven/shared/release/stubs/ScmManagerStub.java |  6 +-
 .../release/transform/jdom/JDomBuildTest.java      |  4 +-
 .../jdom/JDomDependencyManagementTest.java         |  4 +-
 .../release/transform/jdom/JDomDependencyTest.java |  8 +--
 .../release/transform/jdom/JDomExtensionTest.java  |  8 +--
 .../release/transform/jdom/JDomModelTest.java      | 16 ++---
 .../release/transform/jdom/JDomParentTest.java     |  8 +--
 .../release/transform/jdom/JDomPropertiesTest.java |  6 +-
 .../shared/release/transform/jdom/JDomScmTest.java | 22 +++----
 .../maven/shared/release/util/PomFinderTest.java   |  1 +
 .../maven/shared/release/util/ReleaseUtilTest.java |  6 +-
 .../release/versions/DefaultVersionInfoTest.java   | 20 +++----
 pom.xml                                            |  6 +-
 60 files changed, 317 insertions(+), 247 deletions(-)

diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
index 511bd02..28bb32e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/DefaultReleaseManagerTest.java
@@ -67,6 +67,7 @@ public class DefaultReleaseManagerTest
     private ReleaseDescriptorStoreStub configStore;
 
 
+    @Override
     protected void setUp()
         throws Exception
     {
@@ -306,7 +307,7 @@ public class DefaultReleaseManagerTest
             // good
             assertEquals( "check cause", ReleaseDescriptorStoreException.class, e.getCause().getClass() );
         }
-        
+
         // verify
         verify( configStoreMock ).read( releaseDescriptor );
         verifyNoMoreInteractions( configStoreMock );
@@ -338,7 +339,7 @@ public class DefaultReleaseManagerTest
             // good
             assertEquals( "check cause", ReleaseDescriptorStoreException.class, e.getCause().getClass() );
         }
-        
+
         // verify
         verify( configStoreMock ).write( releaseDescriptor ) ;
         verifyNoMoreInteractions( configStoreMock );
@@ -373,12 +374,12 @@ public class DefaultReleaseManagerTest
 
         phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "branch1" );
         assertTrue( "branch1 not cleaned", phase.isCleaned() );
-        
+
         verify( configStoreMock ).delete( releaseDescriptor );
         verifyNoMoreInteractions( configStoreMock );
     }
 
-    
+
 
     private static List<MavenProject> createReactorProjects()
     {
@@ -387,11 +388,11 @@ public class DefaultReleaseManagerTest
         return Collections.singletonList( project );
     }
 
-    public void testReleasePerformWithResult()
+    public void testReleasePerformWithResult()
         throws Exception
     {
         DefaultReleaseManager releaseManager = (DefaultReleaseManager) lookup( ReleaseManager.ROLE, "test" );
-        
+
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
         releaseDescriptor.setScmSourceUrl( "scm-url" );
         File checkoutDirectory = getTestFile( "target/checkout-directory" );
@@ -400,7 +401,7 @@ public class DefaultReleaseManagerTest
         ReleaseResult result = releaseManager.performWithResult( releaseDescriptor, new DefaultReleaseEnvironment(),
                                                                  createReactorProjects(), null );
         assertTrue( result.getOutput().length() > 0 );
-    }  
+    }
 
     public void testReleaseConfigurationStoreReadFailureOnPerform()
         throws Exception
@@ -430,7 +431,7 @@ public class DefaultReleaseManagerTest
             // good
             assertEquals( "check cause", ReleaseDescriptorStoreException.class, e.getCause().getClass() );
         }
-        
+
         // verify
         verify( configStoreMock ).read( releaseDescriptor );
         verifyNoMoreInteractions( configStoreMock );
@@ -462,7 +463,7 @@ public class DefaultReleaseManagerTest
             assertTrue( true );
         }
     }
-    
+
     // MRELEASE-758: release:perform no longer removes release.properties
     @SuppressWarnings( "unchecked" )
     public void testPerformWithDefaultClean()
@@ -471,17 +472,17 @@ public class DefaultReleaseManagerTest
         // prepare
         ReleasePerformRequest performRequest = new ReleasePerformRequest();
         performRequest.setDryRun( true );
-        
+
         ReleaseManagerListener managerListener = mock( ReleaseManagerListener.class );
         performRequest.setReleaseManagerListener( managerListener );
-        
+
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
         releaseDescriptor.setScmSourceUrl( "scm-url" );
         releaseDescriptor.setWorkingDirectory( getTestFile( "target/working-directory" ).getAbsolutePath() );
         performRequest.setReleaseDescriptor( releaseDescriptor );
-        
+
         DefaultReleaseManager releaseManager = (DefaultReleaseManager) lookup( ReleaseManager.ROLE, "test" );
-        
+
         // test
         releaseManager.perform( performRequest );
 
@@ -492,11 +493,11 @@ public class DefaultReleaseManagerTest
         verify( managerListener ).phaseStart( "run-perform-goals" );
         verify( managerListener ).phaseStart( "cleanup" );
         verify( managerListener, times( 5 ) ).phaseEnd();
-        
+
         // not part of actual test, but required to confirm 'no more interactions'
         verify( managerListener ).goalStart( anyString(), any( List.class ) );
         verify( managerListener ).goalEnd();
-        
+
         verifyNoMoreInteractions( managerListener );
     }
 
@@ -554,7 +555,7 @@ public class DefaultReleaseManagerTest
         {
             assertEquals( "check cause", ScmException.class, e.getCause().getClass() );
         }
-        
+
         // verify
         verify(  scmProviderMock ).checkOut( any( ScmRepository.class ), any( ScmFileSet.class ),
                                              any( ScmTag.class ), any( CommandParameters.class ) );
@@ -621,9 +622,9 @@ public class DefaultReleaseManagerTest
         DefaultReleaseManager defaultReleaseManager = (DefaultReleaseManager) lookup( ReleaseManager.ROLE, "test" );
 
         defaultReleaseManager.rollback( configStore.getReleaseConfiguration(), (ReleaseEnvironment) null, null );
-        
+
         ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "rollbackPhase1" );
-        
+
         assertTrue( "rollbackPhase1 executed", phase.isExecuted() );
     }
 
@@ -635,9 +636,9 @@ public class DefaultReleaseManagerTest
         DefaultReleaseManager defaultReleaseManager = (DefaultReleaseManager) lookup( ReleaseManager.ROLE, "test" );
 
         defaultReleaseManager.updateVersions( configStore.getReleaseConfiguration(), null, null );
-        
+
         ReleasePhaseStub phase = (ReleasePhaseStub) lookup( ReleasePhase.ROLE, "updateVersionsPhase1" );
-        
+
         assertTrue( "updateVersionsPhase1 executed", phase.isExecuted() );
     }
 }
\ No newline at end of file
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java
index 0b35472..633a19f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/PlexusJUnit4TestCase.java
@@ -37,7 +37,7 @@ import org.junit.Before;
 
 /**
  * Based on PlexusTestCase from org.sonatype.sisu:sisu-inject-plexus
- *
+ *
  * @author Robert Scholte
  */
 public abstract class PlexusJUnit4TestCase
@@ -114,7 +114,7 @@ public abstract class PlexusJUnit4TestCase
 
     /**
      * Allow custom test case implementations do augment the default container configuration before executing tests.
-     *
+     *
      * @param containerConfiguration
      */
     protected void customizeContainerConfiguration( final ContainerConfiguration containerConfiguration )
@@ -174,7 +174,7 @@ public abstract class PlexusJUnit4TestCase
      * Allow the retrieval of a container configuration that is based on the name of the test class being run. So if you
      * have a test class called org.foo.FunTest, then this will produce a resource name of org/foo/FunTest.xml which
      * would be used to configure the Plexus container before running your test.
-     *
+     *
      * @param subname
      * @return
      */
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
index 7255fc9..e8030f5 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStoreTest.java
@@ -36,9 +36,10 @@ public class PropertiesReleaseDescriptorStoreTest
     extends PlexusTestCase
 {
     private PropertiesReleaseDescriptorStore store;
-    
+
     private SecDispatcher secDispatcher;
 
+    @Override
     protected void setUp()
         throws Exception
     {
@@ -126,7 +127,7 @@ public class PropertiesReleaseDescriptorStoreTest
         store.write( config, file );
 
         ReleaseDescriptor rereadDescriptor = store.read( file );
-        
+
         assertAndAdjustScmPassword( config, rereadDescriptor );
         assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor );
 
@@ -148,10 +149,10 @@ public class PropertiesReleaseDescriptorStoreTest
 
         ReleaseDescriptor rereadDescriptor = store.read( file );
         rereadDescriptor.setWorkingDirectory( AbstractReleaseTestCase.getPath( file.getParentFile() ) );
-        
+
         assertAndAdjustScmPassword( config, rereadDescriptor );
         assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor );
-        
+
         assertEquals( "compare configuration", config, rereadDescriptor );
     }
 
@@ -239,7 +240,7 @@ public class PropertiesReleaseDescriptorStoreTest
         store.write( config, file );
 
         ReleaseDescriptor rereadDescriptor = store.read( file );
-        
+
         assertAndAdjustScmPassword( config, rereadDescriptor );
         assertAndAdjustScmPrivateKeyPassPhrase( config, rereadDescriptor );
 
@@ -358,7 +359,7 @@ public class PropertiesReleaseDescriptorStoreTest
 
         return releaseDescriptor;
     }
-    
+
     private void assertAndAdjustScmPassword( ReleaseDescriptor expected, ReleaseDescriptor original )
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java
index b196687..7470bd2 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreStub.java
@@ -32,17 +32,20 @@ public class ReleaseDescriptorStoreStub
      */
     private ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
 
+    @Override
     public ReleaseDescriptor read( ReleaseDescriptor mergeDescriptor )
     {
         ReleaseUtils.merge( releaseDescriptor, mergeDescriptor );
         return releaseDescriptor;
     }
 
+    @Override
     public void write( ReleaseDescriptor config )
     {
         this.releaseDescriptor = config;
     }
 
+    @Override
     public void delete( ReleaseDescriptor config )
     {
     }
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
index b067983..fd9311e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/config/ReleaseUtilsTest.java
@@ -38,7 +38,7 @@ import java.util.Properties;
 public class ReleaseUtilsTest
     extends TestCase
 {
-    public void testMergeConfigurationSourceEmpty()
+    public void testMergeConfigurationSourceEmpty()
         throws IOException
     {
         ReleaseDescriptor mergeDescriptor = createReleaseDescriptor();
@@ -49,19 +49,19 @@ public class ReleaseUtilsTest
         assertEquals( "Check merge", mergedReleaseDescriptor, mergedMergeDescriptor );
     }
 
-    public void testMergeEqualsWithUpdateWorkingCopyTrue()
+    public void testMergeEqualsWithUpdateWorkingCopyTrue()
         throws IOException
     {
         ReleaseDescriptor mergeDescriptor = createReleaseDescriptor();
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
-        
+
         ReleaseDescriptor mergedReleaseDescriptor = ReleaseUtils.merge( releaseDescriptor, mergeDescriptor );
         ReleaseDescriptor mergedMergeDescriptor = ReleaseUtils.merge( mergeDescriptor, releaseDescriptor );
 
         assertEquals( "Check merge", mergedReleaseDescriptor, mergedMergeDescriptor );
     }
 
-    public void testMergeConfigurationDestEmpty()
+    public void testMergeConfigurationDestEmpty()
         throws IOException
     {
         ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
@@ -71,7 +71,7 @@ public class ReleaseUtilsTest
         assertEquals( "Check merge", expectedDescriptor, releaseDescriptor );
     }
 
-    public void testMergeConfiguration()
+    public void testMergeConfiguration()
         throws IOException
     {
         File workingDirectory = new File( "." );
@@ -87,7 +87,7 @@ public class ReleaseUtilsTest
         assertEquals( "Check merge", expected, releaseDescriptor );
     }
 
-    public void testEquals()
+    public void testEquals()
         throws IOException
     {
         ReleaseDescriptor originalReleaseDescriptor = createReleaseDescriptor();
@@ -110,7 +110,7 @@ public class ReleaseUtilsTest
     }
 
     private static void doEqualsAssertions( ReleaseDescriptor releaseDescriptor,
-                                            ReleaseDescriptor originalReleaseDescriptor, String other, File otherFile )
+                                            ReleaseDescriptor originalReleaseDescriptor, String other, File otherFile )
         throws IOException
     {
         ReleaseDescriptor origConfig = originalReleaseDescriptor;
@@ -148,7 +148,7 @@ public class ReleaseUtilsTest
         config.setCompletedPhase( other );
         assertFalse( "Check original comparison", config.equals( origConfig ) );
         config.setCompletedPhase( origConfig.getCompletedPhase() );
-        
+
         config.setScmPrivateKeyPassPhrase( other );
         assertFalse( "Check original comparison", config.equals( origConfig ) );
         config.setScmPrivateKeyPassPhrase( origConfig.getScmPrivateKeyPassPhrase() );
@@ -245,7 +245,7 @@ public class ReleaseUtilsTest
         assertFalse( "Check original comparison", config.equals( origConfig ) );
     }
 
-    public void testHashCode()
+    public void testHashCode()
         throws IOException
     {
         ReleaseDescriptor releaseDescriptor = createReleaseDescriptor();
@@ -261,7 +261,7 @@ public class ReleaseUtilsTest
         properties.put( "dependency." + dependencyKey  + ".release", "1.3" );
         properties.put( "dependency." + dependencyKey + ".development", "1.3-SNAPSHOT" );
         ReleaseDescriptor descriptor = ReleaseUtils.copyPropertiesToReleaseDescriptor( properties );
-        
+
         Map<String, String> versionMap = (Map<String, String>) descriptor.getResolvedSnapshotDependencies().get( dependencyKey );
         assertEquals( "1.3", versionMap.get( ReleaseDescriptor.RELEASE_KEY ) );
         assertEquals( "1.3-SNAPSHOT", versionMap.get( ReleaseDescriptor.DEVELOPMENT_KEY) );
@@ -276,10 +276,10 @@ public class ReleaseUtilsTest
         String devDependencyKey = ArtifactUtils.versionlessKey( "com.development.magic", "dependency" );
         properties.put( "dependency." + devDependencyKey + ".development", "1.3-SNAPSHOT" );
         ReleaseDescriptor descriptor = ReleaseUtils.copyPropertiesToReleaseDescriptor( properties );
-        
+
         Map<String, String> versionMap = (Map<String, String>) descriptor.getResolvedSnapshotDependencies().get( relDependencyKey );
         assertEquals( "1.3", versionMap.get( ReleaseDescriptor.RELEASE_KEY ) );
-        
+
         versionMap = (Map<String, String>) descriptor.getResolvedSnapshotDependencies().get( devDependencyKey );
         assertEquals( "1.3-SNAPSHOT", versionMap.get( ReleaseDescriptor.DEVELOPMENT_KEY) );
     }
@@ -291,7 +291,7 @@ public class ReleaseUtilsTest
         properties.setProperty( "dependency.locations.enabled", "false" );
         ReleaseUtils.copyPropertiesToReleaseDescriptor( properties );
     }
-    
+
     private static ReleaseDescriptor copyReleaseDescriptor( ReleaseDescriptor originalReleaseDescriptor )
     {
         return createReleaseDescriptor( originalReleaseDescriptor.getWorkingDirectory() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
index 8350302..a979c1f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/CommandLineFactoryTest.java
@@ -32,6 +32,7 @@ public class CommandLineFactoryTest
 {
     private CommandLineFactory factory;
 
+    @Override
     protected void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
index 287ac00..597f542 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
@@ -58,16 +58,17 @@ public class ForkedMavenExecutorTest
     extends PlexusTestCase
 {
     private ForkedMavenExecutor executor;
-    
+
     private SecDispatcher secDispatcher;
 
+    @Override
     protected void setUp()
         throws Exception
     {
         super.setUp();
 
         executor = (ForkedMavenExecutor) lookup( MavenExecutor.ROLE, "forked-path" );
-        
+
         secDispatcher = (SecDispatcher) lookup( SecDispatcher.ROLE, "mng-4384" );
     }
 
@@ -87,7 +88,7 @@ public class ForkedMavenExecutorTest
 
         Arg valueArgument = mock( Arg.class );
         when( commandLineMock.createArg() ).thenReturn( valueArgument );
-        
+
         CommandLineFactory commandLineFactoryMock = mock( CommandLineFactory.class );
         when( commandLineFactoryMock.createCommandLine( isA( String.class ) /*"mvn"*/ ) ).thenReturn( commandLineMock );
 
@@ -111,7 +112,7 @@ public class ForkedMavenExecutorTest
         verify( valueArgument ).setValue( "--no-plugin-updates" );
         verify( valueArgument ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
-        
+
         verifyNoMoreInteractions( mockProcess, commandLineFactoryMock, commandLineMock, valueArgument );
     }
 
@@ -124,13 +125,13 @@ public class ForkedMavenExecutorTest
         when( mockProcess.getErrorStream() ).thenReturn( mock( InputStream.class ) );
         when( mockProcess.getOutputStream() ).thenReturn( mock( OutputStream.class ) );
         when( mockProcess.waitFor() ).thenReturn( 0 );
-        
+
         Commandline commandLineMock = mock( Commandline.class );
         when( commandLineMock.execute() ).thenReturn( mockProcess );
-        
+
         Arg argMock = mock( Arg.class );
         when( commandLineMock.createArg() ).thenReturn( argMock );
-        
+
         CommandLineFactory commandLineFactoryMock = mock( CommandLineFactory.class );
         when( commandLineFactoryMock.createCommandLine( isA( String.class ) /* "mvn" */ ) ).thenReturn( commandLineMock );
 
@@ -156,7 +157,7 @@ public class ForkedMavenExecutorTest
         verify( argMock ).setValue( "--no-plugin-updates" );
         verify( argMock ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
-        
+
         verifyNoMoreInteractions( mockProcess, commandLineMock, argMock, commandLineFactoryMock );
     }
 
@@ -172,7 +173,7 @@ public class ForkedMavenExecutorTest
 
         Commandline commandLineMock = mock( Commandline.class );
         when( commandLineMock.execute() ).thenReturn( mockProcess );
-        
+
         Arg argMock = mock( Arg.class );
         when( commandLineMock.createArg() ).thenReturn( argMock );
 
@@ -201,7 +202,7 @@ public class ForkedMavenExecutorTest
         verify( argMock ).setValue( "--batch-mode" );
         verify( argMock ).setLine( "-DperformRelease=true -Dmaven.test.skip=true" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
-        
+
         verifyNoMoreInteractions( mockProcess, commandLineMock, argMock, commandLineFactoryMock );
     }
 
@@ -219,10 +220,10 @@ public class ForkedMavenExecutorTest
 
         Commandline commandLineMock = mock( Commandline.class );
         when( commandLineMock.execute() ).thenReturn( mockProcess );
-        
+
         Arg argMock = mock( Arg.class );
         when( commandLineMock.createArg() ).thenReturn( argMock );
-        
+
         CommandLineFactory commandLineFactoryMock = mock( CommandLineFactory.class );
         when( commandLineFactoryMock.createCommandLine( endsWith( "mvn" ) ) ).thenReturn( commandLineMock );
 
@@ -239,7 +240,7 @@ public class ForkedMavenExecutorTest
         {
             assertEquals( "Check exit code", 1, e.getExitCode() );
         }
-        
+
         // verify
         verify( mockProcess ).getInputStream();
         verify( mockProcess ).getErrorStream();
@@ -256,7 +257,7 @@ public class ForkedMavenExecutorTest
         verify( argMock ).setValue( "--no-plugin-updates" );
         verify( argMock ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
-        
+
         verifyNoMoreInteractions( mockProcess, commandLineMock, argMock, commandLineFactoryMock );
     }
 
@@ -271,10 +272,10 @@ public class ForkedMavenExecutorTest
 
         Arg argMock = mock( Arg.class );
         when ( commandLineMock.createArg() ).thenReturn( argMock );
-        
+
         CommandLineFactory commandLineFactoryMock = mock( CommandLineFactory.class );
         when( commandLineFactoryMock.createCommandLine( endsWith( "mvn" ) ) ).thenReturn( commandLineMock );
-        
+
         executor.setCommandLineFactory( commandLineFactoryMock );
 
         // execute
@@ -300,10 +301,10 @@ public class ForkedMavenExecutorTest
         verify( argMock ).setValue( "--no-plugin-updates" );
         verify( argMock ).setValue( "--batch-mode" );
         verify( commandLineFactoryMock ).createCommandLine( endsWith( "mvn" ) );
-        
+
         verifyNoMoreInteractions( commandLineMock, argMock, commandLineFactoryMock );
     }
-    
+
     public void testEncryptSettings()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
index 1b5d1d6..9b8b1ea 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
@@ -8,9 +8,9 @@ package org.apache.maven.shared.release.exec;
  * 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
@@ -51,6 +51,7 @@ public class InvokerMavenExecutorTest
 
     private SecDispatcher secDispatcher;
 
+    @Override
     protected void setUp()
         throws Exception
     {
@@ -121,7 +122,7 @@ public class InvokerMavenExecutorTest
         executor.setupRequest( req, null, "\"-tmytoolchains.xml\"" );
         assertEquals( new File( "mytoolchains.xml" ), req.getToolchainsFile() );
     }
-    
+
     @Test
     public void testGlobalSettings()
         throws Exception
@@ -144,8 +145,8 @@ public class InvokerMavenExecutorTest
         // prepare
         File workingDirectory = getTestFile( "target/working-directory" );
         workingDirectory.mkdirs();
-        
-        
+
+
         Settings settings = new Settings();
         Server server = new Server();
         server.setPassphrase( "server_passphrase" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeConsumerTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeConsumerTest.java
index 96805f1..d7d2e04 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeConsumerTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeConsumerTest.java
@@ -38,6 +38,7 @@ public class TeeConsumerTest
 
     private static final String LS = System.getProperty( "line.separator" );
 
+    @Override
     protected void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeOutputStreamTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeOutputStreamTest.java
index a43ab66..5b6cbf7 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeOutputStreamTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/TeeOutputStreamTest.java
@@ -26,7 +26,7 @@ import java.io.PrintStream;
 
 /**
  * Test the output stream that tees output both to a stream and into an internal buffer for later.
- *
+ *
  * @author Benjamin Bentmann
  * @version $Id$
  */
@@ -39,6 +39,7 @@ public class TeeOutputStreamTest
 
     private static final String LS = System.getProperty( "line.separator" );
 
+    @Override
     protected void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
index e33997d..8300e3a 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
@@ -42,6 +42,7 @@ public abstract class AbstractBackupPomsPhaseTest
 
     protected ReleasePhase phase;
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -56,7 +57,7 @@ public abstract class AbstractBackupPomsPhaseTest
     protected List<MavenProject> getReactorProjects( String projectPath )
         throws Exception
     {
-        List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+        List<MavenProject> reactorProjects = new ArrayList<>();
 
         File pomFile = new File( projectPath, pomFilename );
 
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
index 5bb4c6a..506a880 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractReleaseTestCase.java
@@ -42,24 +42,17 @@ import java.util.Objects;
 import java.util.Stack;
 
 import org.apache.commons.lang.SystemUtils;
-import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactUtils;
-import org.apache.maven.artifact.factory.ArtifactFactory;
 import org.apache.maven.artifact.repository.ArtifactRepository;
 import org.apache.maven.artifact.repository.DefaultArtifactRepository;
 import org.apache.maven.artifact.repository.MavenArtifactRepository;
 import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout;
 import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout;
-import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
-import org.apache.maven.artifact.versioning.VersionRange;
-import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Profile;
 import org.apache.maven.model.Repository;
 import org.apache.maven.project.DefaultProjectBuildingRequest;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.project.ProjectBuilder;
-import org.apache.maven.project.ProjectBuildingException;
 import org.apache.maven.project.ProjectBuildingRequest;
 import org.apache.maven.project.ProjectBuildingRequest.RepositoryMerging;
 import org.apache.maven.project.ProjectBuildingResult;
@@ -88,18 +81,19 @@ public abstract class AbstractReleaseTestCase
     extends PlexusJUnit4TestCase
 {
     protected ProjectBuilder projectBuilder;
-    
+
     protected ArtifactRepository localRepository;
 
     protected ReleasePhase phase;
 
+    @Override
     public void setUp()
         throws Exception
     {
         super.setUp();
-        
+
         projectBuilder = lookup( ProjectBuilder.class );
-        
+
         ArtifactRepositoryLayout layout = lookup( ArtifactRepositoryLayout.class, "default" );
         String localRepoPath = getTestFile( "target/local-repository" ).getAbsolutePath().replace( '\\', '/' );
         localRepository = new MavenArtifactRepository( "local", "file://" + localRepoPath, layout, null, null );
@@ -112,8 +106,8 @@ public abstract class AbstractReleaseTestCase
     }
 
     /**
-     *
-     * @param sourcePath sourceDirectory to copy from
+     *
+     * @param sourcePath sourceDirectory to copy from
      * @param targetPath targetDirectory to copy to
      * @param executionRoot sub directory of targetPath in case the root pom.xml is not used (e.g. flat projects)
      * @return all Maven projects
@@ -168,7 +162,7 @@ public abstract class AbstractReleaseTestCase
         Profile profile = new Profile();
         profile.setId( "profile" );
         profile.addRepository( repository );
-        
+
         ProjectBuildingRequest buildingRequest = new DefaultProjectBuildingRequest();
         buildingRequest.setLocalRepository( localRepository );
         buildingRequest.setRemoteRepositories( repos );
@@ -184,8 +178,8 @@ public abstract class AbstractReleaseTestCase
         List<ProjectBuildingResult> buildingResults =
             projectBuilder.build( Collections.singletonList( testCaseRootTo.resolve( projectFiles.peek() ).toFile() ),
                                   true, buildingRequest );
-        
-        List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+
+        List<MavenProject> reactorProjects = new ArrayList<>();
         for ( ProjectBuildingResult buildingResult : buildingResults )
         {
             reactorProjects.add( buildingResult.getProject() ) ;
@@ -193,10 +187,10 @@ public abstract class AbstractReleaseTestCase
 
         WorkspaceReader simpleReactorReader = new SimpleReactorWorkspaceReader( reactorProjects );
         repositorySession.setWorkspaceReader( simpleReactorReader );
-        
+
         ProjectSorter sorter = new ProjectSorter( reactorProjects );
         reactorProjects = sorter.getSortedProjects();
-        
+
         List<MavenProject> resolvedProjects = new ArrayList<>( reactorProjects.size() );
         for ( MavenProject project  : reactorProjects )
         {
@@ -207,10 +201,10 @@ public abstract class AbstractReleaseTestCase
 
     protected static Map<String,MavenProject> getProjectsAsMap( List<MavenProject> reactorProjects )
     {
-        Map<String,MavenProject> map = new HashMap<String,MavenProject>();
+        Map<String,MavenProject> map = new HashMap<>();
         for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
         {
-            MavenProject project = (MavenProject) i.next();
+            MavenProject project = i.next();
 
             map.put( ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() ), project );
         }
@@ -275,9 +269,9 @@ public abstract class AbstractReleaseTestCase
     {
         StringBuffer sb = new StringBuffer( "Check the transformed POM " + actualFile );
         sb.append( SystemUtils.LINE_SEPARATOR );
-        
+
         final String remoteRepositoryURL = getRemoteRepositoryURL();
-        
+
         DiffBuilder diffBuilder = DiffBuilder.compare( expectedFile ).withTest( actualFile );
         if ( normalizeLineEndings )
         {
@@ -288,8 +282,8 @@ public abstract class AbstractReleaseTestCase
             diffBuilder.ignoreComments();
         }
         // Order of elements has changed between M2 and M3, so match by name
-        diffBuilder.withNodeMatcher( new DefaultNodeMatcher( ElementSelectors.byName ) ).checkForSimilar();        
-        
+        diffBuilder.withNodeMatcher( new DefaultNodeMatcher( ElementSelectors.byName ) ).checkForSimilar();
+
         diffBuilder.withDifferenceEvaluator( new DifferenceEvaluator()
         {
             @Override
@@ -306,24 +300,24 @@ public abstract class AbstractReleaseTestCase
                     // Order of elements has changed between M2 and M3
                     return ComparisonResult.EQUAL;
                 }
-                else if ( outcome == ComparisonResult.DIFFERENT
-                                && comparison.getType() == ComparisonType.TEXT_VALUE
+                else if ( outcome == ComparisonResult.DIFFERENT
+                                && comparison.getType() == ComparisonType.TEXT_VALUE
                                 && "${project.build.directory}/site".equals( comparison.getTestDetails().getValue() ) )
                 {
                     // M2 was target/site, M3 is ${project.build.directory}/site
                     return ComparisonResult.EQUAL;
                 }
-                else
+                else
                 {
                     return outcome;
                 }
             }
         } );
-        
+
         Diff diff = diffBuilder.build();
 
         sb.append( diff.toString() );
-        
+
         assertFalse( sb.toString(), diff.hasDifferences() );
     }
 
@@ -337,13 +331,13 @@ public abstract class AbstractReleaseTestCase
         }
         return "file://" + getTestFile( "src/test/remote-repository" ).getCanonicalPath().replace( '\\', '/' );
     }
-    
+
     public static String getPath( File file )
         throws IOException
     {
         return ReleaseUtil.isSymlink( file ) ? file.getCanonicalPath() : file.getAbsolutePath();
     }
-    
+
     /**
      * WorkspaceReader to find versions and artifacts from reactor
      */
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
index 6a02e6d..cfcf496 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractRewritingReleasePhaseTestCase.java
@@ -70,12 +70,12 @@ public abstract class AbstractRewritingReleasePhaseTestCase
     {
         return Arrays.asList( new Object[][] { { JDomModelETLFactory.ROLE_HINT } } );
     }
-    
+
     public AbstractRewritingReleasePhaseTestCase( String modelETL )
     {
         this.modelETL = modelETL;
     }
-    
+
     @Override
     public void setUp()
         throws Exception
@@ -88,9 +88,9 @@ public abstract class AbstractRewritingReleasePhaseTestCase
             ((AbstractRewritePomsPhase) phase).setModelETL( modelETL );
         }
     }
-    
+
     protected abstract String getRoleHint();
-    
+
     @Test
     public void testRewriteBasicPom()
         throws Exception
@@ -164,7 +164,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
         ReleaseDescriptor config = createDescriptorFromProjects( reactorProjects );
 
         // Process the child first
-        reactorProjects = new ArrayList<MavenProject>( reactorProjects );
+        reactorProjects = new ArrayList<>( reactorProjects );
         Collections.reverse( reactorProjects );
 
         mapAlternateNextVersion( config, "groupId:subproject1" );
@@ -221,7 +221,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
 
         phase.execute( config, new DefaultReleaseEnvironment(), reactorProjects );
 
-        MavenProject project = (MavenProject) getProjectsAsMap( reactorProjects ).get( "groupId:subproject1" );
+        MavenProject project = getProjectsAsMap( reactorProjects ).get( "groupId:subproject1" );
         comparePomFiles( project, "-version-changed" );
     }
 
@@ -558,7 +558,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
         config.setScmUseEditMode( true );
         config.setScmSourceUrl( "scm:svn:fail" );
         mapNextVersion( config, "groupId:artifactId" );
-        
+
         ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
         if ( scmManager instanceof ScmManagerStub )
         {
@@ -587,7 +587,7 @@ public abstract class AbstractRewritingReleasePhaseTestCase
         config.setScmUseEditMode( true );
         config.setScmSourceUrl( "scm:fail:path" );
         mapNextVersion( config, "groupId:artifactId" );
-        
+
         ScmManager scmManager = (ScmManager) lookup( ScmManager.ROLE );
         if ( scmManager instanceof ScmManagerStub )
         {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
index 512a359..8dbe5bb 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/BranchInputVariablesPhaseTest.java
@@ -52,6 +52,7 @@ public class BranchInputVariablesPhaseTest
 {
     private InputVariablesPhase phase;
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -303,7 +304,7 @@ public class BranchInputVariablesPhaseTest
         // never use prompter
         verifyNoMoreInteractions( mockPrompter );
     }
-    
+
     @Test
     public void testNamingPolicy() throws Exception
     {
@@ -312,11 +313,11 @@ public class BranchInputVariablesPhaseTest
         releaseDescriptor.setInteractive( false );
         releaseDescriptor.setProjectNamingPolicyId( "stub" );
         releaseDescriptor.setScmSourceUrl( "scm:svn:file://localhost/tmp/scm-repo" );
-        
+
         List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
-        
+
         phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
-        
+
         assertEquals( "STUB", releaseDescriptor.getScmReleaseLabel() );
     }
 
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
index 7128929..e10073f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhaseTest.java
@@ -61,6 +61,7 @@ public class CheckDependencySnapshotsPhaseTest
 
     private static final List<String> CHOICE_ARRAY = Arrays.asList( "0", DEFAULT_CHOICE, "2", "3" );
 
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
index 0b38535..6dffbfa 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckPomPhaseTest.java
@@ -40,6 +40,7 @@ public class CheckPomPhaseTest
 {
     private ReleasePhase phase;
 
+    @Override
     protected void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
index bb3d52b..84c8aba 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScmTest.java
@@ -59,6 +59,7 @@ public class CheckoutProjectFromScmTest
 {
     private CheckoutProjectFromScm phase;
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -194,7 +195,7 @@ public class CheckoutProjectFromScmTest
                                             any( CommandParameters.class ));
         verifyNoMoreInteractions( scmProviderMock );
     }
-    
+
     @Test
     public void testNoSuchScmProviderExceptionThrown()
                     throws Exception
@@ -203,13 +204,13 @@ public class CheckoutProjectFromScmTest
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
         releaseDescriptor.setScmSourceUrl( "scm-url" );
         releaseDescriptor.setWorkingDirectory( getTestFile( "target/test/checkout" ).getAbsolutePath() );
-        
+
         ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
         scmManagerStub.setException( new NoSuchScmProviderException( "..." )  );
 
-        String dir = "scm-commit/single-pom";  
+        String dir = "scm-commit/single-pom";
         List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
-        
+
         // execute
         try
         {
@@ -237,9 +238,9 @@ public class CheckoutProjectFromScmTest
         ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
         scmManagerStub.setException( new ScmRepositoryException( "..." )  );
 
-        String dir = "scm-commit/single-pom";  
+        String dir = "scm-commit/single-pom";
         List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
-        
+
         // execute
         try
         {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
index d29e397..2cbd15b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhaseTest.java
@@ -37,6 +37,7 @@ import org.junit.Test;
 public class CreateBackupPomsPhaseTest
     extends AbstractBackupPomsPhaseTest
 {
+    @Override
     ReleasePhase getReleasePhase()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java
index 379c39d..7bcf445 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/EndReleasePhaseTest.java
@@ -39,6 +39,7 @@ public class EndReleasePhaseTest
 {
     private ReleasePhase phase;
 
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
index df19bda..5cf97fd 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhaseTest.java
@@ -69,6 +69,7 @@ public class GenerateReleasePomsPhaseTest
         super( modelETL );
     }
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -76,7 +77,7 @@ public class GenerateReleasePomsPhaseTest
 
         scmProviderMock = null;
     }
-    
+
     @Override
     protected String getRoleHint()
     {
@@ -162,6 +163,7 @@ public class GenerateReleasePomsPhaseTest
      * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createDescriptorFromProjects(java.
      * util.List)
      */
+    @Override
     protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
     {
         ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
@@ -174,6 +176,7 @@ public class GenerateReleasePomsPhaseTest
      * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#createReactorProjects(java.lang.
      * String, boolean)
      */
+    @Override
     protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
         throws Exception
     {
@@ -182,7 +185,7 @@ public class GenerateReleasePomsPhaseTest
 
         scmProviderMock = mock( ScmProvider.class );
 
-        List<File> releasePoms = new ArrayList<File>();
+        List<File> releasePoms = new ArrayList<>();
 
         for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
         {
@@ -211,7 +214,7 @@ public class GenerateReleasePomsPhaseTest
         String dir = "generate-release-poms/"+ path;
         List<MavenProject> reactorProjects = createReactorProjects( dir, dir, null );
 
-        List<File> releasePoms = new ArrayList<File>();
+        List<File> releasePoms = new ArrayList<>();
 
         for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
         {
@@ -231,6 +234,7 @@ public class GenerateReleasePomsPhaseTest
      * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#mapNextVersion(org.apache.maven.
      * shared.release.config.ReleaseDescriptor, java.lang.String)
      */
+    @Override
     protected void mapNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, NEXT_VERSION );
@@ -241,6 +245,7 @@ public class GenerateReleasePomsPhaseTest
      * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#mapAlternateNextVersion(org.apache.
      * maven.shared.release.config.ReleaseDescriptor, java.lang.String)
      */
+    @Override
     protected void mapAlternateNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, ALTERNATIVE_NEXT_VERSION );
@@ -251,6 +256,7 @@ public class GenerateReleasePomsPhaseTest
      * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#unmapNextVersion(org.apache.maven.
      * shared.release.config.ReleaseDescriptor, java.lang.String)
      */
+    @Override
     protected void unmapNextVersion( ReleaseDescriptor config, String projectId )
     {
         // nothing to do
@@ -260,6 +266,7 @@ public class GenerateReleasePomsPhaseTest
      * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#
      * createConfigurationForPomWithParentAlternateNextVersion(java.util.List)
      */
+    @Override
     protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -275,6 +282,7 @@ public class GenerateReleasePomsPhaseTest
      * @see org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#
      * createConfigurationForWithParentNextVersion(java.util.List)
      */
+    @Override
     protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -290,6 +298,7 @@ public class GenerateReleasePomsPhaseTest
      * @see
      * org.apache.maven.shared.release.phase.AbstractRewritingReleasePhaseTestCase#readTestProjectFile(java.lang.String)
      */
+    @Override
     protected String readTestProjectFile( String fileName )
         throws IOException
     {
@@ -303,6 +312,7 @@ public class GenerateReleasePomsPhaseTest
      * java.lang.String)
      */
     // @Override
+    @Override
     protected void comparePomFiles( MavenProject project, String expectedFileSuffix, boolean normalizeLineEndings )
         throws IOException
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
index 0a77753..de0f56f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/InputVariablesPhaseTest.java
@@ -51,6 +51,7 @@ public class InputVariablesPhaseTest
 {
     private InputVariablesPhase phase;
 
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
index ddd9320..a552097 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
@@ -43,7 +43,7 @@ public class IsScmFileSetEquals extends ArgumentMatcher<ScmFileSet>
     public boolean matches( Object argument )
     {
         ScmFileSet fs = (ScmFileSet) argument;
-        
+
         try
         {
             return fs.getBasedir().getCanonicalPath().equals( fileSet.getBasedir().getCanonicalPath() )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java
index 3499667..9f03a92 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapDevelopmentVersionPhaseIT.java
@@ -40,7 +40,7 @@ public class MapDevelopmentVersionPhaseIT
         super.setUp();
         mapVersionsPhase = (MapVersionsPhase) lookup( ReleasePhase.class.getName(), "map-development-versions" );
     }
-    
+
     private static MavenProject createProject( String artifactId, String version )
     {
         Model model = new Model();
@@ -55,10 +55,10 @@ public class MapDevelopmentVersionPhaseIT
         ReleaseDescriptor releaseDescriptor = new ReleaseDescriptor();
         releaseDescriptor.setInteractive( false );
         releaseDescriptor.setUpdateWorkingCopyVersions( false );
-        
+
         List<MavenProject> reactorProjects = Collections.singletonList( createProject( "artifactId", "1.0" ) );
         mapVersionsPhase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
-        
+
         assertEquals( "1.0", releaseDescriptor.getDevelopmentVersions().get( "groupId:artifactId" ) );
     }
 }
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
index 62da1bb..4ca94aa 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/MapVersionsPhaseTest.java
@@ -55,7 +55,7 @@ import org.mockito.MockitoAnnotations;
 
 /**
  * Test the version mapping phase.
- *
+ *
  * @author <a href="mailto:[hidden email]">Brett Porter</a>
  */
 public class MapVersionsPhaseTest
@@ -73,6 +73,7 @@ public class MapVersionsPhaseTest
     @Mock
     private Prompter mockPrompter;
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -1877,7 +1878,7 @@ public class MapVersionsPhaseTest
         // verify
         MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
 
-        List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+        List<MavenProject> reactorProjects = new ArrayList<>();
         Collections.addAll( reactorProjects, createProject( "artifactId", "1.2-SNAPSHOT" ),
                             createProject( "module1", "2.0" ) );
 
@@ -1889,7 +1890,7 @@ public class MapVersionsPhaseTest
         phase.execute( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
 
         // verify
-        Map<String, String> developmentVersions = new HashMap<String, String>();
+        Map<String, String> developmentVersions = new HashMap<>();
         developmentVersions.put( "groupId:artifactId", "1.3-SNAPSHOT" );
         developmentVersions.put( "groupId:module1", "2.0" );
         assertEquals( "Check development versions", developmentVersions, releaseDescriptor.getDevelopmentVersions() );
@@ -1903,7 +1904,7 @@ public class MapVersionsPhaseTest
         // verify
         MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_DEVELOPMENT_VERSIONS );
 
-        List<MavenProject> reactorProjects = new ArrayList<MavenProject>();
+        List<MavenProject> reactorProjects = new ArrayList<>();
         Collections.addAll( reactorProjects, createProject( "artifactId", "1.2-SNAPSHOT" ),
                             createProject( "module1", "2.0" ) );
 
@@ -1915,7 +1916,7 @@ public class MapVersionsPhaseTest
         phase.simulate( releaseDescriptor, new DefaultReleaseEnvironment(), reactorProjects );
 
         // verify
-        Map<String, String> developmentVersions = new HashMap<String, String>();
+        Map<String, String> developmentVersions = new HashMap<>();
         developmentVersions.put( "groupId:artifactId", "1.3-SNAPSHOT" );
         developmentVersions.put( "groupId:module1", "2.0" );
         assertEquals( "Check development versions", developmentVersions, releaseDescriptor.getDevelopmentVersions() );
@@ -2129,7 +2130,7 @@ public class MapVersionsPhaseTest
     {
         expectedException.expect( ReleaseExecutionException.class );
         expectedException.expectCause( CoreMatchers.isA( PolicyException.class ) );
-        
+
         // prepare
         MapVersionsPhase phase = (MapVersionsPhase) lookup( ReleasePhase.ROLE, TEST_MAP_RELEASE_VERSIONS );
 
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
index 1a347bc..4423dd0 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
@@ -50,6 +50,7 @@ public class ReleasePhaseStub
      */
     private boolean cleaned;
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
@@ -61,6 +62,7 @@ public class ReleasePhaseStub
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
@@ -72,6 +74,7 @@ public class ReleasePhaseStub
         return result;
     }
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
@@ -83,6 +86,7 @@ public class ReleasePhaseStub
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
@@ -94,6 +98,7 @@ public class ReleasePhaseStub
         return result;
     }
 
+    @Override
     public ReleaseResult clean( List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
index 3d089c9..447bf7a 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhaseTest.java
@@ -60,6 +60,7 @@ import org.junit.Test;
 public class RemoveReleasePomsPhaseTest
     extends AbstractReleaseTestCase
 {
+    @Override
     public void setUp()
         throws Exception
     {
@@ -106,7 +107,7 @@ public class RemoveReleasePomsPhaseTest
         List<MavenProject> reactorProjects = createReactorProjects( "pom-with-modules" );
         ReleaseDescriptor config = createReleaseDescriptor();
 
-        List<File> releasePoms = new ArrayList<File>();
+        List<File> releasePoms = new ArrayList<>();
         for ( Iterator<MavenProject> iterator = reactorProjects.iterator(); iterator.hasNext(); )
         {
             MavenProject project = iterator.next();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
index 23c1d5c..9b8c219 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhaseTest.java
@@ -40,6 +40,7 @@ public class RestoreBackupPomsPhaseTest
 {
     private String expectedPomFilename = "expected-pom.xml";
 
+    @Override
     ReleasePhase getReleasePhase()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
index 8905af5..b9da089 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhaseTest.java
@@ -58,6 +58,7 @@ public class RewritePomsForBranchPhaseTest
         return "rewrite-poms-for-branch";
     }
 
+    @Override
     protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
         throws Exception
     {
@@ -65,6 +66,7 @@ public class RewritePomsForBranchPhaseTest
         return createReactorProjects( dir, dir, null );
     }
 
+    @Override
     protected String readTestProjectFile( String fileName )
         throws IOException
     {
@@ -163,16 +165,19 @@ public class RewritePomsForBranchPhaseTest
         assertTrue( comparePomFiles( reactorProjects ) );
     }
 
+    @Override
     protected void mapAlternateNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, ALTERNATIVE_NEXT_VERSION );
     }
 
+    @Override
     protected void mapNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, NEXT_VERSION );
     }
 
+    @Override
     protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -183,6 +188,7 @@ public class RewritePomsForBranchPhaseTest
         return config;
     }
 
+    @Override
     protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -193,6 +199,7 @@ public class RewritePomsForBranchPhaseTest
         return config;
     }
 
+    @Override
     protected void unmapNextVersion( ReleaseDescriptor config, String projectId )
     {
         // nothing to do
@@ -427,6 +434,7 @@ public class RewritePomsForBranchPhaseTest
         assertTrue( comparePomFiles( reactorProjects, false ) );
     }
 
+    @Override
     protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
     {
         ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
index 5b48292..af94c55 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhaseTest.java
@@ -98,7 +98,7 @@ public class RewritePomsForDevelopmentPhaseTest
         throws Exception
     {
         List<MavenProject> reactorProjects =
-            new LinkedList<MavenProject>( createReactorProjects( "basic-pom-ejb-client-dep/project" ) );
+            new LinkedList<>( createReactorProjects( "basic-pom-ejb-client-dep/project" ) );
         reactorProjects.addAll( createReactorProjects( "basic-pom-ejb-client-dep/ejb" ) );
         ReleaseDescriptor config = createDescriptorFromBasicPom( reactorProjects );
         config.mapReleaseVersion( "groupId:artifactId", RELEASE_VERSION );
@@ -180,6 +180,7 @@ public class RewritePomsForDevelopmentPhaseTest
         }
     }
 
+    @Override
     protected String readTestProjectFile( String fileName )
         throws IOException
     {
@@ -192,6 +193,7 @@ public class RewritePomsForDevelopmentPhaseTest
         return ReleaseUtil.readXmlFile( getTestFile( "target/test-classes/projects/" + subpath + fileName ) );
     }
 
+    @Override
     protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
         throws Exception
     {
@@ -199,6 +201,7 @@ public class RewritePomsForDevelopmentPhaseTest
         return createReactorProjects( dir, dir, null );
     }
 
+    @Override
     protected ReleaseDescriptor createDescriptorFromBasicPom( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -218,23 +221,27 @@ public class RewritePomsForDevelopmentPhaseTest
         config.mapOriginalScmInfo( "groupId:artifactId", scm );
     }
 
+    @Override
     protected void mapAlternateNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, ALTERNATIVE_RELEASE_VERSION );
         config.mapDevelopmentVersion( projectId, ALTERNATIVE_NEXT_VERSION );
     }
 
+    @Override
     protected void mapNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, RELEASE_VERSION );
         config.mapDevelopmentVersion( projectId, NEXT_VERSION );
     }
 
+    @Override
     protected void unmapNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, RELEASE_VERSION );
     }
 
+    @Override
     protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -249,6 +256,7 @@ public class RewritePomsForDevelopmentPhaseTest
         return config;
     }
 
+    @Override
     protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
index 6f0d618..a89ef57 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhaseTest.java
@@ -58,6 +58,7 @@ public class RewritePomsForReleasePhaseTest
         return "rewrite-poms-for-release";
     }
 
+    @Override
     protected List<MavenProject> prepareReactorProjects( String path, boolean copyFiles )
         throws Exception
     {
@@ -65,6 +66,7 @@ public class RewritePomsForReleasePhaseTest
         return createReactorProjects( dir, dir, null );
     }
 
+    @Override
     protected String readTestProjectFile( String fileName )
         throws IOException
     {
@@ -163,16 +165,19 @@ public class RewritePomsForReleasePhaseTest
         assertTrue( comparePomFiles( reactorProjects ) );
     }
 
+    @Override
     protected void mapAlternateNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, ALTERNATIVE_NEXT_VERSION );
     }
 
+    @Override
     protected void mapNextVersion( ReleaseDescriptor config, String projectId )
     {
         config.mapReleaseVersion( projectId, NEXT_VERSION );
     }
 
+    @Override
     protected ReleaseDescriptor createConfigurationForPomWithParentAlternateNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -183,6 +188,7 @@ public class RewritePomsForReleasePhaseTest
         return config;
     }
 
+    @Override
     protected ReleaseDescriptor createConfigurationForWithParentNextVersion( List<MavenProject> reactorProjects )
         throws Exception
     {
@@ -193,6 +199,7 @@ public class RewritePomsForReleasePhaseTest
         return config;
     }
 
+    @Override
     protected void unmapNextVersion( ReleaseDescriptor config, String projectId )
     {
         // nothing to do
@@ -427,6 +434,7 @@ public class RewritePomsForReleasePhaseTest
         assertTrue( comparePomFiles( reactorProjects, false ) );
     }
 
+    @Override
     protected ReleaseDescriptor createDescriptorFromProjects( List<MavenProject> reactorProjects )
     {
         ReleaseDescriptor descriptor = super.createDescriptorFromProjects( reactorProjects );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
index 83e5a57..2c394e3 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhaseTest.java
@@ -56,9 +56,10 @@ public class RunCompleteGoalsPhaseTest
     private RunCompleteGoalsPhase phase;
 
     private MavenExecutorWrapper mavenExecutorWrapper;
-    
+
     private ReleaseEnvironment releaseEnvironment;
 
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
index d8ff801..0447e12 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhaseTest.java
@@ -64,20 +64,21 @@ public class RunPerformGoalsPhaseTest
     extends PlexusJUnit4TestCase
 {
     private RunPerformGoalsPhase phase;
-    
+
     private MavenExecutorWrapper mavenExecutorWrapper;
-    
+
     private ReleaseEnvironment releaseEnvironment;
 
+    @Override
     public void setUp()
         throws Exception
     {
         super.setUp();
 
         phase = (RunPerformGoalsPhase) lookup( ReleasePhase.ROLE, "run-perform-goals" );
-        
+
         mavenExecutorWrapper = (MavenExecutorWrapper) lookup( "org.apache.maven.shared.release.exec.MavenExecutor", "wrapper" );
-        
+
         releaseEnvironment = new DefaultReleaseEnvironment();
         releaseEnvironment.setMavenExecutorId( "wrapper" );
     }
@@ -94,7 +95,7 @@ public class RunPerformGoalsPhaseTest
         config.setCheckoutDirectory( testFile.getAbsolutePath() );
 
         MavenExecutor mock = mock( MavenExecutor.class );
-        
+
         mavenExecutorWrapper.setMavenExecutor( mock );
 
         doThrow( new MavenExecutorException( "...", new Exception() ) ).when( mock ).executeGoals( eq( testFile ),
@@ -118,7 +119,7 @@ public class RunPerformGoalsPhaseTest
         {
             assertEquals( "Check cause", MavenExecutorException.class, e.getCause().getClass() );
         }
-        
+
         //verify
         verify( mock ).executeGoals( eq( testFile ),
                                      eq( "goal1 goal2" ),
@@ -139,13 +140,13 @@ public class RunPerformGoalsPhaseTest
         config.setPerformGoals( "goal1 goal2" );
         config.setPomFileName( "pom1.xml" );
         config.setCheckoutDirectory( testFile.getAbsolutePath() );
-        
+
         MavenExecutor mock = mock( MavenExecutor.class );
-        
+
         mavenExecutorWrapper.setMavenExecutor( mock );
-        
+
         phase.execute( config, releaseEnvironment, (List<MavenProject>) null );
-        
+
         verify( mock ).executeGoals( eq( testFile ),
                                      eq( "goal1 goal2" ),
                                      isA( ReleaseEnvironment.class ),
@@ -153,10 +154,10 @@ public class RunPerformGoalsPhaseTest
                                      eq( "-DperformRelease=true -f pom1.xml" ),
                                      eq( "pom1.xml" ),
                                      isA( ReleaseResult.class ) );
-        
+
         verifyNoMoreInteractions( mock );
     }
-    
+
     public void testReleasePerformWithArgumentsNoReleaseProfile()
                     throws Exception
     {
@@ -200,7 +201,7 @@ public class RunPerformGoalsPhaseTest
                                             isA( CommandParameters.class ));
         verifyNoMoreInteractions( mock, scmProviderMock );
     }
-    
+
     public void testReleasePerform()
                     throws Exception
     {
@@ -215,7 +216,7 @@ public class RunPerformGoalsPhaseTest
         mavenExecutorWrapper.setMavenExecutor( mock );
 
         ScmProvider scmProviderMock = mock( ScmProvider.class );
-        when( scmProviderMock.checkOut( isA( ScmRepository.class ),
+        when( scmProviderMock.checkOut( isA( ScmRepository.class ),
                                         argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
                                         isA( ScmTag.class ),
                                         isA( CommandParameters.class )) )
@@ -228,20 +229,20 @@ public class RunPerformGoalsPhaseTest
         phase.execute( releaseDescriptor, releaseEnvironment, createReactorProjects() );
 
         // verify
-        verify( mock ).executeGoals( eq( checkoutDirectory ),
-                                     eq( "goal1 goal2" ),
-                                     isA( ReleaseEnvironment.class ),
-                                     eq( true ),
+        verify( mock ).executeGoals( eq( checkoutDirectory ),
+                                     eq( "goal1 goal2" ),
+                                     isA( ReleaseEnvironment.class ),
+                                     eq( true ),
                                      eq( "-DperformRelease=true -f pom.xml" ),
-                                     isNull( String.class ),
+                                     isNull( String.class ),
                                      isA( ReleaseResult.class ) );
-        verify( scmProviderMock ).checkOut( isA( ScmRepository.class ),
+        verify( scmProviderMock ).checkOut( isA( ScmRepository.class ),
                                             argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
                                             isA( ScmTag.class ),
                                             isA( CommandParameters.class ));
         verifyNoMoreInteractions( mock, scmProviderMock );
     }
-    
+
     public void testReleasePerformNoReleaseProfile()
                     throws Exception
     {
@@ -256,8 +257,8 @@ public class RunPerformGoalsPhaseTest
         mavenExecutorWrapper.setMavenExecutor( mock );
 
         ScmProvider scmProviderMock = mock( ScmProvider.class );
-        when( scmProviderMock.checkOut( isA( ScmRepository.class ),
-                                        argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
+        when( scmProviderMock.checkOut( isA( ScmRepository.class ),
+                                        argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
                                         isA( ScmTag.class ),
                                         isA( CommandParameters.class )) )
             .thenReturn( new CheckOutScmResult( "...", Collections.<ScmFile>emptyList() ) );
@@ -271,20 +272,20 @@ public class RunPerformGoalsPhaseTest
         phase.execute( releaseDescriptor, releaseEnvironment, createReactorProjects() );
 
         // verify
-        verify( mock ).executeGoals( eq( checkoutDirectory ),
-                                     eq( "goal1 goal2" ),
-                                     isA( ReleaseEnvironment.class ),
+        verify( mock ).executeGoals( eq( checkoutDirectory ),
+                                     eq( "goal1 goal2" ),
+                                     isA( ReleaseEnvironment.class ),
                                      eq( true ),
                                      eq( "-f pom.xml" ),
-                                     isNull( String.class ),
+                                     isNull( String.class ),
                                      isA( ReleaseResult.class ) );
-        verify( scmProviderMock ).checkOut( isA( ScmRepository.class ),
-                                            argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
+        verify( scmProviderMock ).checkOut( isA( ScmRepository.class ),
+                                            argThat( new IsScmFileSetEquals( new ScmFileSet( checkoutDirectory ) ) ),
                                             isA( ScmTag.class ),
                                             isA( CommandParameters.class ));
         verifyNoMoreInteractions( mock, scmProviderMock );
     }
-    
+
     public void testReleasePerformWithArguments()
                     throws Exception
     {
@@ -326,7 +327,7 @@ public class RunPerformGoalsPhaseTest
                                             isA( CommandParameters.class ));
         verifyNoMoreInteractions( mock, scmProviderMock );
     }
-    
+
     public void testReleasePerformWithReleasePropertiesCompleted()
                     throws Exception
     {
@@ -359,8 +360,8 @@ public class RunPerformGoalsPhaseTest
         verify( mock ).executeGoals( eq( checkoutDirectory ),
                                      eq( "goal1 goal2" ),
                                      isA( ReleaseEnvironment.class ),
-                                     eq( true ),
-                                     eq( "-DperformRelease=true -f pom.xml" ),
+                                     eq( true ),
+                                     eq( "-DperformRelease=true -f pom.xml" ),
                                      isNull( String.class ),
                                      isA( ReleaseResult.class ) );
         verify( scmProviderMock ).checkOut( isA( ScmRepository.class ),
@@ -369,7 +370,7 @@ public class RunPerformGoalsPhaseTest
                                             isA( CommandParameters.class ));
         verifyNoMoreInteractions( mock, scmProviderMock );
     }
-    
+
     private static List<MavenProject> createReactorProjects()
     {
         MavenProject project = new MavenProject();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
index 9b0217d..3f548e4 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhaseTest.java
@@ -56,18 +56,19 @@ public class RunPrepareGoalsPhaseTest
     private RunPrepareGoalsPhase phase;
 
     private MavenExecutorWrapper mavenExecutorWrapper;
-    
+
     private ReleaseEnvironment releaseEnvironment;
 
+    @Override
     public void setUp()
         throws Exception
     {
         super.setUp();
 
         phase = (RunPrepareGoalsPhase) lookup( ReleasePhase.ROLE, "run-preparation-goals" );
-        
+
         mavenExecutorWrapper = (MavenExecutorWrapper) lookup( "org.apache.maven.shared.release.exec.MavenExecutor", "wrapper" );
-        
+
         releaseEnvironment = new DefaultReleaseEnvironment();
         releaseEnvironment.setMavenExecutorId( "wrapper" );
     }
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
index 1af9ec6..f9f3f81 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmBranchPhaseTest.java
@@ -68,6 +68,7 @@ import org.junit.Test;
 public class ScmBranchPhaseTest
     extends AbstractReleaseTestCase
 {
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
index 257ca6f..6b02adb 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhaseTest.java
@@ -68,6 +68,7 @@ public class ScmCheckModificationsPhaseTest
 {
     private ReleasePhase phase;
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -421,7 +422,7 @@ public class ScmCheckModificationsPhaseTest
 
     private static List<ScmFile> createScmFiles( List<String> changedFiles )
     {
-        List<ScmFile> files = new ArrayList<ScmFile>( changedFiles.size() );
+        List<ScmFile> files = new ArrayList<>( changedFiles.size() );
         for ( Iterator<String> i = changedFiles.iterator(); i.hasNext(); )
         {
             String fileName = i.next();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
index 4b60f5c..10eb976 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhaseTest.java
@@ -68,6 +68,7 @@ public class ScmCommitDevelopmentPhaseTest
 
     private ScmProvider scmProviderMock;
 
+    @Override
     public void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
index 5aec3f2..e5beb58 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhaseTest.java
@@ -71,6 +71,7 @@ public class ScmCommitPreparationPhaseTest
 {
     private static final String PREFIX = "[maven-release-manager] prepare release ";
 
+    @Override
     public void setUp()
         throws Exception
     {
@@ -139,7 +140,7 @@ public class ScmCommitPreparationPhaseTest
         descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
         descriptor.setScmReleaseLabel( "release-label" );
 
-        List<File> poms = new ArrayList<File>();
+        List<File> poms = new ArrayList<>();
         for ( Iterator<MavenProject> i = reactorProjects.iterator(); i.hasNext(); )
         {
             MavenProject project = i.next();
@@ -233,7 +234,7 @@ public class ScmCommitPreparationPhaseTest
         descriptor.setWorkingDirectory( rootProject.getFile().getParentFile().getAbsolutePath() );
         descriptor.setScmReleaseLabel( "release-label" );
 
-        List<File> files = new ArrayList<File>();
+        List<File> files = new ArrayList<>();
         files.add( rootProject.getFile() );
         files.add( ReleaseUtil.getReleasePom( rootProject ) );
         ScmFileSet fileSet = new ScmFileSet( rootProject.getFile().getParentFile(), files );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
index e1e1729..283a63e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ScmTagPhaseTest.java
@@ -68,6 +68,7 @@ import org.junit.Test;
 public class ScmTagPhaseTest
     extends AbstractReleaseTestCase
 {
+    @Override
     public void setUp()
         throws Exception
     {
@@ -331,7 +332,7 @@ public class ScmTagPhaseTest
 
         ScmManagerStub scmManagerStub = (ScmManagerStub) lookup( ScmManager.ROLE );
         scmManagerStub.setException( new ScmRepositoryException( "..." )  );
-        
+
         // execute
         try
         {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultNamingPolicyTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultNamingPolicyTest.java
index 1ad6b26..0a47922 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultNamingPolicyTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/policies/DefaultNamingPolicyTest.java
@@ -27,7 +27,7 @@ import org.junit.Test;
 public class DefaultNamingPolicyTest
 {
     private DefaultNamingPolicy policy = new DefaultNamingPolicy();
-    
+
     @Test
     public void testName() throws Exception
     {
@@ -36,7 +36,7 @@ public class DefaultNamingPolicyTest
         assertEquals( "ARTIFACTID-1.0-SNAPSHOT",
                       policy.getName( newNamingPolicyRequest( "ARTIFACTID", "1.0-SNAPSHOT" ) ).getName() );
     }
-    
+
     private NamingPolicyRequest newNamingPolicyRequest( String artifactId, String version )
     {
         return new NamingPolicyRequest().setArtifactId( artifactId ).setVersion( version );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslatorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslatorTest.java
index 7e2e974..9fe1233 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslatorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslatorTest.java
@@ -24,12 +24,12 @@ import junit.framework.TestCase;
 public class ClearCaseScmTranslatorTest
     extends TestCase
 {
-    private ClearCaseScmTranslator scmTranslator = new ClearCaseScmTranslator();  
-    
+    private ClearCaseScmTranslator scmTranslator = new ClearCaseScmTranslator();
+
     /**
      * @see org.apache.maven.model.Scm#getTag()
      */
-    public void testResolveTag()
+    public void testResolveTag()
     {
         // with current implementation you can't call your tag 'HEAD' (which is the default)
         assertEquals( null, scmTranslator.resolveTag( "HEAD" ) );
@@ -47,7 +47,7 @@ public class ClearCaseScmTranslatorTest
         assertEquals( "url", scmTranslator.translateBranchUrl( "url", "branchName", null )  );
         assertEquals( "url", scmTranslator.translateBranchUrl( "url", "branchName", "tagBase" )  );
     }
-    
+
     public void testGetRelativePath()
     {
         assertEquals( "a/b/c", "a/b/c" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/CvsScmTranslatorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/CvsScmTranslatorTest.java
index 251dfd0..dd35b89 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/CvsScmTranslatorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/CvsScmTranslatorTest.java
@@ -24,12 +24,12 @@ import junit.framework.TestCase;
 public class CvsScmTranslatorTest
     extends TestCase
 {
-    private CvsScmTranslator scmTranslator = new CvsScmTranslator();  
-    
+    private CvsScmTranslator scmTranslator = new CvsScmTranslator();
+
     /**
      * @see org.apache.maven.model.Scm#getTag()
      */
-    public void testResolveTag()
+    public void testResolveTag()
     {
         // with current implementation you can't call your tag 'HEAD' (which is the default)
         assertEquals( null, scmTranslator.resolveTag( "HEAD" ) );
@@ -47,7 +47,7 @@ public class CvsScmTranslatorTest
         assertEquals( "url", scmTranslator.translateBranchUrl( "url", "branchName", null )  );
         assertEquals( "url", scmTranslator.translateBranchUrl( "url", "branchName", "tagBase" )  );
     }
-    
+
     public void testGetRelativePath()
     {
         assertEquals( "a/b/c", "a/b/c" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
index 5a866e4..ec4308b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfiguratorTest.java
@@ -42,6 +42,7 @@ public class DefaultScmRepositoryConfiguratorTest
 
     private static final int CVS_PORT = 2401;
 
+    @Override
     protected void setUp()
         throws Exception
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/GitScmTranslatorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/GitScmTranslatorTest.java
index d1573d3..3fddafa 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/GitScmTranslatorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/GitScmTranslatorTest.java
@@ -30,7 +30,7 @@ public class GitScmTranslatorTest
     /**
      * @see org.apache.maven.model.Scm#getTag()
      */
-    public void testResolveTag()
+    public void testResolveTag()
     {
         assertEquals( "HEAD", scmTranslator.resolveTag( "HEAD" ) );
         assertEquals( "project-1.0", scmTranslator.resolveTag( "project-1.0" ) );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java
index 989cdf7..8a8cd0c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/HgScmTranslatorTest.java
@@ -24,12 +24,12 @@ import junit.framework.TestCase;
 public class HgScmTranslatorTest
     extends TestCase
 {
-    private HgScmTranslator scmTranslator = new HgScmTranslator();  
-    
+    private HgScmTranslator scmTranslator = new HgScmTranslator();
+
     /**
      * @see org.apache.maven.model.Scm#getTag()
      */
-    public void testResolveTag()
+    public void testResolveTag()
     {
         assertEquals( "HEAD", scmTranslator.resolveTag( "HEAD" ) );
         assertEquals( "project-1.0", scmTranslator.resolveTag( "project-1.0" ) );
@@ -46,7 +46,7 @@ public class HgScmTranslatorTest
         assertEquals( "url", scmTranslator.translateBranchUrl( "url", "branchName", null )  );
         assertEquals( "url", scmTranslator.translateBranchUrl( "url", "branchName", "tagBase" )  );
     }
-    
+
     public void testGetRelativePath()
     {
         assertEquals( "a/b/c", "a/b/c" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/JazzScmTranslatorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/JazzScmTranslatorTest.java
index 0dcb805..7c55b2c 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/JazzScmTranslatorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/JazzScmTranslatorTest.java
@@ -32,7 +32,7 @@ public class JazzScmTranslatorTest
     /**
      * @see org.apache.maven.model.Scm#getTag()
      */
-    public void testResolveTag()
+    public void testResolveTag()
     {
         assertNull( scmTranslator.resolveTag( "HEAD" ) );
         assertNull( scmTranslator.resolveTag( "project-1.0" ) );
@@ -49,7 +49,7 @@ public class JazzScmTranslatorTest
         assertEquals( "url:branchName", scmTranslator.translateBranchUrl( "url:module", "branchName", null ) );
         assertEquals( "url:branchName", scmTranslator.translateBranchUrl( "url:module", "branchName", "tagBase" ) );
     }
-    
+
     public void testGetRelativePath()
     {
         assertEquals( "BogusTest" + File.separator + "release.properties", scmTranslator.toRelativePath( "BogusTest/release.properties" ) );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/SubversionScmTranslatorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/SubversionScmTranslatorTest.java
index 3c0dd3d..ca7ac37 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/SubversionScmTranslatorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/scm/SubversionScmTranslatorTest.java
@@ -30,9 +30,9 @@ public class SubversionScmTranslatorTest
     /**
      * @see org.apache.maven.model.Scm#getTag()
      */
-    public void testResolveTag()
+    public void testResolveTag()
     {
-        // "HEAD"is default
+        // "HEAD"is default
         assertNull( scmTranslator.resolveTag( "HEAD" ) );
         assertNull( scmTranslator.resolveTag( "project-1.0" ) );
     }
@@ -48,7 +48,7 @@ public class SubversionScmTranslatorTest
         assertEquals( "url/branches/branchName", scmTranslator.translateBranchUrl( "url", "branchName", null )  );
         assertEquals( "tagBase/branchName", scmTranslator.translateBranchUrl( "url", "branchName", "tagBase" )  );
     }
-    
+
     public void testGetRelativePath()
     {
         assertEquals( "a/b/c", "a/b/c" );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
index ede8f39..209ae95 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
@@ -29,7 +29,7 @@ import org.apache.maven.shared.release.exec.MavenExecutorException;
 public class MavenExecutorWrapper implements MavenExecutor
 {
     private MavenExecutor executor;
-    
+
     public void setMavenExecutor( MavenExecutor executor )
     {
         this.executor = executor;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
index 45db43b..a901c90 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/ScmManagerStub.java
@@ -33,7 +33,7 @@ public class ScmManagerStub
     extends org.apache.maven.scm.manager.ScmManagerStub
 {
     private Exception e;
-    
+
     private Map<String, ScmRepository> scmRepositoriesForUrl = new HashMap<>();
 
     @Override
@@ -55,7 +55,7 @@ public class ScmManagerStub
                 throw new RuntimeException( e );
             }
         }
-        
+
         if ( scmRepositoriesForUrl.isEmpty() )
         {
             // we didn't configure any for URLs, return the preset one
@@ -74,7 +74,7 @@ public class ScmManagerStub
     {
         scmRepositoriesForUrl.put( url, repository );
     }
-    
+
     public void setException( Exception e )
     {
         this.e = e;
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java
index f14d291..fd301fd 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomBuildTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
 public class JDomBuildTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test
     public void testGetExtensions() throws Exception
     {
@@ -79,7 +79,7 @@ public class JDomBuildTest
         document = builder.build( new StringReader( content ) );
         assertEquals( 1, new JDomBuild( document.getRootElement() ).getPlugins().size() );
     }
-    
+
     // All other methods throw UnsupportedOperationException
 
     @Test( expected = UnsupportedOperationException.class )
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java
index e851f24..3af1068 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagementTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 public class JDomDependencyManagementTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test
     public void testGetDependencies() throws Exception
     {
@@ -50,7 +50,7 @@ public class JDomDependencyManagementTest
     }
 
     // All other methods throw UnsupportedOperationException
-    
+
     @Test( expected = UnsupportedOperationException.class )
     public void testAddDependency()
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java
index ed84a66..4ba1f8b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 public class JDomDependencyTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test( expected = UnsupportedOperationException.class )
     public void testIsOptional()
     {
@@ -56,7 +56,7 @@ public class JDomDependencyTest
         String content = "<dependency></dependency>";
         Element dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
         assertNull( new JDomDependency( dependencyElm ).getArtifactId() );
-        
+
         content = "<dependency><artifactId>ARTIFACTID</artifactId></dependency>";
         dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
         assertEquals( "ARTIFACTID", new JDomDependency( dependencyElm ).getArtifactId() );
@@ -80,7 +80,7 @@ public class JDomDependencyTest
         String content = "<dependency></dependency>";
         Element dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
         assertNull( new JDomDependency( dependencyElm ).getGroupId() );
-        
+
         content = "<dependency><groupId>GROUPID</groupId></dependency>";
         dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
         assertEquals( "GROUPID", new JDomDependency( dependencyElm ).getGroupId() );
@@ -110,7 +110,7 @@ public class JDomDependencyTest
         String content = "<dependency></dependency>";
         Element dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
         assertNull( new JDomDependency( dependencyElm ).getVersion() );
-        
+
         content = "<dependency><version>VERSION</version></dependency>";
         dependencyElm = builder.build( new StringReader( content ) ).getRootElement();
         assertEquals( "VERSION", new JDomDependency( dependencyElm ).getVersion() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java
index 5df8583..cac513f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomExtensionTest.java
@@ -31,14 +31,14 @@ import org.junit.Test;
 public class JDomExtensionTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test
     public void testGetArtifactId() throws Exception
     {
         String content = "<extension></extension>";
         Element extensionElm = builder.build( new StringReader( content ) ).getRootElement();
         assertNull( new JDomExtension( extensionElm ).getArtifactId() );
-        
+
         content = "<extension><artifactId>ARTIFACTID</artifactId></extension>";
         extensionElm = builder.build( new StringReader( content ) ).getRootElement();
         assertEquals( "ARTIFACTID", new JDomExtension( extensionElm ).getArtifactId() );
@@ -50,7 +50,7 @@ public class JDomExtensionTest
         String content = "<extension></extension>";
         Element extensionElm = builder.build( new StringReader( content ) ).getRootElement();
         assertNull( new JDomExtension( extensionElm ).getGroupId() );
-        
+
         content = "<extension><groupId>GROUPID</groupId></extension>";
         extensionElm = builder.build( new StringReader( content ) ).getRootElement();
         assertEquals( "GROUPID", new JDomExtension( extensionElm ).getGroupId() );
@@ -62,7 +62,7 @@ public class JDomExtensionTest
         String content = "<extension></extension>";
         Element extensionElm = builder.build( new StringReader( content ) ).getRootElement();
         assertNull( new JDomExtension( extensionElm ).getVersion() );
-        
+
         content = "<extension><version>VERSION</version></extension>";
         extensionElm = builder.build( new StringReader( content ) ).getRootElement();
         assertEquals( "VERSION", new JDomExtension( extensionElm ).getVersion() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java
index 291097e..32be37b 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java
@@ -35,7 +35,7 @@ import org.junit.Test;
 public class JDomModelTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test
     public void testGetScm() throws Exception
     {
@@ -43,7 +43,7 @@ public class JDomModelTest
         Document document = builder.build( new StringReader( content ) );
         assertNull( new JDomModel( document ).getScm() );
     }
-    
+
     @Test
     public void testSetScm() throws Exception
     {
@@ -51,14 +51,14 @@ public class JDomModelTest
         Document document = builder.build( new StringReader( content ) );
         Model model = new JDomModel( document );
         assertNull( model.getScm() );
-        
+
         model.setScm( new Scm() );
         assertNotNull( model.getScm() );
 
         model.setScm( null );
         assertNull( model.getScm() );
     }
-    
+
     @Test
     public void testSetVersion() throws Exception
     {
@@ -69,10 +69,10 @@ public class JDomModelTest
 
         model.setVersion( "VERSION" );
         assertEquals( "VERSION", getVersion( projectElm ) );
-        
+
         model.setVersion( null );
         assertNull( model.getVersion() );
-        
+
         // inherit from parent
         // this business logic might need to moved.
         content = "<project><parent><version>PARENT_VERSION</version></parent></project>";
@@ -85,11 +85,11 @@ public class JDomModelTest
 
         model.setVersion( "VERSION" );
         assertEquals( "VERSION", getVersion( projectElm ) );
-        
+
         model.setVersion( null );
         assertNull( model.getVersion() );
     }
-    
+
     private String getVersion( Element projectElm )
     {
         return projectElm.getChildText( "version", projectElm.getNamespace() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java
index 26a6f46..b88d9f1 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomParentTest.java
@@ -30,7 +30,7 @@ import org.junit.Test;
 public class JDomParentTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test( expected = UnsupportedOperationException.class )
     public void testGetArtifactId()
     {
@@ -78,9 +78,9 @@ public class JDomParentTest
     {
         String content = "<parent></parent>";
         Element parentElm = builder.build( new StringReader( content ) ).getRootElement();
-        
+
         assertNull( getVersion( parentElm ) );
-        
+
         new JDomParent( parentElm ).setVersion( "VERSION" );
         assertEquals( "VERSION", getVersion( parentElm ) );
 
@@ -96,6 +96,6 @@ public class JDomParentTest
 
     private String getVersion( Element parentElm )
     {
-        return parentElm.getChildText( "version", parentElm.getNamespace() );
+        return parentElm.getChildText( "version", parentElm.getNamespace() );
     }
 }
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java
index d66424c..415ff80 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomPropertiesTest.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 public class JDomPropertiesTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test
     public void testSetProperty() throws Exception
     {
@@ -114,7 +114,7 @@ public class JDomPropertiesTest
         String content = "<properties></properties>";
         Element propertiesElm = builder.build( new StringReader( content ) ).getRootElement();
         assertNull( new JDomProperties( propertiesElm ).getProperty( "KEY" ) );
-        
+
         content = "<properties><KEY>VALUE</KEY></properties>";
         propertiesElm = builder.build( new StringReader( content ) ).getRootElement();
         assertEquals( "VALUE", new JDomProperties( propertiesElm ).getProperty( "KEY" ) );
@@ -149,7 +149,7 @@ public class JDomPropertiesTest
     {
         new JDomProperties( null ).list( (PrintWriter) null );
     }
-    
+
     private String getProperty( Element propertiesElm, String key )
     {
         return propertiesElm.getChildText( key, propertiesElm.getNamespace() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java
index ada6889..664cb37 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomScmTest.java
@@ -31,7 +31,7 @@ import org.junit.Test;
 public class JDomScmTest
 {
     private SAXBuilder builder = new SAXBuilder();
-    
+
     @Test( expected = UnsupportedOperationException.class )
     public void testGetConnection()
     {
@@ -61,9 +61,9 @@ public class JDomScmTest
     {
         String content = "<scm></scm>";
         Element scmElm = builder.build( new StringReader( content ) ).getRootElement();
-        
+
         assertNull( getConnection( scmElm ) );
-        
+
         new JDomScm( scmElm ).setConnection( "CONNECTION" );
         assertEquals( "CONNECTION", getConnection( scmElm ) );
 
@@ -76,9 +76,9 @@ public class JDomScmTest
     {
         String content = "<scm></scm>";
         Element scmElm = builder.build( new StringReader( content ) ).getRootElement();
-        
+
         assertNull( getDeveloperConnection( scmElm ) );
-        
+
         new JDomScm( scmElm ).setDeveloperConnection( "DEVELOPERCONNECTION" );
         assertEquals( "DEVELOPERCONNECTION", getDeveloperConnection( scmElm ) );
 
@@ -91,9 +91,9 @@ public class JDomScmTest
     {
         String content = "<scm></scm>";
         Element scmElm = builder.build( new StringReader( content ) ).getRootElement();
-        
+
         assertNull( getUrl( scmElm ) );
-        
+
         new JDomScm( scmElm ).setUrl( "URL" );
         assertEquals( "URL", getUrl( scmElm ) );
 
@@ -106,16 +106,16 @@ public class JDomScmTest
     {
         String content = "<scm></scm>";
         Element scmElm = builder.build( new StringReader( content ) ).getRootElement();
-        
+
         assertNull( getTag( scmElm ) );
-        
+
         new JDomScm( scmElm ).setTag( "TAG" );
         assertEquals( "TAG", getTag( scmElm ) );
 
         new JDomScm( scmElm ).setTag( null );
         assertNull( getTag( scmElm ) );
     }
-    
+
     private String getConnection( Element scmElm )
     {
         return scmElm.getChildText( "connection", scmElm.getNamespace() );
@@ -125,7 +125,7 @@ public class JDomScmTest
     {
         return scmElm.getChildText( "developerConnection", scmElm.getNamespace() );
     }
-    
+
     private String getTag( Element scmElm )
     {
         return scmElm.getChildText( "tag", scmElm.getNamespace() );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
index 04cbdef..79bfeba 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/PomFinderTest.java
@@ -34,6 +34,7 @@ public class PomFinderTest extends PlexusTestCase
 {
     private Logger logger = null;
 
+    @Override
     protected void setUp() throws Exception
     {
         super.setUp();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
index 93cfeb9..6b063c9 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/util/ReleaseUtilTest.java
@@ -337,16 +337,18 @@ public class ReleaseUtilTest
     {
      return createProject( basedir, basedir );
     }
-    
+
     private static MavenProject createProject( final String basedirPath, final String basedirCanonicalPath )
     {
         return new MavenProject()
         {
+            @Override
             public File getBasedir()
             {
                 return new File( basedirPath )
                 {
-                 public String getCanonicalPath()
+                 @Override
+                    public String getCanonicalPath()
                  {
                  return basedirCanonicalPath;
                  }
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/versions/DefaultVersionInfoTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/versions/DefaultVersionInfoTest.java
index 7dbf6f0..8603dc1 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/versions/DefaultVersionInfoTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/versions/DefaultVersionInfoTest.java
@@ -29,7 +29,7 @@ public class DefaultVersionInfoTest
     extends TestCase
 {
     private String mavenVersion;
-    
+
     @Override
     protected void setUp()
         throws Exception
@@ -38,7 +38,7 @@ public class DefaultVersionInfoTest
         pomProperties.load( DefaultArtifactVersion.class.getResourceAsStream( "/META-INF/maven/org.apache.maven/maven-artifact/pom.properties" ) );
         mavenVersion = pomProperties.getProperty( "version" );
     }
-    
+
     public void testParse()
         throws Exception
     {
@@ -152,7 +152,7 @@ public class DefaultVersionInfoTest
         checkNextVersion( "1.009", "1.010" );
 
         checkNextVersion( "1.99", "1.100" );
-        
+
         //MRELEASE-623 SNAPSHOT is case-insensitive
         checkNextVersion( "2.2-SNAPshot", "2.3-SNAPshot" );
     }
@@ -172,21 +172,21 @@ public class DefaultVersionInfoTest
         throws Exception
     {
         checkVersionLessThanVersion( "1.01", "1.02" );
-        
+
         // M2.2.1
         // checkVersionLessThanVersion( "1.00009", "1.01" );
         // M3.0, because prefix 0's are ignored, hence 1 < 9
         checkVersionLessThanVersion( "1.01", "1.00009" );
-        
+
         checkVersionLessThanVersion( "1.01", "1.01.01" );
 
         // M2.2.1
         // checkVersionLessThanVersion( "1.01", "1.1" );
         // M3.0, because prefix 0's are ignored, hence 1 == 1
         checkVersionEqualVersion( "1.01", "1.1" );
-        
+
         checkVersionEqualVersion( "1.01", "1.01" );
-        
+
         // M2.2.1
         // checkVersionLessThanVersion( "1.001", "1.01" );
         // M3.0, because prefix 0's are ignored, hence 1 == 1
@@ -281,13 +281,13 @@ public class DefaultVersionInfoTest
         assertTrue( new DefaultVersionInfo( "1.01-beta-04-SNAPSHOT" ).isSnapshot() );
         assertTrue( new DefaultVersionInfo( "1.01-beta-04-20051112.134500-1" ).isSnapshot() );
         assertFalse( new DefaultVersionInfo( "1.01-beta-04_20051112.134500-1" ).isSnapshot() );
-        
+
     }
-    
+
     //MRELEASE-623 SNAPSHOT is case-insensitive
     public void testCaseInsensitiveSnapshot() throws VersionParseException
     {
-        DefaultVersionInfo currentVersionInfo = new DefaultVersionInfo( "2.2-SNAPshot" );
+        DefaultVersionInfo currentVersionInfo = new DefaultVersionInfo( "2.2-SNAPshot" );
         assertTrue( currentVersionInfo.isSnapshot()  );
         assertEquals( "2.2", currentVersionInfo.getReleaseVersionString() );
         VersionInfo nextVersionInfo = currentVersionInfo.getNextVersion();
diff --git a/pom.xml b/pom.xml
index dd2cddc..962328f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,11 @@
           <artifactId>maven-surefire-plugin</artifactId>
           <version>2.20.1</version>
         </plugin>
-
+        <plugin>
+          <groupId>org.codehaus.mojo</groupId>
+          <artifactId>findbugs-maven-plugin</artifactId>
+          <version>3.0.5</version>
+        </plugin>
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-metadata</artifactId>

--
To stop receiving notification emails like this one, please contact
['"[hidden email]" <[hidden email]>'].