[maven-release] branch master updated: Code cleanup, 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: Code cleanup, 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 94b631b  Code cleanup, no implementation changes
94b631b is described below

commit 94b631bb251400a2aa859634f2bb2f5150120770
Author: rfscholte <[hidden email]>
AuthorDate: Tue Jan 9 23:51:39 2018 +0100

    Code cleanup, no implementation changes
---
 .../shared/release/AbstractReleaseRequest.java     |  6 +-
 .../shared/release/DefaultReleaseManager.java      | 87 ++++++++++++----------
 .../maven/shared/release/ReleaseBranchRequest.java |  6 +-
 .../maven/shared/release/ReleaseCleanRequest.java  |  2 +-
 .../maven/shared/release/ReleaseManager.java       | 26 +++++--
 .../shared/release/ReleasePerformRequest.java      |  2 +-
 .../shared/release/ReleasePrepareRequest.java      |  2 +-
 .../shared/release/ReleaseRollbackRequest.java     |  2 +-
 .../release/ReleaseUpdateVersionsRequest.java      |  2 +-
 .../config/PropertiesReleaseDescriptorStore.java   |  3 +
 .../maven/shared/release/config/ReleaseUtils.java  |  6 +-
 .../release/env/DefaultReleaseEnvironment.java     | 18 ++++-
 .../shared/release/env/ReleaseEnvironment.java     |  8 +-
 .../shared/release/exec/AbstractMavenExecutor.java | 34 ++++-----
 .../release/exec/DefaultCommandLineFactory.java    |  1 +
 .../maven/shared/release/exec/MavenExecutor.java   |  2 +
 .../maven/shared/release/exec/RawStreamPumper.java | 11 +--
 .../maven/shared/release/exec/TeeConsumer.java     |  2 +
 .../maven/shared/release/exec/TeeOutputStream.java | 15 ++--
 .../shared/release/phase/AbstractReleasePhase.java |  7 +-
 .../release/phase/AbstractRewritePomsPhase.java    | 68 ++++++++---------
 .../release/phase/AbstractRunGoalsPhase.java       |  1 +
 .../release/phase/AbstractScmCommitPhase.java      |  6 +-
 .../phase/CheckCompletedPreparePhasesPhase.java    |  2 +
 .../phase/CheckDependencySnapshotsPhase.java       | 20 ++---
 .../maven/shared/release/phase/CheckPomPhase.java  |  6 +-
 .../release/phase/CheckoutProjectFromScm.java      |  4 +-
 .../release/phase/CreateBackupPomsPhase.java       |  3 +
 .../shared/release/phase/EndReleasePhase.java      |  2 +
 .../release/phase/GenerateReleasePomsPhase.java    | 57 +++++++-------
 .../shared/release/phase/InputVariablesPhase.java  | 12 +--
 .../shared/release/phase/MapVersionsPhase.java     |  2 +
 .../maven/shared/release/phase/ReleasePhase.java   |  2 +
 .../release/phase/RemoveReleasePomsPhase.java      |  4 +-
 .../shared/release/phase/RemoveScmTagPhase.java    |  2 +
 .../release/phase/RestoreBackupPomsPhase.java      |  2 +
 .../release/phase/RewritePomVersionsPhase.java     |  2 +-
 .../release/phase/RewritePomsForBranchPhase.java   | 17 +++--
 .../phase/RewritePomsForDevelopmentPhase.java      |  2 +-
 .../release/phase/RewritePomsForReleasePhase.java  |  4 +-
 .../release/phase/RunCompleteGoalsPhase.java       |  3 +
 .../shared/release/phase/RunPerformGoalsPhase.java | 13 ++--
 .../shared/release/phase/RunPrepareGoalsPhase.java |  3 +
 .../maven/shared/release/phase/ScmBranchPhase.java |  4 +-
 .../release/phase/ScmCheckModificationsPhase.java  | 12 +--
 .../release/phase/ScmCommitDevelopmentPhase.java   |  1 +
 .../release/phase/ScmCommitPreparationPhase.java   |  2 +
 .../maven/shared/release/phase/ScmTagPhase.java    |  2 +
 .../release/policies/DefaultNamingPolicy.java      |  2 +-
 .../release/policies/DefaultVersionPolicy.java     |  4 +-
 .../shared/release/scm/ClearCaseScmTranslator.java |  6 +-
 .../maven/shared/release/scm/CvsScmTranslator.java |  6 +-
 .../scm/DefaultScmRepositoryConfigurator.java      |  3 +
 .../maven/shared/release/scm/GitScmTranslator.java |  8 +-
 .../maven/shared/release/scm/HgScmTranslator.java  | 10 +--
 .../maven/shared/release/scm/IdentifiedScm.java    |  8 +-
 .../shared/release/scm/JazzScmTranslator.java      |  4 +
 .../maven/shared/release/scm/ScmTranslator.java    |  4 +-
 .../release/scm/SubversionScmTranslator.java       |  6 +-
 .../shared/release/transform/MavenCoordinate.java  | 10 +--
 .../maven/shared/release/transform/ModelETL.java   |  6 +-
 .../shared/release/transform/ModelETLFactory.java  |  2 +-
 .../shared/release/transform/ModelETLRequest.java  |  8 +-
 .../shared/release/transform/jdom/JDomBuild.java   |  8 +-
 .../release/transform/jdom/JDomDependency.java     |  6 +-
 .../transform/jdom/JDomDependencyManagement.java   |  8 +-
 .../release/transform/jdom/JDomExtension.java      |  2 +-
 .../transform/jdom/JDomMavenCoordinate.java        | 12 +--
 .../shared/release/transform/jdom/JDomModel.java   | 42 +++++------
 .../release/transform/jdom/JDomModelBase.java      | 12 +--
 .../release/transform/jdom/JDomModelETL.java       | 33 ++++----
 .../transform/jdom/JDomModelETLFactory.java        |  6 +-
 .../shared/release/transform/jdom/JDomParent.java  |  6 +-
 .../shared/release/transform/jdom/JDomPlugin.java  |  6 +-
 .../transform/jdom/JDomPluginManagement.java       |  8 +-
 .../shared/release/transform/jdom/JDomProfile.java |  8 +-
 .../release/transform/jdom/JDomProperties.java     | 10 +--
 .../release/transform/jdom/JDomReportPlugin.java   |  4 +-
 .../release/transform/jdom/JDomReporting.java      |  6 +-
 .../shared/release/transform/jdom/JDomScm.java     |  2 +-
 .../shared/release/transform/jdom/JDomUtils.java   |  6 +-
 .../maven/shared/release/util/PomFinder.java       |  2 +
 .../maven/shared/release/util/ReleaseUtil.java     |  6 +-
 .../release/versions/DefaultVersionInfo.java       | 12 ++-
 84 files changed, 460 insertions(+), 332 deletions(-)

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java
index 4bbca6d..8e7070e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java
@@ -25,18 +25,18 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 2.3
  */
 public abstract class AbstractReleaseRequest
 {
     private ReleaseDescriptor releaseDescriptor;
-    
+
     private List<MavenProject> reactorProjects;
 
     private ReleaseManagerListener releaseManagerListener;
-    
+
     /**
      * @return the releaseDescriptor
      */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
index 3b5667b..a674bc7 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManager.java
@@ -85,7 +85,7 @@ public class DefaultReleaseManager
 
     private static final int PHASE_SKIP = 0, PHASE_START = 1, PHASE_END = 2, GOAL_START = 11, GOAL_END = 12, ERROR = 99;
 
-    /** {@inheritDoc} */
+    @Override
     public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                          List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -93,7 +93,7 @@ public class DefaultReleaseManager
         prepare( releaseDescriptor, releaseEnvironment, reactorProjects, true, false, null );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                          List<MavenProject> reactorProjects, boolean resume, boolean dryRun )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -101,6 +101,7 @@ public class DefaultReleaseManager
         prepare( releaseDescriptor, releaseEnvironment, reactorProjects, resume, dryRun, null );
     }
 
+    @Override
     public ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                             List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
                                             ReleaseManagerListener listener )
@@ -131,7 +132,7 @@ public class DefaultReleaseManager
         return result;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void prepare( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                          List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
                          ReleaseManagerListener listener )
@@ -139,8 +140,8 @@ public class DefaultReleaseManager
     {
         prepare( releaseDescriptor, releaseEnvironment, reactorProjects, resume, dryRun, listener, null );
     }
-    
-    /** {@inheritDoc} */
+
+    @Override
     public void prepare( ReleasePrepareRequest prepareRequest )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -162,7 +163,7 @@ public class DefaultReleaseManager
 
         prepare( prepareRequest, result );
     }
-    
+
     private void prepare( ReleasePrepareRequest prepareRequest, ReleaseResult result )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -255,7 +256,7 @@ public class DefaultReleaseManager
         updateListener( prepareRequest.getReleaseManagerListener(), "prepare", GOAL_END );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                           List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -263,7 +264,7 @@ public class DefaultReleaseManager
         rollback( releaseDescriptor, releaseEnvironment, reactorProjects, null );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void rollback( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                           List<MavenProject> reactorProjects, ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -276,8 +277,8 @@ public class DefaultReleaseManager
 
         rollback( rollbackRequest );
     }
-    
-    /** {@inheritDoc} */
+
+    @Override
     public void rollback( ReleaseRollbackRequest rollbackRequest )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -302,13 +303,13 @@ public class DefaultReleaseManager
         }
 
         //call release:clean so that resume will not be possible anymore after a rollback
-        clean( releaseDescriptor,
-               rollbackRequest.getReleaseManagerListener(),
+        clean( releaseDescriptor,
+               rollbackRequest.getReleaseManagerListener(),
                rollbackRequest.getReactorProjects() );
         updateListener( rollbackRequest.getReleaseManagerListener(), "rollback", GOAL_END );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                          List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -316,7 +317,7 @@ public class DefaultReleaseManager
         perform( releaseDescriptor, releaseEnvironment, reactorProjects, null, true );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                          List<MavenProject> reactorProjects, boolean clean )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -324,7 +325,7 @@ public class DefaultReleaseManager
         perform( releaseDescriptor, releaseEnvironment, reactorProjects, null, clean );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                          List<MavenProject> reactorProjects, ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -339,6 +340,7 @@ public class DefaultReleaseManager
         perform( releaseDescriptor, releaseEnvironment, reactorProjects, listener, new ReleaseResult(), clean );
     }
 
+    @Override
     public ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                             List<MavenProject> reactorProjects, ReleaseManagerListener listener )
     {
@@ -368,13 +370,13 @@ public class DefaultReleaseManager
         return result;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void perform( ReleasePerformRequest performRequest )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         perform( performRequest, new ReleaseResult() );
     }
-    
+
     private void perform( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                           List<MavenProject> reactorProjects, ReleaseManagerListener listener, ReleaseResult result,
                           boolean clean )
@@ -388,8 +390,8 @@ public class DefaultReleaseManager
         performRequest.setClean( clean );
 
         perform( performRequest, result );
-    }    
-    
+    }
+
     private void perform( ReleasePerformRequest performRequest, ReleaseResult result )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -445,7 +447,7 @@ public class DefaultReleaseManager
         updateListener( performRequest.getReleaseManagerListener(), "perform", GOAL_END );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                         List<MavenProject> reactorProjects, boolean dryRun )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -453,7 +455,7 @@ public class DefaultReleaseManager
         branch( releaseDescriptor, releaseEnvironment, reactorProjects, dryRun, null );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void branch( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                         List<MavenProject> reactorProjects, boolean dryRun, ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -467,8 +469,8 @@ public class DefaultReleaseManager
 
         branch( branchRequest );
     }
-    
-    /** {@inheritDoc} */
+
+    @Override
     public void branch( ReleaseBranchRequest branchRequest )
         throws ReleaseExecutionException, ReleaseFailureException
     {
@@ -515,6 +517,7 @@ public class DefaultReleaseManager
         updateListener( branchRequest.getReleaseManagerListener(), "branch", GOAL_END );
     }
 
+    @Override
     public void updateVersions( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                 List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -526,14 +529,14 @@ public class DefaultReleaseManager
 
         updateVersions( updateVersionsRequest );
     }
-    
-    /** {@inheritDoc} */
+
+    @Override
     public void updateVersions( ReleaseUpdateVersionsRequest updateVersionsRequest )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         updateListener( updateVersionsRequest.getReleaseManagerListener(), "updateVersions", GOAL_START );
 
-        ReleaseDescriptor releaseDescriptor = loadReleaseDescriptor( updateVersionsRequest.getReleaseDescriptor(),
+        ReleaseDescriptor releaseDescriptor = loadReleaseDescriptor( updateVersionsRequest.getReleaseDescriptor(),
                                                                    updateVersionsRequest.getReleaseManagerListener() );
 
         for ( String name : updateVersionsPhases )
@@ -552,7 +555,7 @@ public class DefaultReleaseManager
             updateListener( updateVersionsRequest.getReleaseManagerListener(), name, PHASE_END );
         }
 
-        clean( releaseDescriptor,
+        clean( releaseDescriptor,
                updateVersionsRequest.getReleaseManagerListener(),
                updateVersionsRequest.getReactorProjects() );
 
@@ -600,7 +603,7 @@ public class DefaultReleaseManager
         }
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void clean( ReleaseDescriptor releaseDescriptor, ReleaseManagerListener listener,
                        List<MavenProject> reactorProjects )
     {
@@ -612,7 +615,7 @@ public class DefaultReleaseManager
         clean( cleanRequest );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void clean( ReleaseCleanRequest cleanRequest )
     {
         updateListener( cleanRequest.getReleaseManagerListener(), "cleanup", PHASE_START );
@@ -620,7 +623,7 @@ public class DefaultReleaseManager
         getLogger().info( "Cleaning up after release..." );
 
         configStore.delete( cleanRequest.getReleaseDescriptor() );
-        Set<String> phases = new LinkedHashSet<String>( preparePhases );
+        Set<String> phases = new LinkedHashSet<>( preparePhases );
         phases.addAll( branchPhases );
 
         for ( String name : phases )
@@ -667,7 +670,7 @@ public class DefaultReleaseManager
 
     private List<String> getGoalPhases( String name )
     {
-        List<String> phases = new ArrayList<String>();
+        List<String> phases = new ArrayList<>();
 
         if ( "prepare".equals( name ) )
         {
@@ -712,7 +715,7 @@ public class DefaultReleaseManager
         result.setResultCode( ReleaseResult.ERROR );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                         boolean dryRun )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -720,7 +723,7 @@ public class DefaultReleaseManager
         branch( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, dryRun );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                         boolean dryRun, ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -729,14 +732,14 @@ public class DefaultReleaseManager
                 listener );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         perform( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                          ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -745,7 +748,7 @@ public class DefaultReleaseManager
                  listener );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                          boolean clean )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -753,6 +756,7 @@ public class DefaultReleaseManager
         perform( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects, clean );
     }
 
+    @Override
     public ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
                                             List<MavenProject> reactorProjects, ReleaseManagerListener listener )
     {
@@ -760,14 +764,14 @@ public class DefaultReleaseManager
                                   reactorProjects, listener );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
         prepare( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                          boolean resume, boolean dryRun )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -776,7 +780,7 @@ public class DefaultReleaseManager
                  dryRun );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                          boolean resume, boolean dryRun, ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -785,6 +789,7 @@ public class DefaultReleaseManager
                  dryRun, listener );
     }
 
+    @Override
     public ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
                                             List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
                                             ReleaseManagerListener listener )
@@ -793,7 +798,7 @@ public class DefaultReleaseManager
                                   reactorProjects, resume, dryRun, listener );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void rollback( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                           ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -802,7 +807,7 @@ public class DefaultReleaseManager
                   listener );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void rollback( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java
index 5bcddfe..9900a17 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java
@@ -22,7 +22,7 @@ package org.apache.maven.shared.release;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 2.3
  */
@@ -30,7 +30,7 @@ public class ReleaseBranchRequest extends AbstractReleaseRequest
 {
     // using Boolean to detect if has been set explicitly
     private Boolean dryRun;
-    
+
     private ReleaseEnvironment releaseEnvironment;
 
     /**
@@ -40,7 +40,7 @@ public class ReleaseBranchRequest extends AbstractReleaseRequest
     {
         return dryRun;
     }
-    
+
     /**
      * @param dryRun the dryRun to set
      */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
index ad7883d..a1a32d0 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java
@@ -20,7 +20,7 @@ package org.apache.maven.shared.release;
  */
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 2.3
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
index e9bc078..97e0a43 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java
@@ -62,6 +62,7 @@ public interface ReleaseManager
      *
      * @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
      */
+    @Deprecated
     void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException;
 
@@ -94,13 +95,14 @@ public interface ReleaseManager
      * @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean)}
      * instead.
      */
+    @Deprecated
     void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                   boolean resume, boolean dryRun )
         throws ReleaseExecutionException, ReleaseFailureException;
-    
+
     /**
      * Prepare a release.
-     *
+     *
      * @param prepareRequest             all prepare arguments
      * @throws ReleaseExecutionException if there is a problem performing the release
      * @throws ReleaseFailureException   if there is a problem performing the release
@@ -139,6 +141,7 @@ public interface ReleaseManager
      * @deprecated Use {@link ReleaseManager#prepare(ReleaseDescriptor, ReleaseEnvironment, List, boolean, boolean,
      * ReleaseManagerListener)} instead.
      */
+    @Deprecated
     void prepare( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                   boolean resume, boolean dryRun, ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException;
@@ -151,6 +154,7 @@ public interface ReleaseManager
      * @deprecated Use {@link ReleaseManager#prepareWithResult(ReleaseDescriptor, ReleaseEnvironment, List, boolean,
      * boolean, ReleaseManagerListener)} instead.
      */
+    @Deprecated
     ReleaseResult prepareWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
                                      List<MavenProject> reactorProjects, boolean resume, boolean dryRun,
                                      ReleaseManagerListener listener );
@@ -179,6 +183,7 @@ public interface ReleaseManager
      *
      * @deprecated Use {@link ReleaseManager#perform(ReleaseDescriptor, ReleaseEnvironment, List)} instead
      */
+    @Deprecated
     void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException;
 
@@ -209,6 +214,7 @@ public interface ReleaseManager
      * @deprecated Use {@link ReleaseManager#perform(ReleaseDescriptor, ReleaseEnvironment, List,
      * ReleaseManagerListener)} instead.
      */
+    @Deprecated
     void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                   ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException;
@@ -220,6 +226,7 @@ public interface ReleaseManager
      * @deprecated Use {@link ReleaseManager#performWithResult(ReleaseDescriptor, ReleaseEnvironment, List,
      * ReleaseManagerListener)} instead.
      */
+    @Deprecated
     ReleaseResult performWithResult( ReleaseDescriptor releaseDescriptor, Settings settings,
                                      List<MavenProject> reactorProjects, ReleaseManagerListener listener );
 
@@ -239,7 +246,7 @@ public interface ReleaseManager
 
     /**
      * Perform a release
-     *
+     *
      * @param performRequest   all perform arguments
      * @throws ReleaseExecutionException if there is a problem performing the release
      * @throws ReleaseFailureException   if there is a problem performing the release
@@ -260,6 +267,7 @@ public interface ReleaseManager
      *
      * @deprecated Use {@link ReleaseManager#perform(ReleaseDescriptor, ReleaseEnvironment, List, boolean)} instead.
      */
+    @Deprecated
     void perform( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                   boolean clean )
         throws ReleaseExecutionException, ReleaseFailureException;
@@ -275,7 +283,7 @@ public interface ReleaseManager
 
     /**
      * Clean a release.
-     *
+     *
      * @param cleanRequest all clean arguments
      * @since 2.3
      */
@@ -305,6 +313,7 @@ public interface ReleaseManager
      *
      * @deprecated Use {@link ReleaseManager#rollback(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
      */
+    @Deprecated
     void rollback( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException;
 
@@ -335,13 +344,14 @@ public interface ReleaseManager
      * @deprecated Use {@link ReleaseManager#rollback(ReleaseDescriptor, ReleaseEnvironment, List,
      * ReleaseManagerListener)} instead.
      */
+    @Deprecated
     void rollback( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                    ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
      * Rollback changes made by the previous release
-     *
+     *
      * @param rollbackRequest            all rollback arguments
      * @throws ReleaseExecutionException if there is a problem during release rollback
      * @throws ReleaseFailureException   if there is a problem during release rollback
@@ -376,6 +386,7 @@ public interface ReleaseManager
      *
      * @deprecated Use {@link ReleaseManager#branch(ReleaseDescriptor, ReleaseEnvironment, List, boolean)} instead.
      */
+    @Deprecated
     void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                  boolean dryRun )
         throws ReleaseExecutionException, ReleaseFailureException;
@@ -409,13 +420,14 @@ public interface ReleaseManager
      * @deprecated Use {@link ReleaseManager#branch(ReleaseDescriptor, ReleaseEnvironment, List, boolean,
      * ReleaseManagerListener)} instead.
      */
+    @Deprecated
     void branch( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects,
                  boolean dryRun, ReleaseManagerListener listener )
         throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
      * Branch a project
-     *
+     *
      * @param branchRequest              all branch arguments
      * @throws ReleaseExecutionException if there is a problem during release branch
      * @throws ReleaseFailureException   if there is a problem during release branch
@@ -438,7 +450,7 @@ public interface ReleaseManager
 
     /**
      * Update version numbers for a project
-     *
+     *
      * @param updateVersionsRequest      all update versions arguments
      * @throws ReleaseExecutionException if there is a problem during update versions
      * @throws ReleaseFailureException   if there is a problem during update versions
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
index 535e46f..5a0f516 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java
@@ -22,7 +22,7 @@ package org.apache.maven.shared.release;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 2.3
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
index eafbf1b..1ab4a2b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java
@@ -22,7 +22,7 @@ package org.apache.maven.shared.release;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 2.3
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
index c97c004..d91dd3a 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java
@@ -22,7 +22,7 @@ package org.apache.maven.shared.release;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 2.3
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
index 2d91cb7..ba87ad0 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java
@@ -22,7 +22,7 @@ package org.apache.maven.shared.release;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 2.3
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
index 235517b..78f55c0 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/PropertiesReleaseDescriptorStore.java
@@ -64,6 +64,7 @@ public class PropertiesReleaseDescriptorStore
     @Requirement( role = SecDispatcher.class, hint = "mng-4384" )
     private DefaultSecDispatcher secDispatcher;
 
+    @Override
     public ReleaseDescriptor read( ReleaseDescriptor mergeDescriptor )
         throws ReleaseDescriptorStoreException
     {
@@ -112,12 +113,14 @@ public class PropertiesReleaseDescriptorStore
         return releaseDescriptor;
     }
 
+    @Override
     public void write( ReleaseDescriptor config )
         throws ReleaseDescriptorStoreException
     {
         write( config, getDefaultReleasePropertiesFile( config ) );
     }
 
+    @Override
     public void delete( ReleaseDescriptor config )
     {
         File file = getDefaultReleasePropertiesFile( config );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
index 61db0e8..54fc026 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseUtils.java
@@ -228,7 +228,7 @@ public class ReleaseUtils
 
     private static void loadResolvedDependencies( Properties prop, ReleaseDescriptor descriptor )
     {
-        Map<String, Map<String, String>> resolvedDependencies = new HashMap<String, Map<String, String>>();
+        Map<String, Map<String, String>> resolvedDependencies = new HashMap<>();
 
         Set entries = prop.entrySet();
         Iterator<Entry<String, String>> iterator = entries.iterator();
@@ -248,7 +248,7 @@ public class ReleaseUtils
                 int endIndex;
                 String versionType;
 
-                versionMap = new HashMap<String, String>();
+                versionMap = new HashMap<>();
 
                 if ( propertyName.indexOf( ".development" ) != -1 )
                 {
@@ -274,7 +274,7 @@ public class ReleaseUtils
                 }
                 else
                 {
-                    versionMap = new HashMap<String, String>();
+                    versionMap = new HashMap<>();
                     resolvedDependencies.put( artifactVersionlessKey, versionMap );
                 }
 
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
index e0f67f4..6b5659e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java
@@ -25,7 +25,7 @@ import java.util.Locale;
 import org.apache.maven.settings.Settings;
 
 /**
- *
+ *
  */
 public class DefaultReleaseEnvironment
     implements ReleaseEnvironment
@@ -40,53 +40,62 @@ public class DefaultReleaseEnvironment
     private Settings settings;
 
     private String mavenExecutorId = DEFAULT_MAVEN_EXECUTOR_ID;
-    
+
     private Locale locale = Locale.ENGLISH;
 
+    @Override
     public File getMavenHome()
     {
         return mavenHome;
     }
 
+    @Override
     public Settings getSettings()
     {
         return settings;
     }
 
+    @Override
     public ReleaseEnvironment setMavenHome( File mavenHome )
     {
         this.mavenHome = mavenHome;
         return this;
     }
 
+    @Override
     public ReleaseEnvironment setSettings( Settings settings )
     {
         this.settings = settings;
         return this;
     }
 
+    @Override
     public String getMavenExecutorId()
     {
         return mavenExecutorId;
     }
 
+    @Override
     public ReleaseEnvironment setMavenExecutorId( String mavenExecutorId )
     {
         this.mavenExecutorId = mavenExecutorId;
         return this;
     }
 
+    @Override
     public File getJavaHome()
     {
         return javaHome;
     }
 
+    @Override
     public ReleaseEnvironment setJavaHome( File javaHome )
     {
         this.javaHome = javaHome;
         return this;
     }
 
+    @Override
     public File getLocalRepositoryDirectory()
     {
         File localRepo = localRepositoryDirectory;
@@ -99,17 +108,20 @@ public class DefaultReleaseEnvironment
         return localRepo;
     }
 
+    @Override
     public ReleaseEnvironment setLocalRepositoryDirectory( File localRepositoryDirectory )
     {
         this.localRepositoryDirectory = localRepositoryDirectory;
         return this;
     }
 
+    @Override
     public Locale getLocale()
     {
         return locale;
     }
-    
+
+    @Override
     public ReleaseEnvironment setLocale( Locale locale )
     {
         this.locale = locale;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
index 1d5a4ea..dbbf86c 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java
@@ -25,7 +25,7 @@ import java.util.Locale;
 import org.apache.maven.settings.Settings;
 
 /**
- *
+ *
  */
 public interface ReleaseEnvironment
 {
@@ -51,14 +51,14 @@ public interface ReleaseEnvironment
     File getJavaHome();
 
     ReleaseEnvironment setJavaHome( File javaHome );
-    
+
     /**
-     *
+     *
      * @return the locale
      * @since 2.4
      */
     Locale getLocale();
-    
+
     /**
      * @param locale
      * @return the locale
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 39573a8..2f5a954 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -45,7 +45,7 @@ import org.sonatype.plexus.components.sec.dispatcher.SecUtil;
 import org.sonatype.plexus.components.sec.dispatcher.model.SettingsSecurity;
 
 /**
- *
+ *
  */
 public abstract class AbstractMavenExecutor
     implements MavenExecutor, LogEnabled
@@ -61,16 +61,16 @@ public abstract class AbstractMavenExecutor
     private DefaultSecDispatcher secDispatcher;
 
     /**
-     *
+     *
      */
     @Requirement
     private PlexusCipher cipher;
-    
+
     protected AbstractMavenExecutor()
     {
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
                               String pomFileName, ReleaseResult result )
         throws MavenExecutorException
@@ -79,7 +79,7 @@ public abstract class AbstractMavenExecutor
                       pomFileName, result );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
                               ReleaseResult result )
         throws MavenExecutorException
@@ -88,7 +88,7 @@ public abstract class AbstractMavenExecutor
                       result );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
                               boolean interactive, String arguments, ReleaseResult result )
         throws MavenExecutorException
@@ -96,13 +96,13 @@ public abstract class AbstractMavenExecutor
         executeGoals( workingDirectory, goals, releaseEnvironment, interactive, arguments, null, result );
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
                               boolean interactive, String additionalArguments, String pomFileName,
                               ReleaseResult result )
         throws MavenExecutorException
     {
-        List<String> goalsList = new ArrayList<String>();
+        List<String> goalsList = new ArrayList<>();
         if ( goals != null )
         {
             // accept both space and comma, so the old way still work
@@ -127,20 +127,20 @@ public abstract class AbstractMavenExecutor
         return logger;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public void enableLogging( Logger logger )
     {
         this.logger = logger;
     }
 
-    
+
     protected Settings encryptSettings( Settings settings )
     {
         Settings encryptedSettings = SettingsUtils.copySettings( settings );
-        
+
         for ( Server server : encryptedSettings.getServers() )
         {
-            String password = server.getPassword();
+            String password = server.getPassword();
             if ( password != null && !isEncryptedString( password ) )
             {
                 try
@@ -161,7 +161,7 @@ public abstract class AbstractMavenExecutor
                 }
             }
 
-            String passphrase = server.getPassphrase();
+            String passphrase = server.getPassphrase();
             if ( passphrase != null && !isEncryptedString( passphrase ) )
             {
                 try
@@ -182,7 +182,7 @@ public abstract class AbstractMavenExecutor
                 }
             }
         }
-        
+
         for ( Proxy proxy : encryptedSettings.getProxies() )
         {
             String password = proxy.getPassword();
@@ -206,10 +206,10 @@ public abstract class AbstractMavenExecutor
                 }
             }
         }
-        
+
         return encryptedSettings;
     }
-    
+
     // From org.apache.maven.cli.MavenCli.encryption(CliRequest)
     private String encryptAndDecorate( String passwd )
         throws IllegalStateException, SecDispatcherException, PlexusCipherException
@@ -240,7 +240,7 @@ public abstract class AbstractMavenExecutor
         String masterPasswd = cipher.decryptDecorated( master, DefaultSecDispatcher.SYSTEM_PROPERTY_SEC_LOCATION );
         return cipher.encryptAndDecorate( passwd, masterPasswd );
     }
-    
+
     private boolean isEncryptedString( String str )
     {
         return cipher.isEncryptedString( str );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
index fa45e57..e89b42b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java
@@ -31,6 +31,7 @@ import org.codehaus.plexus.util.cli.Commandline;
 public class DefaultCommandLineFactory
     implements CommandLineFactory
 {
+    @Override
     public Commandline createCommandLine( String executable )
         throws MavenExecutorException
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
index f2e6470..0875dd1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
@@ -81,6 +81,7 @@ public interface MavenExecutor
      * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String, String,
      * ReleaseResult)} instead
      */
+    @Deprecated
     void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
                        String pomFileName, ReleaseResult result )
         throws MavenExecutorException;
@@ -98,6 +99,7 @@ public interface MavenExecutor
      * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String,
      * ReleaseResult)} instead
      */
+    @Deprecated
     void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
                        ReleaseResult result )
         throws MavenExecutorException;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
index 63c645d..f75b69e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/RawStreamPumper.java
@@ -24,19 +24,19 @@ import java.io.InputStream;
 import java.io.OutputStream;
 
 /**
- *
+ *
  */
 public class RawStreamPumper
-    extends Thread
+    extends Thread
 {
     private InputStream in;
 
     private OutputStream out;
 
     boolean done;
-    
+
     boolean poll;
-    
+
     byte buffer[] = new byte[256];
 
     public RawStreamPumper( InputStream in , OutputStream out, boolean poll )
@@ -58,7 +58,7 @@ public class RawStreamPumper
         done = true;
     }
 
-    public void closeInput()
+    public void closeInput()
         throws IOException
     {
         in.close();
@@ -70,6 +70,7 @@ public class RawStreamPumper
         out.close();
     }
 
+    @Override
     public void run()
     {
         try
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java
index a407c7e..1ca0092 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeConsumer.java
@@ -54,6 +54,7 @@ public class TeeConsumer
         this.indent = indent;
     }
 
+    @Override
     public void consumeLine( String line )
     {
         stream.println( indent + line );
@@ -67,6 +68,7 @@ public class TeeConsumer
         return content.toString();
     }
 
+    @Override
     public String toString()
     {
         return getContent();
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
index bb75a51..e06fa13 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/TeeOutputStream.java
@@ -25,10 +25,10 @@ import java.io.IOException;
 import java.io.OutputStream;
 
 /**
- *
+ *
  */
-public class TeeOutputStream
-    extends FilterOutputStream
+public class TeeOutputStream
+    extends FilterOutputStream
 {
     private ByteArrayOutputStream bout = new ByteArrayOutputStream( 1024 * 8 );
     private byte indent[];
@@ -38,13 +38,14 @@ public class TeeOutputStream
     {
         this( out, "    " );
     }
-    
+
     public TeeOutputStream( OutputStream out, String i )
     {
         super( out );
         indent = i.getBytes();
     }
 
+    @Override
     public void write( byte[] b, int off, int len )
         throws IOException
     {
@@ -66,6 +67,7 @@ public class TeeOutputStream
         bout.write( b, off, len );
     }
 
+    @Override
     public void write( int b )
         throws IOException
     {
@@ -77,8 +79,9 @@ public class TeeOutputStream
         bout.write( b );
         last = b;
     }
-    
-    public String toString()
+
+    @Override
+    public String toString()
     {
         return bout.toString();
     }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
index af77ea0..39a35e1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
@@ -45,7 +45,8 @@ public abstract class AbstractReleasePhase
     {
         return ResourceBundle.getBundle( "release-messages", locale, AbstractReleasePhase.class.getClassLoader() );
     }
-    
+
+    @Override
     public ReleaseResult clean( List<MavenProject> reactorProjects )
     {
         // nothing to do by default
@@ -53,6 +54,7 @@ public abstract class AbstractReleasePhase
         return getReleaseResultSuccess();
     }
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
                                   Settings settings,
                                   List<MavenProject> reactorProjects )
@@ -61,6 +63,7 @@ public abstract class AbstractReleasePhase
         return execute( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
                                    Settings settings,
                                    List<MavenProject> reactorProjects )
@@ -98,7 +101,7 @@ public abstract class AbstractReleasePhase
         result.appendDebug( message, e );
         getLogger().debug( message, e );
     }
-    
+
     protected ReleaseResult getReleaseResultSuccess()
     {
         ReleaseResult result = new ReleaseResult();
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
index efc36bb..01f8952 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
@@ -76,10 +76,10 @@ public abstract class AbstractRewritePomsPhase
      */
     @Requirement
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
-    
+
     @Requirement( role = ModelETLFactory.class )
     private Map<String, ModelETLFactory> modelETLFactories;
-    
+
     /**
      * Use jdom-sax as default
      */
@@ -90,7 +90,7 @@ public abstract class AbstractRewritePomsPhase
      */
     @Requirement( role = ScmTranslator.class )
     private Map<String, ScmTranslator> scmTranslators;
-    
+
     protected final Map<String, ScmTranslator> getScmTranslators()
     {
         return scmTranslators;
@@ -102,13 +102,13 @@ public abstract class AbstractRewritePomsPhase
     {
         this.ls = ls;
     }
-    
+
     public void setModelETL( String modelETL )
     {
         this.modelETL = modelETL;
     }
-    
-    protected abstract String getPomSuffix();
+
+    protected abstract String getPomSuffix();
 
     @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
@@ -123,7 +123,7 @@ public abstract class AbstractRewritePomsPhase
 
         return result;
     }
-    
+
     @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
@@ -190,9 +190,9 @@ public abstract class AbstractRewritePomsPhase
         request.setLineSeparator( ls );
         request.setProject( project );
         request.setReleaseDescriptor( releaseDescriptor );
-        
+
         ModelETL etl = modelETLFactories.get( modelETL ).newInstance( request );
-        
+
         etl.extract( pomFile );
 
         ScmRepository scmRepository = null;
@@ -231,7 +231,7 @@ public abstract class AbstractRewritePomsPhase
             prepareScm( pomFile, releaseDescriptor, scmRepository, provider );
         }
         etl.load( outputFile );
-    
+
     }
 
     private void transformDocument( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
@@ -245,7 +245,7 @@ public abstract class AbstractRewritePomsPhase
         Map<String, Map<String, String>> resolvedSnapshotDependencies =
             releaseDescriptor.getResolvedSnapshotDependencies();
         Model model = project.getModel();
-        
+
         Properties properties = modelTarget.getProperties();
 
         String parentVersion = rewriteParent( project, modelTarget, mappedVersions,
@@ -258,28 +258,28 @@ public abstract class AbstractRewritePomsPhase
         Build buildTarget = modelTarget.getBuild();
         if ( buildTarget != null )
         {
-            // profile.build.extensions doesn't exist, so only rewrite project.build.extensions  
+            // profile.build.extensions doesn't exist, so only rewrite project.build.extensions
             rewriteArtifactVersions( toMavenCoordinates( buildTarget.getExtensions() ), mappedVersions,
                                      resolvedSnapshotDependencies, originalVersions, model, properties, result,
                                      releaseDescriptor );
-            
+
             rewriteArtifactVersions( toMavenCoordinates( buildTarget.getPlugins() ), mappedVersions,
                                      resolvedSnapshotDependencies, originalVersions, model, properties, result,
                                      releaseDescriptor );
-            
+
             for ( Plugin plugin : buildTarget.getPlugins() )
             {
                 rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ),
                                          mappedVersions, resolvedSnapshotDependencies, originalVersions, model,
                                          properties, result, releaseDescriptor );
             }
-            
+
             if ( buildTarget.getPluginManagement() != null )
             {
                 rewriteArtifactVersions( toMavenCoordinates( buildTarget.getPluginManagement().getPlugins() ),
                                          mappedVersions, resolvedSnapshotDependencies, originalVersions, model,
                                          properties, result, releaseDescriptor );
-                
+
                 for ( Plugin plugin : buildTarget.getPluginManagement().getPlugins() )
                 {
                     rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ), mappedVersions,
@@ -288,7 +288,7 @@ public abstract class AbstractRewritePomsPhase
                 }
             }
         }
-        
+
         for ( Profile profile : modelTarget.getProfiles() )
         {
             BuildBase profileBuild = profile.getBuild();
@@ -297,20 +297,20 @@ public abstract class AbstractRewritePomsPhase
                 rewriteArtifactVersions( toMavenCoordinates( profileBuild.getPlugins() ), mappedVersions,
                                          resolvedSnapshotDependencies, originalVersions, model, properties, result,
                                          releaseDescriptor );
-                
+
                 for ( Plugin plugin : profileBuild.getPlugins() )
                 {
                     rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ),
                                              mappedVersions, resolvedSnapshotDependencies, originalVersions, model,
                                              properties, result, releaseDescriptor );
                 }
-                
+
                 if ( profileBuild.getPluginManagement() != null )
                 {
                     rewriteArtifactVersions( toMavenCoordinates( profileBuild.getPluginManagement().getPlugins() ),
                                              mappedVersions, resolvedSnapshotDependencies, originalVersions, model,
                                              properties, result, releaseDescriptor );
-                    
+
                     for ( Plugin plugin : profileBuild.getPluginManagement().getPlugins() )
                     {
                         rewriteArtifactVersions( toMavenCoordinates( plugin.getDependencies() ), mappedVersions,
@@ -320,24 +320,24 @@ public abstract class AbstractRewritePomsPhase
                 }
             }
         }
-        
-        List<ModelBase> modelBases = new ArrayList<ModelBase>();
+
+        List<ModelBase> modelBases = new ArrayList<>();
         modelBases.add( modelTarget );
         modelBases.addAll( modelTarget.getProfiles() );
-        
+
         for ( ModelBase modelBase : modelBases )
         {
             rewriteArtifactVersions( toMavenCoordinates( modelBase.getDependencies() ), mappedVersions,
                                      resolvedSnapshotDependencies, originalVersions, model, properties, result,
                                      releaseDescriptor );
-            
+
             if ( modelBase.getDependencyManagement() != null )
             {
                 rewriteArtifactVersions( toMavenCoordinates( modelBase.getDependencyManagement().getDependencies() ),
                                          mappedVersions, resolvedSnapshotDependencies, originalVersions, model,
                                          properties, result, releaseDescriptor );
             }
-            
+
             if ( modelBase.getReporting() != null )
             {
                 rewriteArtifactVersions( toMavenCoordinates( modelBase.getReporting().getPlugins() ), mappedVersions,
@@ -345,7 +345,7 @@ public abstract class AbstractRewritePomsPhase
                                          releaseDescriptor );
             }
         }
-        
+
         String commonBasedir;
         try
         {
@@ -356,7 +356,7 @@ public abstract class AbstractRewritePomsPhase
             throw new ReleaseExecutionException( "Exception occurred while calculating common basedir: "
                 + e.getMessage(), e );
         }
-        
+
         transformScm( project, modelTarget, releaseDescriptor, projectId, scmRepository, result,
                       commonBasedir );
     }
@@ -492,9 +492,9 @@ public abstract class AbstractRewritePomsPhase
                     else if ( properties != null )
                     {
                         // version is an expression, check for properties to update instead
-                        
+
                         String propertyValue = properties.getProperty( expression );
-                        
+
                         if ( propertyValue != null )
                         {
                             if ( propertyValue.equals( originalVersion ) )
@@ -578,7 +578,7 @@ public abstract class AbstractRewritePomsPhase
         }
     }
 
-    
+
     protected abstract String getResolvedSnapshotVersion( String artifactVersionlessKey,
                                                           Map<String, Map<String, String>> resolvedSnapshots );
 
@@ -594,7 +594,7 @@ public abstract class AbstractRewritePomsPhase
         throws ReleaseExecutionException;
 
     /**
-     *
+     *
      * @return {@code true} if the SCM-section should be updated, otherwise {@code false}
      * @since 2.4
      */
@@ -636,7 +636,7 @@ public abstract class AbstractRewritePomsPhase
         }
         return scm;
     }
-    
+
     /**
      * Determines the relative path from trunk to tag, and adds this relative path
      * to the url.
@@ -678,10 +678,10 @@ public abstract class AbstractRewritePomsPhase
             return StringUtils.replace( urlPath, trunkPath.substring( i ), tagPath.substring( i ) );
         }
     }
-    
+
     private Collection<MavenCoordinate> toMavenCoordinates( List<?> objects )
     {
-        Collection<MavenCoordinate> coordinates = new ArrayList<MavenCoordinate>( objects.size() );
+        Collection<MavenCoordinate> coordinates = new ArrayList<>( objects.size() );
         for ( Object object : objects )
         {
             if ( object instanceof MavenCoordinate )
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
index f424668..43b5add 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -50,6 +50,7 @@ public abstract class AbstractRunGoalsPhase
      * @deprecated Use {@link AbstractRunGoalsPhase#execute(ReleaseDescriptor, ReleaseEnvironment, File, String)}
      * instead.
      */
+    @Deprecated
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, File workingDirectory,
                                   String additionalArguments )
         throws ReleaseExecutionException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
index 990060d..b36d692 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractScmCommitPhase.java
@@ -67,6 +67,7 @@ public abstract class AbstractScmCommitPhase
      */
     protected String messageFormat;
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -82,6 +83,7 @@ public abstract class AbstractScmCommitPhase
         return relResult;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -194,7 +196,7 @@ public abstract class AbstractScmCommitPhase
 
     protected static List<File> createPomFiles( ReleaseDescriptor releaseDescriptor, MavenProject project )
     {
-        List<File> pomFiles = new ArrayList<File>();
+        List<File> pomFiles = new ArrayList<>();
 
         pomFiles.add( ReleaseUtil.getStandardPom( project ) );
 
@@ -209,7 +211,7 @@ public abstract class AbstractScmCommitPhase
     protected static List<File> createPomFiles( ReleaseDescriptor releaseDescriptor,
                                                 List<MavenProject> reactorProjects )
     {
-        List<File> pomFiles = new ArrayList<File>();
+        List<File> pomFiles = new ArrayList<>();
         for ( MavenProject project : reactorProjects )
         {
             pomFiles.addAll( createPomFiles( releaseDescriptor, project ) );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
index 571d7c2..5f78c76 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckCompletedPreparePhasesPhase.java
@@ -37,6 +37,7 @@ import org.codehaus.plexus.component.annotations.Component;
 public class CheckCompletedPreparePhasesPhase
     extends AbstractReleasePhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
                                   ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
@@ -74,6 +75,7 @@ public class CheckCompletedPreparePhasesPhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
                                    ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
index 6332083..f05cb89 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckDependencySnapshotsPhase.java
@@ -85,11 +85,12 @@ public class CheckDependencySnapshotsPhase
     // We'll probably need to introduce specifiedSnapshots as well.
     // @TODO MRELEASE-378: verify custom dependencies in plugins. Be aware of deprecated/removed Components in M3, such as PluginCollector
     // @TODO MRELEASE-763: verify all dependencies in inactive profiles
-    private Set<Artifact> usedSnapshotDependencies = new HashSet<Artifact>();
-    private Set<Artifact> usedSnapshotReports = new HashSet<Artifact>();
-    private Set<Artifact> usedSnapshotExtensions = new HashSet<Artifact>();
-    private Set<Artifact> usedSnapshotPlugins = new HashSet<Artifact>();
+    private Set<Artifact> usedSnapshotDependencies = new HashSet<>();
+    private Set<Artifact> usedSnapshotReports = new HashSet<>();
+    private Set<Artifact> usedSnapshotExtensions = new HashSet<>();
+    private Set<Artifact> usedSnapshotPlugins = new HashSet<>();
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -130,7 +131,7 @@ public class CheckDependencySnapshotsPhase
                 usedSnapshotDependencies.add( project.getParentArtifact() );
             }
         }
-        
+
         Set<Artifact> dependencyArtifacts = project.getArtifacts();
         checkDependencies( originalVersions, releaseDescriptor, artifactMap, dependencyArtifacts );
 
@@ -148,7 +149,7 @@ public class CheckDependencySnapshotsPhase
         @SuppressWarnings( "unchecked" )
         Set<Artifact> extensionArtifacts = project.getExtensionArtifacts();
         checkExtensions( originalVersions, releaseDescriptor, artifactMap, extensionArtifacts );
-        
+
         //@todo check profiles
 
         if ( !usedSnapshotDependencies.isEmpty() || !usedSnapshotReports.isEmpty()
@@ -325,6 +326,7 @@ public class CheckDependencySnapshotsPhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -340,7 +342,7 @@ public class CheckDependencySnapshotsPhase
 
     private StringBuilder printSnapshotDependencies( Set<Artifact> snapshotsSet, StringBuilder message )
     {
-        List<Artifact> snapshotsList = new ArrayList<Artifact>( snapshotsSet );
+        List<Artifact> snapshotsList = new ArrayList<>( snapshotsSet );
 
         Collections.sort( snapshotsList );
 
@@ -423,7 +425,7 @@ public class CheckDependencySnapshotsPhase
     private Map<String, Map<String, String>> processSnapshot( Set<Artifact> snapshotSet )
         throws PrompterException, VersionParseException
     {
-        Map<String, Map<String, String>> resolvedSnapshots = new HashMap<String, Map<String, String>>();
+        Map<String, Map<String, String>> resolvedSnapshots = new HashMap<>();
         Iterator<Artifact> iterator = snapshotSet.iterator();
 
         while ( iterator.hasNext() )
@@ -431,7 +433,7 @@ public class CheckDependencySnapshotsPhase
             Artifact currentArtifact = iterator.next();
             String versionlessKey = ArtifactUtils.versionlessKey( currentArtifact );
 
-            Map<String, String> versionMap = new HashMap<String, String>();
+            Map<String, String> versionMap = new HashMap<>();
             VersionInfo versionInfo = new DefaultVersionInfo( currentArtifact.getBaseVersion() );
             versionMap.put( ReleaseDescriptor.ORIGINAL_VERSION, versionInfo.toString() );
 
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
index e8008cb..b5066d2 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckPomPhase.java
@@ -43,12 +43,12 @@ import java.util.List;
 public class CheckPomPhase
     extends AbstractReleasePhase
 {
-    
+
     /**
      * @since 2.4
      */
     private boolean scmRequired = true;
-    
+
     /**
      * @since 2.5.2
      */
@@ -56,6 +56,7 @@ public class CheckPomPhase
 
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -125,6 +126,7 @@ public class CheckPomPhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
index 429a5c6..eec0f2c 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CheckoutProjectFromScm.java
@@ -62,7 +62,7 @@ public class CheckoutProjectFromScm
     @Requirement
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
 
-    /** {@inheritDoc}  */
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
             throws ReleaseExecutionException, ReleaseFailureException
@@ -271,7 +271,7 @@ public class CheckoutProjectFromScm
         return result;
     }
 
-    /** {@inheritDoc}  */
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
index cf07565..56966c9 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/CreateBackupPomsPhase.java
@@ -39,6 +39,7 @@ import org.codehaus.plexus.util.FileUtils;
 public class CreateBackupPomsPhase
     extends AbstractBackupPomsPhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -58,6 +59,7 @@ public class CreateBackupPomsPhase
         return result;
     }
 
+    @Override
     public ReleaseResult clean( List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
@@ -72,6 +74,7 @@ public class CreateBackupPomsPhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
index 964d0b0..123c0a3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/EndReleasePhase.java
@@ -38,6 +38,7 @@ import java.util.List;
 public class EndReleasePhase
     extends AbstractReleasePhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -51,6 +52,7 @@ public class EndReleasePhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
index 9022ca2..2768fda 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/GenerateReleasePomsPhase.java
@@ -84,7 +84,7 @@ public class GenerateReleasePomsPhase
 
     @Requirement
     private ModelInterpolator modelInterpolator;
-    
+
     /**
      * SCM URL translators mapped by provider name.
      */
@@ -95,6 +95,7 @@ public class GenerateReleasePomsPhase
      * @see org.apache.maven.shared.release.phase.ReleasePhase#execute(org.apache.maven.shared.release.config.ReleaseDescriptor,
      *      org.apache.maven.settings.Settings, java.util.List)
      */
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -128,7 +129,7 @@ public class GenerateReleasePomsPhase
                                       List<MavenProject> reactorProjects, boolean simulate, ReleaseResult result )
         throws ReleaseExecutionException, ReleaseFailureException
     {
-        List<File> releasePoms = new ArrayList<File>();
+        List<File> releasePoms = new ArrayList<>();
 
         for ( MavenProject project : reactorProjects )
         {
@@ -246,7 +247,7 @@ public class GenerateReleasePomsPhase
         if ( !FINALNAME_EXPRESSION.equals( originalFinalName ) )
         {
             originalFinalName = findOriginalFinalName( project );
-            
+
             if ( originalFinalName == null )
             {
                 // as defined in super-pom
@@ -256,7 +257,7 @@ public class GenerateReleasePomsPhase
 
         // make finalName always explicit
         String finalName = ReleaseUtil.interpolate( originalFinalName, releaseModel );
-        
+
         // still required?
         if ( finalName.indexOf( Artifact.SNAPSHOT_VERSION ) != -1 )
         {
@@ -264,7 +265,7 @@ public class GenerateReleasePomsPhase
                             + releaseProject.getId() );
         }
         releaseModel.getBuild().setFinalName( finalName );
-        
+
 
         // update scm
         Scm scm = releaseModel.getScm();
@@ -306,28 +307,28 @@ public class GenerateReleasePomsPhase
 
         return releaseModel;
     }
-    
-    
+
+
     private void unalignFromBaseDirectory( Model releaseModel, File basedir )
     {
         Model rawSuperModel = superPomProvider.getSuperModel( releaseModel.getModelVersion() );
-        
+
         ModelBuildingRequest buildingRequest = new DefaultModelBuildingRequest();
         buildingRequest.setValidationLevel( ModelBuildingRequest.VALIDATION_LEVEL_STRICT );
-        
+
         // inject proper values used by project.build.finalName
         Properties properties = new Properties();
         properties.put( "project.version", releaseModel.getVersion() );
         properties.put( "project.artifactId", releaseModel.getArtifactId() );
         buildingRequest.setUserProperties( properties );
-        
+
         Model interpolatedSuperModel =
             modelInterpolator.interpolateModel( rawSuperModel.clone(), basedir, buildingRequest, null );
-        
+
         Build currentBuild = releaseModel.getBuild();
         Build interpolatedSuperBuild = interpolatedSuperModel.getBuild();
         Build rawSuperBuild = rawSuperModel.getBuild();
-        
+
         currentBuild.setSourceDirectory( resolvePath( basedir.toPath(), currentBuild.getSourceDirectory(),
                                                   interpolatedSuperBuild.getSourceDirectory(),
                                                   rawSuperBuild.getSourceDirectory() ) );
@@ -343,10 +344,10 @@ public class GenerateReleasePomsPhase
         currentBuild.setTestOutputDirectory( resolvePath( basedir.toPath(), currentBuild.getTestOutputDirectory(),
                                                       interpolatedSuperBuild.getTestOutputDirectory(),
                                                       rawSuperBuild.getTestOutputDirectory() ) );
-        currentBuild.setDirectory( resolvePath( basedir.toPath(), currentBuild.getDirectory(),
+        currentBuild.setDirectory( resolvePath( basedir.toPath(), currentBuild.getDirectory(),
                                             interpolatedSuperBuild.getDirectory(),
                                             rawSuperBuild.getDirectory() ) );
-        
+
         for ( Resource currentResource : currentBuild.getResources() )
         {
             Map<String, String> superResourceDirectories =
@@ -372,22 +373,22 @@ public class GenerateReleasePomsPhase
             currentResource.setDirectory( resolvePath( basedir.toPath(), currentResource.getDirectory(),
                                                        superResourceDirectories ) );
         }
-        
-        
-        
+
+
+
         releaseModel.getReporting().setOutputDirectory( resolvePath( basedir.toPath(),
                                                          releaseModel.getReporting().getOutputDirectory(),
                                                          interpolatedSuperModel.getReporting().getOutputDirectory(),
                                                          rawSuperModel.getReporting().getOutputDirectory() ) );
     }
-    
+
     private String resolvePath( Path basedir, String current, String superInterpolated, String superRaw )
     {
         return basedir.resolve( current ).equals( basedir.resolve( superInterpolated ) ) ? superRaw : current;
     }
 
-    private String resolvePath( Path basedir,
-                                String current,
+    private String resolvePath( Path basedir,
+                                String current,
                                 Map<String /* interpolated */, String /* raw */> superValues )
     {
         for ( Map.Entry<String, String> superValue : superValues.entrySet() )
@@ -399,7 +400,7 @@ public class GenerateReleasePomsPhase
         }
         return current;
     }
-    
+
     private String findOriginalFinalName( MavenProject project )
     {
         if ( project.getOriginalModel().getBuild() != null
@@ -417,6 +418,7 @@ public class GenerateReleasePomsPhase
         }
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -507,11 +509,11 @@ public class GenerateReleasePomsPhase
         if ( artifacts != null )
         {
             // make dependency order deterministic for tests (related to MNG-1412)
-            List<Artifact> orderedArtifacts = new ArrayList<Artifact>();
+            List<Artifact> orderedArtifacts = new ArrayList<>();
             orderedArtifacts.addAll( artifacts );
             Collections.sort( orderedArtifacts );
 
-            releaseDependencies = new ArrayList<Dependency>();
+            releaseDependencies = new ArrayList<>();
 
             for ( Artifact artifact : orderedArtifacts )
             {
@@ -585,7 +587,7 @@ public class GenerateReleasePomsPhase
                 @SuppressWarnings( "unchecked" )
                 Map<String, Artifact> artifactsById = project.getPluginArtifactMap();
 
-                releasePlugins = new ArrayList<Plugin>();
+                releasePlugins = new ArrayList<>();
 
                 for ( Plugin plugin : plugins )
                 {
@@ -632,7 +634,7 @@ public class GenerateReleasePomsPhase
                 @SuppressWarnings( "unchecked" )
                 Map<String, Artifact> artifactsById = project.getReportArtifactMap();
 
-                releaseReportPlugins = new ArrayList<ReportPlugin>();
+                releaseReportPlugins = new ArrayList<>();
 
                 for ( ReportPlugin reportPlugin : reportPlugins )
                 {
@@ -671,12 +673,12 @@ public class GenerateReleasePomsPhase
 
             if ( extensions != null )
             {
-                releaseExtensions = new ArrayList<Extension>();
+                releaseExtensions = new ArrayList<>();
 
                 for ( Extension extension : extensions )
                 {
                     String id = ArtifactUtils.versionlessKey( extension.getGroupId(), extension.getArtifactId() );
-                    Artifact artifact = (Artifact) project.getExtensionArtifactMap().get( id );
+                    Artifact artifact = project.getExtensionArtifactMap().get( id );
                     String version = getReleaseVersion( originalVersions, mappedVersions, artifact );
 
                     Extension releaseExtension = new Extension();
@@ -695,6 +697,7 @@ public class GenerateReleasePomsPhase
     /*
      * @see org.apache.maven.shared.release.phase.AbstractReleasePhase#clean(java.util.List)
      */
+    @Override
     public ReleaseResult clean( List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
index bfa24e7..7373c69 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/InputVariablesPhase.java
@@ -74,13 +74,13 @@ public class InputVariablesPhase
      */
     @Requirement
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
-    
+
     /**
      * Component used for custom or default naming policy
      */
     @Requirement
     private Map<String, NamingPolicy> namingPolicies;
-  
+
     /**
      * The default naming policy to apply, if any
      */
@@ -118,6 +118,7 @@ public class InputVariablesPhase
         }
     }
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -151,7 +152,7 @@ public class InputVariablesPhase
                 catch ( PolicyException e )
                 {
                     throw new ReleaseExecutionException( e.getMessage(), e );
-                }
+                }
             }
             else if ( scmTagNameFormat != null )
             {
@@ -246,6 +247,7 @@ public class InputVariablesPhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -259,7 +261,7 @@ public class InputVariablesPhase
 
         return result;
     }
-    
+
     private String resolveSuggestedName( String policyId, String version, MavenProject project )
         throws PolicyException
     {
@@ -267,7 +269,7 @@ public class InputVariablesPhase
         {
             return null;
         }
-        
+
         NamingPolicy policy = namingPolicies.get( policyId );
         if ( policy == null )
         {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
index f4b2132..4ae295a 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/MapVersionsPhase.java
@@ -97,6 +97,7 @@ public class MapVersionsPhase
         this.prompter = prompter;
     }
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -377,6 +378,7 @@ public class MapVersionsPhase
         return messageKey;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
index a0af657..7cb1e6b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
@@ -81,6 +81,7 @@ public interface ReleasePhase
      *
      * @deprecated Use {@link ReleasePhase#execute(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
      */
+    @Deprecated
     ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException;
 
@@ -96,6 +97,7 @@ public interface ReleasePhase
      *
      * @deprecated Use {@link ReleasePhase#simulate(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
      */
+    @Deprecated
     ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException;
 
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
index 85d174d..e3f0cab 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveReleasePomsPhase.java
@@ -48,6 +48,7 @@ import org.codehaus.plexus.component.annotations.Component;
 public class RemoveReleasePomsPhase
     extends AbstractReleasePomsPhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseFailureException, ReleaseExecutionException
@@ -55,6 +56,7 @@ public class RemoveReleasePomsPhase
         return execute( releaseDescriptor, releaseEnvironment, reactorProjects, false );
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseFailureException, ReleaseExecutionException
@@ -86,7 +88,7 @@ public class RemoveReleasePomsPhase
                                     boolean simulate, ReleaseResult result, List<MavenProject> projects )
         throws ReleaseFailureException, ReleaseExecutionException
     {
-        List<File> releasePoms = new ArrayList<File>();
+        List<File> releasePoms = new ArrayList<>();
 
         for ( MavenProject project : projects )
         {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
index fa950ef..485ca03 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RemoveScmTagPhase.java
@@ -36,6 +36,7 @@ import java.util.List;
 public class RemoveScmTagPhase
     extends AbstractReleasePhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -49,6 +50,7 @@ public class RemoveScmTagPhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
index d187ebe..f746eed 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RestoreBackupPomsPhase.java
@@ -57,6 +57,7 @@ public class RestoreBackupPomsPhase
     @Requirement
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -73,6 +74,7 @@ public class RestoreBackupPomsPhase
         return result;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
index 0533d3f..2a44539 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomVersionsPhase.java
@@ -44,7 +44,7 @@ public class RewritePomVersionsPhase
     {
         return "next";
     }
-    
+
     @Override
     protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
                                  String projectId, ScmRepository scmRepository, ReleaseResult result,
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
index 511ab07..0686230 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForBranchPhase.java
@@ -50,17 +50,18 @@ public class RewritePomsForBranchPhase
     {
         return "branch";
     }
-    
+
+    @Override
     protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
                                  String projectId, ScmRepository scmRepository, ReleaseResult result,
-                                 String commonBasedir )
+                                 String commonBasedir )
     throws ReleaseExecutionException
     {
         // If SCM is null in original model, it is inherited, no mods needed
         if ( project.getScm() != null )
         {
             Scm scmRoot = modelTarget.getScm();
-            
+
             if ( scmRoot != null )
             {
                 Scm scm = buildScm( project );
@@ -111,7 +112,7 @@ public class RewritePomsForBranchPhase
     }
 
     private boolean translateScm( MavenProject project, ReleaseDescriptor releaseDescriptor, Scm scmTarget,
-                                  ScmRepository scmRepository, ReleaseResult relResult, String commonBasedir )
+                                  ScmRepository scmRepository, ReleaseResult relResult, String commonBasedir )
     throws IOException
     {
         ScmTranslator translator = getScmTranslators().get( scmRepository.getProvider() );
@@ -123,7 +124,7 @@ public class RewritePomsForBranchPhase
             {
                 scm = project.getScm();
             }
-            
+
             String branchName = releaseDescriptor.getScmReleaseLabel();
             String branchBase = releaseDescriptor.getScmBranchBase();
 
@@ -159,7 +160,7 @@ public class RewritePomsForBranchPhase
                     }
                     scmConnectionBranch = translateUrlPath( trunkUrl, branchBase, scm.getConnection() );
                 }
-                
+
                 String value =
                     translator.translateBranchUrl( scm.getConnection(), branchName + subDirectoryBranch,
                                                    scmConnectionBranch );
@@ -199,7 +200,7 @@ public class RewritePomsForBranchPhase
                 {
                     subDirectoryBranch = "/" + subDirectoryBranch;
                 }
-                
+
                 String tagScmUrl = branchBase;
                 if ( tagScmUrl != null )
                 {
@@ -242,6 +243,7 @@ public class RewritePomsForBranchPhase
         return result;
     }
 
+    @Override
     protected Map<String, String> getOriginalVersionMap( ReleaseDescriptor releaseDescriptor,
                                                          List<MavenProject> reactorProjects, boolean simulate )
     {
@@ -255,6 +257,7 @@ public class RewritePomsForBranchPhase
         return releaseDescriptor.getReleaseVersions();
     }
 
+    @Override
     protected String getResolvedSnapshotVersion( String artifactVersionlessKey,
                                                  Map<String, Map<String, String>> resolvedSnapshotsMap )
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
index 0a14b63..0bd27bc 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForDevelopmentPhase.java
@@ -46,7 +46,7 @@ public class RewritePomsForDevelopmentPhase
     {
         return "next";
     }
-    
+
     @Override
     protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
                                  String projectId, ScmRepository scmRepository, ReleaseResult result,
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
index b9ea940..5ad3af5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RewritePomsForReleasePhase.java
@@ -49,7 +49,7 @@ public class RewritePomsForReleasePhase
     {
         return "tag";
     }
-    
+
     @Override
     protected void transformScm( MavenProject project, Model modelTarget, ReleaseDescriptor releaseDescriptor,
                                  String projectId, ScmRepository scmRepository, ReleaseResult result,
@@ -90,7 +90,7 @@ public class RewritePomsForReleasePhase
                         Scm scmTarget = new Scm();
                         // reset default value (HEAD)
                         scmTarget.setTag( null );
-                        
+
                         try
                         {
                             if ( translateScm( project, releaseDescriptor, scmTarget, scmRepository, result,
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
index ce0ee3a..76b3834 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunCompleteGoalsPhase.java
@@ -39,6 +39,7 @@ import org.codehaus.plexus.component.annotations.Component;
 public class RunCompleteGoalsPhase
     extends AbstractRunGoalsPhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -47,6 +48,7 @@ public class RunCompleteGoalsPhase
                         releaseDescriptor.getAdditionalArguments() );
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -61,6 +63,7 @@ public class RunCompleteGoalsPhase
         return result;
     }
 
+    @Override
     protected String getGoals( ReleaseDescriptor releaseDescriptor )
     {
         return releaseDescriptor.getCompletionGoals();
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
index 8ad4e8c..9801c12 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPerformGoalsPhase.java
@@ -40,6 +40,7 @@ import java.util.List;
 public class RunPerformGoalsPhase
     extends AbstractRunGoalsPhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -64,7 +65,7 @@ public class RunPerformGoalsPhase
                 additionalArguments = "-DperformRelease=true";
             }
         }
-        
+
         String pomFileName = releaseDescriptor.getPomFileName();
         if ( pomFileName == null )
         {
@@ -72,7 +73,7 @@ public class RunPerformGoalsPhase
         }
 
         // ensure we don't use the release pom for the perform goals
-        // ^^ paranoia? A MavenExecutor has already access to this. Probably worth refactoring.
+        // ^^ paranoia? A MavenExecutor has already access to this. Probably worth refactoring.
         if ( !StringUtils.isEmpty( additionalArguments ) )
         {
             additionalArguments = additionalArguments + " -f " + pomFileName;
@@ -81,15 +82,15 @@ public class RunPerformGoalsPhase
         {
             additionalArguments = "-f " + pomFileName;
         }
-        
+
         if ( simulate )
         {
             ReleaseResult result = new ReleaseResult();
 
             logDebug( result, "Additional arguments: " + additionalArguments );
-            
+
             logInfo( result, "Executing perform goals  - since this is simulation mode these goals are skipped." );
-            
+
             return result;
         }
 
@@ -136,6 +137,7 @@ public class RunPerformGoalsPhase
         return execute( releaseDescriptor, releaseEnvironment, workDirectory, additionalArguments );
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -143,6 +145,7 @@ public class RunPerformGoalsPhase
         return runLogic( releaseDescriptor, releaseEnvironment, reactorProjects, true );
     }
 
+    @Override
     protected String getGoals( ReleaseDescriptor releaseDescriptor )
     {
         return releaseDescriptor.getPerformGoals();
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
index d787dcf..8604219 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/RunPrepareGoalsPhase.java
@@ -38,6 +38,7 @@ import java.util.List;
 public class RunPrepareGoalsPhase
     extends AbstractRunGoalsPhase
 {
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -46,6 +47,7 @@ public class RunPrepareGoalsPhase
                         releaseDescriptor.getAdditionalArguments() );
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException
@@ -60,6 +62,7 @@ public class RunPrepareGoalsPhase
         return result;
     }
 
+    @Override
     protected String getGoals( ReleaseDescriptor releaseDescriptor )
     {
         return releaseDescriptor.getPreparationGoals();
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
index 9c736f6..218a529 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmBranchPhase.java
@@ -45,7 +45,7 @@ import java.util.List;
 
 /**
  * Branch the SCM repository.
- *
+ *
  * @author <a href="mailto:[hidden email]">Emmanuel Venisse</a>
  */
 @Component( role = ReleasePhase.class, hint = "scm-branch" )
@@ -58,6 +58,7 @@ public class ScmBranchPhase
     @Requirement
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -123,6 +124,7 @@ public class ScmBranchPhase
         return relResult;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
index e8fb18a..6562089 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCheckModificationsPhase.java
@@ -52,7 +52,7 @@ import java.util.Set;
 
 /**
  * See if there are any local modifications to the files before proceeding with SCM operations and the release.
- *
+ *
  * @author <a href="mailto:[hidden email]">Brett Porter</a>
  */
 @Component( role = ReleasePhase.class, hint = "scm-check-modifications" )
@@ -64,7 +64,7 @@ public class ScmCheckModificationsPhase
      */
     @Requirement
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
-    
+
     /**
      * SCM URL translators mapped by provider name.
      */
@@ -73,14 +73,15 @@ public class ScmCheckModificationsPhase
 
     /**
      * The filepatterns to exclude from the status check.
-     *
+     *
      * @todo proper construction of filenames, especially release properties
      */
-    private Set<String> exclusionPatterns = new HashSet<String>( Arrays.asList(
+    private Set<String> exclusionPatterns = new HashSet<>( Arrays.asList(
         "**" + File.separator + "pom.xml.backup", "**" + File.separator + "pom.xml.tag",
         "**" + File.separator + "pom.xml.next", "**" + File.separator + "pom.xml.branch",
         "**" + File.separator + "release.properties", "**" + File.separator + "pom.xml.releaseBackup" ) );
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -144,7 +145,7 @@ public class ScmCheckModificationsPhase
         if ( !changedFiles.isEmpty() )
         {
             ScmTranslator scmTranslator = scmTranslators.get( repository.getProvider() );
-            
+
             // TODO: would be nice for SCM status command to do this for me.
             for ( Iterator<ScmFile> i = changedFiles.iterator(); i.hasNext(); )
             {
@@ -194,6 +195,7 @@ public class ScmCheckModificationsPhase
         return relResult;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java
index 889b9c3..5e81186 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitDevelopmentPhase.java
@@ -46,6 +46,7 @@ public class ScmCommitDevelopmentPhase
      */
     private String rollbackMessageFormat;
 
+    @Override
     protected void runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                              List<MavenProject> reactorProjects, ReleaseResult result, boolean simulating )
         throws ReleaseScmCommandException, ReleaseExecutionException, ReleaseScmRepositoryException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
index 8c65a60..2e8d776 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmCommitPreparationPhase.java
@@ -45,6 +45,7 @@ public class ScmCommitPreparationPhase
      */
     private String rollbackMessageFormat;
 
+    @Override
     protected void runLogic( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                              List<MavenProject> reactorProjects, ReleaseResult result, boolean simulating )
         throws ReleaseScmCommandException, ReleaseExecutionException, ReleaseScmRepositoryException
@@ -84,6 +85,7 @@ public class ScmCommitPreparationPhase
                                      new Object[]{releaseDescriptor.getScmReleaseLabel()} );
     }
 
+    @Override
     protected void validateConfiguration( ReleaseDescriptor releaseDescriptor )
         throws ReleaseFailureException
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
index a916ad4..8a62f55 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ScmTagPhase.java
@@ -58,6 +58,7 @@ public class ScmTagPhase
     @Requirement
     private ScmRepositoryConfigurator scmRepositoryConfigurator;
 
+    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
@@ -142,6 +143,7 @@ public class ScmTagPhase
         return relResult;
     }
 
+    @Override
     public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                    List<MavenProject> reactorProjects )
         throws ReleaseExecutionException, ReleaseFailureException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultNamingPolicy.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultNamingPolicy.java
index f9e38f0..889417f 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultNamingPolicy.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultNamingPolicy.java
@@ -26,7 +26,7 @@ import org.apache.maven.shared.release.policy.naming.NamingPolicyResult;
 import org.codehaus.plexus.component.annotations.Component;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 3.0.0
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
index 065f055..7244337 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/policies/DefaultVersionPolicy.java
@@ -28,7 +28,7 @@ import org.apache.maven.shared.release.versions.VersionParseException;
 import org.codehaus.plexus.component.annotations.Component;
 
 /**
- *
+ *
  * @author Robert Scholte
  */
 @Component( role = VersionPolicy.class, hint = "default" )
@@ -36,6 +36,7 @@ public class DefaultVersionPolicy
     implements VersionPolicy
 {
 
+    @Override
     public VersionPolicyResult getReleaseVersion( VersionPolicyRequest request )
         throws PolicyException, VersionParseException
     {
@@ -43,6 +44,7 @@ public class DefaultVersionPolicy
         return new VersionPolicyResult().setVersion( releaseVersion );
     }
 
+    @Override
     public VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest request )
         throws PolicyException, VersionParseException
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java
index bb2b51f..2baa915 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ClearCaseScmTranslator.java
@@ -33,6 +33,7 @@ public class ClearCaseScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateBranchUrl( String url, String branchName, String branchBase )
     {
         return url;
@@ -41,6 +42,7 @@ public class ClearCaseScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateTagUrl( String url, String tag, String tagBase )
     {
         return url;
@@ -49,6 +51,7 @@ public class ClearCaseScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String resolveTag( String tag )
     {
         if ( !"HEAD".equals( tag ) )
@@ -60,10 +63,11 @@ public class ClearCaseScmTranslator
             return null;
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toRelativePath( String path )
     {
         return path;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java
index 05c64e4..60370a9 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/CvsScmTranslator.java
@@ -33,6 +33,7 @@ public class CvsScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateBranchUrl( String url, String branchName, String branchBase )
     {
         return url;
@@ -41,6 +42,7 @@ public class CvsScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateTagUrl( String url, String tag, String tagBase )
     {
         return url;
@@ -49,6 +51,7 @@ public class CvsScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String resolveTag( String tag )
     {
         if ( !"HEAD".equals( tag ) )
@@ -60,10 +63,11 @@ public class CvsScmTranslator
             return null;
         }
     }
-    
+
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toRelativePath( String path )
     {
         return path;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
index 27683bd..3bfa4dd 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/DefaultScmRepositoryConfigurator.java
@@ -60,6 +60,7 @@ public class DefaultScmRepositoryConfigurator
     @Requirement( hint = "mng-4384" )
     private SecDispatcher secDispatcher;
 
+    @Override
     public ScmRepository getConfiguredRepository( ReleaseDescriptor releaseDescriptor, Settings settings )
         throws ScmRepositoryException, NoSuchScmProviderException
     {
@@ -67,6 +68,7 @@ public class DefaultScmRepositoryConfigurator
         return getConfiguredRepository( url, releaseDescriptor, settings );
     }
 
+    @Override
     public ScmRepository getConfiguredRepository( String url, ReleaseDescriptor releaseDescriptor, Settings settings )
         throws ScmRepositoryException, NoSuchScmProviderException
     {
@@ -198,6 +200,7 @@ public class DefaultScmRepositoryConfigurator
         }
     }
 
+    @Override
     public ScmProvider getRepositoryProvider( ScmRepository repository )
         throws NoSuchScmProviderException
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
index ea1d90a..ccc67ce 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/GitScmTranslator.java
@@ -28,25 +28,25 @@ public class GitScmTranslator
     implements ScmTranslator
 {
 
-    /** {@inheritDoc} */
+    @Override
     public String translateBranchUrl( String url, String branchName, String branchBase )
     {
         return url;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String translateTagUrl( String url, String tag, String tagBase )
     {
         return url;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String resolveTag( String tag )
     {
         return tag;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String toRelativePath( String path )
     {
         return path;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
index 982ffe4..953d534 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/HgScmTranslator.java
@@ -28,25 +28,25 @@ public class HgScmTranslator
     implements ScmTranslator
 {
 
-    /** {@inheritDoc} */
+    @Override
     public String translateBranchUrl( String url, String branchName, String branchBase )
     {
         return url;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String translateTagUrl( String url, String tag, String tagBase )
     {
         return url;
     }
 
-    /** {@inheritDoc} */
+    @Override
     public String resolveTag( String tag )
     {
         return tag;
     }
-    
-    /** {@inheritDoc} */
+
+    @Override
     public String toRelativePath( String path )
     {
         return path;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java
index 564f127..51b3ad1 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/IdentifiedScm.java
@@ -23,16 +23,16 @@ import org.apache.maven.model.Scm;
 
 /**
  * Unlike repositories the scm of the Project Model doesn't have an id.
- * This makes it quite hard to bind it to the credentials of a server as specified in the settings.xml
- *
+ * This makes it quite hard to bind it to the credentials of a server as specified in the settings.xml
+ *
  * @author Robert Scholte
- *
+ *
  * @since 2.3
  */
 public class IdentifiedScm
     extends Scm
 {
-    
+
     private String id;
 
     /**
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
index 5799211..d5fd8cd 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/JazzScmTranslator.java
@@ -35,6 +35,7 @@ public class JazzScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateBranchUrl( String url, String branchName, String branchBase )
     {
         // Jazz URL's (currently) take the form:
@@ -55,6 +56,7 @@ public class JazzScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateTagUrl( String url, String tag, String tagBase )
     {
         // Jazz URL's (currently) take the form:
@@ -75,6 +77,7 @@ public class JazzScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String resolveTag( String tag )
     {
         // project.scm.tag is not required, so return null.
@@ -84,6 +87,7 @@ public class JazzScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toRelativePath( String path )
     {
         String relativePath;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java
index 21b83e9..c94e40f 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/ScmTranslator.java
@@ -59,10 +59,10 @@ public interface ScmTranslator
      * @return the tag to use, or <code>null</code> if the provider does not use tags
      */
     String resolveTag( String tag );
-    
+
     /**
      * Translates an ScmFile path to a path relative to the working directory.
-     *
+     *
      * @param path
      * @return the relative path with OS specific File separator
      * @since 2.3.1
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
index f0568f7..85b6bb6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/scm/SubversionScmTranslator.java
@@ -36,6 +36,7 @@ public class SubversionScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateBranchUrl( String url, String branchName, String branchBase )
     {
         return SvnTagBranchUtils.resolveUrl( url, branchBase, SvnTagBranchUtils.SVN_BRANCHES,
@@ -45,6 +46,7 @@ public class SubversionScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String translateTagUrl( String url, String tag, String tagBase )
     {
         return SvnTagBranchUtils.resolveUrl( url, tagBase, SvnTagBranchUtils.SVN_TAGS, new ScmTag( tag ) );
@@ -53,14 +55,16 @@ public class SubversionScmTranslator
     /**
      * {@inheritDoc}
      */
+    @Override
     public String resolveTag( String tag )
     {
         return null;
     }
-    
+
     /**
      * {@inheritDoc}
      */
+    @Override
     public String toRelativePath( String path )
     {
         return path;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java
index f1af02d..fcf8b01 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/MavenCoordinate.java
@@ -20,20 +20,20 @@ package org.apache.maven.shared.release.transform;
  */
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public interface MavenCoordinate
 {
     String getGroupId();
-    
+
     String getArtifactId();
-    
+
     String getVersion();
-    
+
     void setVersion( String version );
-    
+
     // @todo helper method during refactoring, will be removed
     String getName();
 }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETL.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETL.java
index 465cf95..5dda9e5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETL.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETL.java
@@ -25,16 +25,16 @@ import org.apache.maven.model.Model;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public interface ModelETL
 {
     void extract( File pomFile ) throws ReleaseExecutionException;
-    
+
     void transform();
-    
+
     void load( File pomFile ) throws ReleaseExecutionException;
 
     // will be removed once transform() is implemented
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLFactory.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLFactory.java
index 9bce93d..bdbb9a3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLFactory.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLFactory.java
@@ -20,7 +20,7 @@ package org.apache.maven.shared.release.transform;
  */
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLRequest.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLRequest.java
index 6cc41c6..22ec8b6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLRequest.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/ModelETLRequest.java
@@ -23,7 +23,7 @@ import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
@@ -32,19 +32,19 @@ public class ModelETLRequest
     private String lineSeparator;
 
     private MavenProject project;
-    
+
     private ReleaseDescriptor releaseDescriptor;
 
     public String getLineSeparator()
     {
         return lineSeparator;
     }
-    
+
     public void setLineSeparator( String lineSeparator )
     {
         this.lineSeparator = lineSeparator;
     }
-    
+
     public MavenProject getProject()
     {
         return project;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
index 9182bb9..809bab6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomBuild.java
@@ -32,7 +32,7 @@ import org.apache.maven.model.Resource;
 import org.jdom.Element;
 /**
  * JDom implementation of poms BUILD element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
@@ -63,8 +63,8 @@ public class JDomBuild
         else
         {
             List<Element> extensionElms = extensionsElm.getChildren( "extension", build.getNamespace() );
-            
-            List<Extension> extensions = new ArrayList<Extension>( extensionElms.size() );
+
+            List<Extension> extensions = new ArrayList<>( extensionElms.size() );
             for ( Element extensionElm : extensionElms )
             {
                 extensions.add( new JDomExtension( extensionElm ) );
@@ -292,7 +292,7 @@ public class JDomBuild
             List<Element> pluginElms =
                 pluginsElm.getChildren( "plugin", build.getNamespace() );
 
-            List<Plugin> plugins = new ArrayList<Plugin>( pluginElms.size() );
+            List<Plugin> plugins = new ArrayList<>( pluginElms.size() );
 
             for ( Element pluginElm : pluginElms )
             {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java
index fd7fee3..aa9a43d 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependency.java
@@ -28,14 +28,14 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms DEPENDENCY element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomDependency extends Dependency implements MavenCoordinate
 {
     private final MavenCoordinate coordinate;
-    
+
     public JDomDependency( Element dependency )
     {
         this.coordinate = new JDomMavenCoordinate( dependency );
@@ -160,7 +160,7 @@ public class JDomDependency extends Dependency implements MavenCoordinate
     {
         coordinate.setVersion( version );
     }
-    
+
     @Override
     public String getName()
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
index 035e3b3..bb53c85 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomDependencyManagement.java
@@ -28,15 +28,15 @@ import org.apache.maven.model.DependencyManagement;
 import org.jdom.Element;
 
 /**
- * JDom implementation of poms DEPENDENCYMANAGEMENT element
- *
+ * JDom implementation of poms DEPENDENCYMANAGEMENT element
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomDependencyManagement extends DependencyManagement
 {
     private final Element dependencyManagement;
-    
+
     public JDomDependencyManagement( Element dependencyManagement )
     {
         this.dependencyManagement = dependencyManagement;
@@ -61,7 +61,7 @@ public class JDomDependencyManagement extends DependencyManagement
             List<Element> dependencyElms =
                 dependenciesElm.getChildren( "dependency", dependencyManagement.getNamespace() );
 
-            List<Dependency> dependencies = new ArrayList<Dependency>( dependencyElms.size() );
+            List<Dependency> dependencies = new ArrayList<>( dependencyElms.size() );
 
             for ( Element dependencyElm : dependencyElms )
             {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java
index a8dc81c..5da2b0e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomExtension.java
@@ -25,7 +25,7 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms EXTENSION element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java
index 4ad25fc..b2a7ef3 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomMavenCoordinate.java
@@ -23,14 +23,14 @@ import org.apache.maven.shared.release.transform.MavenCoordinate;
 import org.jdom.Element;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomMavenCoordinate implements MavenCoordinate
 {
     private final Element element;
-    
+
     public JDomMavenCoordinate( Element elm )
     {
         this.element = elm;
@@ -60,20 +60,20 @@ public class JDomMavenCoordinate implements MavenCoordinate
         {
             return version.getTextTrim();
         }
-        
+
     }
-    
+
     private Element getVersionElement()
     {
         return element.getChild( "version", element.getNamespace() );
     }
-    
+
     @Override
     public void setVersion( String version )
     {
         JDomUtils.rewriteValue( getVersionElement(), version );
     }
-    
+
     @Override
     public String getName()
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
index b727269..bb477b6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
@@ -38,21 +38,21 @@ import org.jdom.Text;
 
 /**
  * JDom implementation of poms PROJECT element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomModel extends Model
 {
     private final Element project;
-    
+
     private final JDomModelBase modelBase;
-    
+
     public JDomModel( Document document )
     {
         this( document.getRootElement() );
     }
-    
+
     public JDomModel( Element project )
     {
         this.project = project;
@@ -64,19 +64,19 @@ public class JDomModel extends Model
     {
         return modelBase.getBuild();
     }
-    
+
     @Override
     public List<Dependency> getDependencies()
     {
         return modelBase.getDependencies();
     }
-    
+
     @Override
     public DependencyManagement getDependencyManagement()
     {
         return modelBase.getDependencyManagement();
     }
-    
+
     @Override
     public Parent getParent()
     {
@@ -96,7 +96,7 @@ public class JDomModel extends Model
     {
         return project.getChild( "parent", project.getNamespace() );
     }
-    
+
     @Override
     public List<Profile> getProfiles()
     {
@@ -109,7 +109,7 @@ public class JDomModel extends Model
         {
             List<Element> profileElms = profilesElm.getChildren( "profile", project.getNamespace() );
 
-            List<Profile> profiles = new ArrayList<Profile>( profileElms.size() );
+            List<Profile> profiles = new ArrayList<>( profileElms.size() );
 
             for ( Element profileElm : profileElms )
             {
@@ -119,13 +119,13 @@ public class JDomModel extends Model
             return profiles;
         }
     }
-    
-    
+
+
     @Override
     public Properties getProperties()
     {
         Element properties = project.getChild( "properties", project.getNamespace() );
-        
+
         if ( properties == null )
         {
             return null;
@@ -135,12 +135,12 @@ public class JDomModel extends Model
             return new JDomProperties( properties );
         }
     }
-    
+
     @Override
     public Reporting getReporting()
     {
         Element reporting = project.getChild( "reporting", project.getNamespace() );
-        
+
         if ( reporting == null )
         {
             return null;
@@ -150,7 +150,7 @@ public class JDomModel extends Model
             return new JDomReporting( reporting );
         }
     }
-    
+
     @Override
     public void setScm( Scm scm )
     {
@@ -162,18 +162,18 @@ public class JDomModel extends Model
         {
             Element scmRoot = new Element( "scm" );
             scmRoot.addContent( "\n  " );
-            
+
             // Write current values to JDom tree
             Scm jdomScm = new JDomScm( scmRoot );
             jdomScm.setConnection( scm.getConnection() );
             jdomScm.setDeveloperConnection( scm.getDeveloperConnection() );
             jdomScm.setTag( scm.getTag() );
             jdomScm.setUrl( scm.getUrl() );
-            
+
             project.addContent( "\n  " ).addContent( scmRoot ).addContent( "\n" );
         }
     }
-    
+
     @Override
     public Scm getScm()
     {
@@ -188,12 +188,12 @@ public class JDomModel extends Model
             return new JDomScm( elm );
         }
     }
-    
+
     @Override
     public void setVersion( String version )
     {
         Element versionElement = project.getChild( "version", project.getNamespace() );
-        
+
         String parentVersion;
         Element parent = getParentElement();
         if ( parent != null )
@@ -204,7 +204,7 @@ public class JDomModel extends Model
         {
             parentVersion = null;
         }
-        
+
         if ( versionElement == null )
         {
             if ( !version.equals( parentVersion ) )
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
index 735e7fd..74e4522 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelBase.java
@@ -29,19 +29,19 @@ import org.apache.maven.model.DependencyManagement;
 import org.jdom.Element;
 
 /**
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomModelBase
 {
     private final Element modelBase;
-    
+
     public JDomModelBase( Element modelBase )
     {
         this.modelBase = modelBase;
     }
-    
+
     public Build getBuild()
     {
         Element elm = modelBase.getChild( "build", modelBase.getNamespace() );
@@ -55,7 +55,7 @@ public class JDomModelBase
             return new JDomBuild( elm );
         }
     }
-    
+
     public List<Dependency> getDependencies()
     {
         Element dependenciesElm = modelBase.getChild( "dependencies", modelBase.getNamespace() );
@@ -67,7 +67,7 @@ public class JDomModelBase
         {
             List<Element> dependencyElms = dependenciesElm.getChildren( "dependency", modelBase.getNamespace() );
 
-            List<Dependency> dependencies = new ArrayList<Dependency>( dependencyElms.size() );
+            List<Dependency> dependencies = new ArrayList<>( dependencyElms.size() );
 
             for ( Element dependencyElm : dependencyElms )
             {
@@ -77,7 +77,7 @@ public class JDomModelBase
             return dependencies;
         }
     }
-    
+
     public DependencyManagement getDependencyManagement()
     {
         Element elm = modelBase.getChild( "dependencyManagement", modelBase.getNamespace() );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
index 988ec1f..d7beb7b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETL.java
@@ -49,39 +49,40 @@ import org.jdom.output.Format;
 import org.jdom.output.XMLOutputter;
 
 /**
- * JDom implementation for extracting, transform, loading the Model (pom.xml)
- *
+ * JDom implementation for extracting, transform, loading the Model (pom.xml)
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomModelETL implements ModelETL
 {
     private ReleaseDescriptor releaseDescriptor;
-    
+
     private MavenProject project;
-    
+
     private Document document;
-    
+
     private String intro = null;
     private String outtro = null;
-    
+
     private String ls = ReleaseUtil.LS;
 
     public void setLs( String ls )
     {
         this.ls = ls;
     }
-    
+
     public void setReleaseDescriptor( ReleaseDescriptor releaseDescriptor )
     {
         this.releaseDescriptor = releaseDescriptor;
     }
-    
+
     public void setProject( MavenProject project )
     {
         this.project = project;
     }
-    
+
+    @Override
     public void extract( File pomFile ) throws ReleaseExecutionException
     {
         try
@@ -150,23 +151,25 @@ public class JDomModelETL implements ModelETL
             throw new ReleaseExecutionException( "Error reading POM: " + e.getMessage(), e );
         }
     }
-    
+
+    @Override
     public void transform()
     {
-        
+
     }
-    
+
+    @Override
     public void load( File targetFile ) throws ReleaseExecutionException
     {
         writePom( targetFile, document, releaseDescriptor, project.getModelVersion(), intro, outtro );
     }
-    
+
     @Override
     public Model getModel()
     {
         return new JDomModel( document );
     }
-    
+
     private void normaliseLineEndings( Document document )
     {
         for ( Iterator<?> i = document.getDescendants( new ContentFilter( ContentFilter.COMMENT ) ); i.hasNext(); )
@@ -180,7 +183,7 @@ public class JDomModelETL implements ModelETL
             c.setText( ReleaseUtil.normalizeLineEndings( c.getText(), ls ) );
         }
     }
-    
+
     private void writePom( File pomFile, Document document, ReleaseDescriptor releaseDescriptor, String modelVersion,
                            String intro, String outtro )
         throws ReleaseExecutionException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETLFactory.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETLFactory.java
index f3e41bb..88078e0 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETLFactory.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModelETLFactory.java
@@ -31,16 +31,16 @@ import org.codehaus.plexus.component.annotations.Component;
 public class JDomModelETLFactory implements ModelETLFactory
 {
     public static final String ROLE_HINT = "jdom-sax";
-    
+
     @Override
     public JDomModelETL newInstance( ModelETLRequest request )
     {
         JDomModelETL result = new JDomModelETL();
-        
+
         result.setLs( request.getLineSeparator() );
         result.setProject( request.getProject() );
         result.setReleaseDescriptor( request.getReleaseDescriptor() );
-        
+
         return result;
     }
 }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java
index 82a3628..24f4e90 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomParent.java
@@ -24,7 +24,7 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms PARENT element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
@@ -36,13 +36,13 @@ public class JDomParent extends Parent
     {
         this.parent = parent;
     }
-    
+
     @Override
     public String getVersion()
     {
         throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public void setVersion( String version )
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
index f79fed7..65c8fdb 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPlugin.java
@@ -32,7 +32,7 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms PLUGIN element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
@@ -78,7 +78,7 @@ public class JDomPlugin extends Plugin implements MavenCoordinate
             List<Element> dependencyElms =
                 dependenciesElm.getChildren( "dependency", plugin.getNamespace() );
 
-            List<Dependency> dependencies = new ArrayList<Dependency>( dependencyElms.size() );
+            List<Dependency> dependencies = new ArrayList<>( dependencyElms.size() );
 
             for ( Element dependencyElm : dependencyElms )
             {
@@ -184,7 +184,7 @@ public class JDomPlugin extends Plugin implements MavenCoordinate
     {
         throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public String getName()
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
index d472d5c..53e9331 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomPluginManagement.java
@@ -30,17 +30,17 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms PLUGINMANAGEMENT element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomPluginManagement extends PluginManagement
 {
     private final Element pluginManagement;
-    
+
     public JDomPluginManagement( Element pluginManagement )
     {
-        this.pluginManagement = pluginManagement;
+        this.pluginManagement = pluginManagement;
     }
 
     @Override
@@ -61,7 +61,7 @@ public class JDomPluginManagement extends PluginManagement
         {
             List<Element> pluginElms = pluginsElm.getChildren( "plugin", pluginManagement.getNamespace() );
 
-            List<Plugin> plugins = new ArrayList<Plugin>( pluginElms.size() );
+            List<Plugin> plugins = new ArrayList<>( pluginElms.size() );
 
             for ( Element pluginElm : pluginElms )
             {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
index 0b6139e..25199b5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProfile.java
@@ -29,14 +29,14 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms PROFILE element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomProfile
     extends Profile
 {
-    private final JDomModelBase modelBase;
+    private final JDomModelBase modelBase;
 
     public JDomProfile( Element profile )
     {
@@ -48,13 +48,13 @@ public class JDomProfile
     {
         return modelBase.getBuild();
     }
-    
+
     @Override
     public List<Dependency> getDependencies()
     {
         return modelBase.getDependencies();
     }
-    
+
     @Override
     public DependencyManagement getDependencyManagement()
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java
index 224ea6b..81aff54 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomProperties.java
@@ -35,14 +35,14 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms PROPERTIES element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
 public class JDomProperties extends Properties
 {
     private final Element properties;
-    
+
     public JDomProperties( Element properties )
     {
         this.properties = properties;
@@ -52,9 +52,9 @@ public class JDomProperties extends Properties
     public synchronized Object setProperty( String key, String value )
     {
         Element property = properties.getChild( key, properties.getNamespace() );
-        
+
         JDomUtils.rewriteValue( property, value );
-        
+
         // todo follow specs of Hashtable.put
         return null;
     }
@@ -118,7 +118,7 @@ public class JDomProperties extends Properties
     public String getProperty( String key )
     {
         Element property = properties.getChild( key, properties.getNamespace() );
-        
+
         if ( property == null )
         {
             return null;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
index 4a10ace..696a0f5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReportPlugin.java
@@ -29,7 +29,7 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms reports PLUGIN element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
@@ -156,7 +156,7 @@ public class JDomReportPlugin
     {
         throw new UnsupportedOperationException();
     }
-    
+
     @Override
     public String getName()
     {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
index 4feb4a5..c7d723c 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomReporting.java
@@ -30,7 +30,7 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms REPORTING element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
@@ -38,7 +38,7 @@ public class JDomReporting extends Reporting
 {
 
     private final Element reporting;
-    
+
     public JDomReporting( Element reporting )
     {
         this.reporting = reporting;
@@ -68,7 +68,7 @@ public class JDomReporting extends Reporting
         {
             List<Element> pluginElms = pluginsElm.getChildren( "plugin", reporting.getNamespace() );
 
-            List<ReportPlugin> plugins = new ArrayList<ReportPlugin>( pluginElms.size() );
+            List<ReportPlugin> plugins = new ArrayList<>( pluginElms.size() );
 
             for ( Element pluginElm : pluginElms )
             {
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java
index 88aa2d9..863ec1b 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomScm.java
@@ -24,7 +24,7 @@ import org.jdom.Element;
 
 /**
  * JDom implementation of poms SCM element
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java
index 4ebba1f..abe6087 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomUtils.java
@@ -27,7 +27,7 @@ import org.jdom.Text;
 
 /**
  * Common JDom functions
- *
+ *
  * @author Robert Scholte
  * @since 3.0
  */
@@ -127,6 +127,6 @@ public final class JDomUtils
         }
         return tagElement;
     }
-    
-    
+
+
 }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
index e41e62b..2cef8cd 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/PomFinder.java
@@ -280,6 +280,7 @@ public class PomFinder
             this.parentGroupId = parentGroupId;
         }
 
+        @Override
         public boolean equals( Object o )
         {
             if ( this == o )
@@ -316,6 +317,7 @@ public class PomFinder
             return true;
         }
 
+        @Override
         public int hashCode()
         {
             int result = artifactId != null ? artifactId.hashCode() : 0;
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
index eb00532..42ffe63 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/util/ReleaseUtil.java
@@ -127,7 +127,7 @@ public class ReleaseUtil
      * Gets the string contents of the specified XML file. Note: In contrast to an XML processor, the line separators in
      * the returned string will be normalized to use the platform's native line separator. This is basically to save
      * another normalization step when writing the string contents back to an XML file.
-     *
+     *
      * @param file The path to the XML file to read in, must not be <code>null</code>.
      * @return The string contents of the XML file.
      * @throws IOException If the file could not be opened/read.
@@ -155,7 +155,7 @@ public class ReleaseUtil
 
     /**
      * Normalizes the line separators in the specified string.
-     *
+     *
      * @param text The string to normalize, may be <code>null</code>.
      * @param separator The line separator to use for normalization, typically "\n" or "\r\n", must not be
      *            <code>null</code>.
@@ -292,7 +292,7 @@ public class ReleaseUtil
             {
                 url = url.substring( 0, index ) + suffix;
             }
-            
+
         }
         return url;
     }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
index b6ec732..9043bdb 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/versions/DefaultVersionInfo.java
@@ -186,17 +186,19 @@ public class DefaultVersionInfo
         this.strVersion = getVersionString( this, buildSpecifier, buildSeparator );
     }
 
+    @Override
     public boolean isSnapshot()
     {
         return ArtifactUtils.isSnapshot( strVersion );
     }
 
+    @Override
     public VersionInfo getNextVersion()
     {
         DefaultVersionInfo version = null;
         if ( digits != null )
         {
-            List<String> digits = new ArrayList<String>( this.digits );
+            List<String> digits = new ArrayList<>( this.digits );
             String annotationRevision = this.annotationRevision;
             if ( StringUtils.isNumeric( annotationRevision ) )
             {
@@ -204,7 +206,7 @@ public class DefaultVersionInfo
             }
             else
             {
-                digits.set( digits.size() - 1, incrementVersionString( (String) digits.get( digits.size() - 1 ) ) );
+                digits.set( digits.size() - 1, incrementVersionString( digits.get( digits.size() - 1 ) ) );
             }
 
             version = new DefaultVersionInfo( digits, annotation, annotationRevision, buildSpecifier,
@@ -222,6 +224,7 @@ public class DefaultVersionInfo
      * @throws IllegalArgumentException if the components differ between the objects or if either of the annotations can
      *             not be determined.
      */
+    @Override
     public int compareTo( VersionInfo obj )
     {
         DefaultVersionInfo that = (DefaultVersionInfo) obj;
@@ -250,6 +253,7 @@ public class DefaultVersionInfo
         return result;
     }
 
+    @Override
     public boolean equals( Object obj )
     {
         if ( !( obj instanceof DefaultVersionInfo ) )
@@ -260,6 +264,7 @@ public class DefaultVersionInfo
         return compareTo( (VersionInfo) obj ) == 0;
     }
 
+    @Override
     public int hashCode()
     {
         return strVersion.toLowerCase( Locale.ENGLISH ).hashCode();
@@ -283,6 +288,7 @@ public class DefaultVersionInfo
         return value;
     }
 
+    @Override
     public String getSnapshotVersionString()
     {
         if ( strVersion.equals( Artifact.SNAPSHOT_VERSION ) )
@@ -300,6 +306,7 @@ public class DefaultVersionInfo
         return baseVersion + Artifact.SNAPSHOT_VERSION;
     }
 
+    @Override
     public String getReleaseVersionString()
     {
         String baseVersion = strVersion;
@@ -321,6 +328,7 @@ public class DefaultVersionInfo
         return baseVersion;
     }
 
+    @Override
     public String toString()
     {
         return strVersion;

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