.github/pull_request_template.md

@@ -1,13 +1,13 @@
 Following this checklist to help us incorporate your 
 contribution quickly and easily:
 
- - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MJAVADOC) filed 
+ - [ ] Make sure there is a [JIRA issue](https://issues.apache.org/jira/browse/MRELEASE) filed 
        for the change (usually before you start working on it).  Trivial changes like typos do not 
        require a JIRA issue.  Your pull request should address just this issue, without 
        pulling in other changes.
  - [ ] Each commit in the pull request should have a meaningful subject line and body.
- - [ ] Format the pull request title like `[MJAVADOC-XXX] - Fixes bug in ApproximateQuantiles`,
-       where you replace `MJAVADOC-XXX` with the appropriate JIRA issue. Best practice
+ - [ ] Format the pull request title like `[MRELEASE-XXX] - Fixes bug in ApproximateQuantiles`,
+       where you replace `MRELEASE-XXX` with the appropriate JIRA issue. Best practice
        is to use the JIRA issue title in the pull request title and in the first line of the 
        commit message.
  - [ ] Write a pull request description that is detailed enough to understand what the pull request does, how, and why.

.github/workflows/maven-verify.yml

@@ -24,4 +24,4 @@ on:
 jobs:
   build:
     name: Verify
-    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v2
+    uses: apache/maven-gh-actions-shared/.github/workflows/maven-verify.yml@v3

README.md

@@ -20,6 +20,7 @@ Contributing to [Apache Maven Release (Plugin)](https://maven.apache.org/maven-r
 [![ASF Jira](https://img.shields.io/endpoint?url=https%3A%2F%2Fmaven.apache.org%2Fbadges%2Fasf_jira-MRELEASE.json)][jira]
 [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/apache/maven.svg?label=License)][license]
 [![Maven Central](https://img.shields.io/maven-central/v/org.apache.maven.plugins/maven-release-plugin.svg?label=Maven%20Central)](https://search.maven.org/artifact/org.apache.maven.plugins/maven-release-plugin)
+[![Reproducible Builds](https://img.shields.io/badge/Reproducible_Builds-ok-green?labelColor=blue)](https://github.com/jvm-repo-rebuild/reproducible-central/blob/master/content/org/apache/maven/plugins/maven-release-plugin/README.md)
 [![Jenkins Status](https://img.shields.io/jenkins/s/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-release/job/master.svg?)][build]
 [![Jenkins tests](https://img.shields.io/jenkins/t/https/ci-maven.apache.org/job/Maven/job/maven-box/job/maven-release/job/master.svg?)][test-results]
 

maven-release-api/pom.xml

@@ -17,13 +17,12 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.maven.release</groupId>
     <artifactId>maven-release</artifactId>
-    <version>3.0.0-M7</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>maven-release-api</artifactId>
@@ -52,6 +51,10 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-settings</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven.scm</groupId>
+      <artifactId>maven-scm-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-api</artifactId>
@@ -70,10 +73,5 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>

maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseExecutionException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,30 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 /**
  * Exception occurring during release execution.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ReleaseExecutionException
-    extends Exception
-{
+public class ReleaseExecutionException extends Exception {
     /**
      * Creates a new instance of <code>ReleaseExecutionException</code> without detail message.
      */
-    public ReleaseExecutionException( String message )
-    {
-        super( message );
+    public ReleaseExecutionException(String message) {
+        super(message);
     }
 
     /**
      * Constructs an instance of <code>ReleaseExecutionException</code> with the specified detail message.
      *
      * @param message the detail message.
      */
-    public ReleaseExecutionException( String message, Throwable cause )
-    {
-        super( message, cause );
+    public ReleaseExecutionException(String message, Throwable cause) {
+        super(message, cause);
     }
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseFailureException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,17 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 /**
  * A failure during the release process.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ReleaseFailureException
-    extends Exception
-{
-    public ReleaseFailureException( String message )
-    {
-        super( message );
+public class ReleaseFailureException extends Exception {
+    public ReleaseFailureException(String message) {
+        super(message);
     }
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/ReleaseResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 
 /**
  * @author Edwin Punzalan
  */
-public class ReleaseResult
-{
+public class ReleaseResult {
     /** The result of the release. */
     public static final int UNDEFINED = -1;
     /** The release was successful. */
@@ -42,66 +40,60 @@ public class ReleaseResult
 
     private long endTime;
 
-    private static final String LS = System.getProperty( "line.separator" );
+    private static final String LS = System.getProperty("line.separator");
 
     /**
      * Append Info message to the output.
      * @param message the message to append
      */
-    public void appendInfo( String message )
-    {
-        stdOut.append( "[INFO] " ).append( message ).append( LS );
+    public void appendInfo(String message) {
+        stdOut.append("[INFO] ").append(message).append(LS);
     }
     /**
      * Append warning message to the output.
      * @param message the message to append
      */
-    public void appendWarn( String message )
-    {
-        stdOut.append( "[WARN] " ).append( message ).append( LS );
+    public void appendWarn(String message) {
+        stdOut.append("[WARN] ").append(message).append(LS);
     }
 
     /**
      * Append debug message to the output.
      * @param message the message to append
      */
-    public void appendDebug( String message )
-    {
-        stdOut.append( "[DEBUG] " ).append( message ).append( LS );
+    public void appendDebug(String message) {
+        stdOut.append("[DEBUG] ").append(message).append(LS);
     }
 
     /**
      * Append error message to the output.
      * @param message the message to append
      * @param e the exception to append
      */
-    public void appendDebug( String message, Exception e )
-    {
-        appendDebug( message );
+    public void appendDebug(String message, Exception e) {
+        appendDebug(message);
 
-        stdOut.append( getStackTrace( e ) ).append( LS );
+        stdOut.append(getStackTrace(e)).append(LS);
     }
 
     /**
      * Append error message to the output.
      *
      * @param message the message to append
      */
-    public void appendError( String message )
-    {
-        stdOut.append( "[ERROR] " ).append( message ).append( LS );
+    public void appendError(String message) {
+        stdOut.append("[ERROR] ").append(message).append(LS);
 
-        setResultCode( ERROR );
+        setResultCode(ERROR);
     }
 
     /**
      * Append error exception to the output
      *
      * @param e the exception to append
      */
-    public void appendError( Exception e )
-    {
-        appendError( getStackTrace( e ) );
+    public void appendError(Exception e) {
+        appendError(getStackTrace(e));
     }
 
     /**
@@ -110,65 +102,55 @@ public void appendError( Exception e )
      * @param message the message to append
      * @param e the exception to append
      */
-    public void appendError( String message, Exception e )
-    {
-        appendError( message );
+    public void appendError(String message, Exception e) {
+        appendError(message);
 
-        stdOut.append( getStackTrace( e ) ).append( LS );
+        stdOut.append(getStackTrace(e)).append(LS);
     }
 
     /**
      * Append message to the output.
      *
      * @param message the message to append
      */
-    public void appendOutput( String message )
-    {
-        stdOut.append( message );
+    public void appendOutput(String message) {
+        stdOut.append(message);
     }
 
-    public String getOutput()
-    {
+    public String getOutput() {
         return stdOut.toString();
     }
 
-    public int getResultCode()
-    {
+    public int getResultCode() {
         return resultCode;
     }
 
-    public void setResultCode( int resultCode )
-    {
+    public void setResultCode(int resultCode) {
         this.resultCode = resultCode;
     }
 
-    public long getStartTime()
-    {
+    public long getStartTime() {
         return startTime;
     }
 
-    public void setStartTime( long startTime )
-    {
+    public void setStartTime(long startTime) {
         this.startTime = startTime;
     }
 
-    public long getEndTime()
-    {
+    public long getEndTime() {
         return endTime;
     }
 
-    public void setEndTime( long endTime )
-    {
+    public void setEndTime(long endTime) {
         this.endTime = endTime;
     }
 
-    private String getStackTrace( Exception e )
-    {
+    private String getStackTrace(Exception e) {
         ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
 
-        PrintStream stream = new PrintStream( byteStream );
+        PrintStream stream = new PrintStream(byteStream);
 
-        e.printStackTrace( stream );
+        e.printStackTrace(stream);
 
         stream.flush();
 

maven-release-api/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptor.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.config;
 
 import java.util.List;
 
@@ -28,8 +27,7 @@
  *
  * @author Robert Scholte
  */
-public interface ReleaseDescriptor
-{
+public interface ReleaseDescriptor {
     /**
      * Get if updateDependencies is false, dependencies version won't be updated to the next development version.
      *
@@ -117,7 +115,6 @@ public interface ReleaseDescriptor
      */
     boolean isRemoteTagging();
 
-
     /**
      * Get if the scm provider should sign the tag. NOTE: currently only implemented with git-exe.
      *
@@ -426,6 +423,13 @@ public interface ReleaseDescriptor
      */
     String getProjectVersionPolicyId();
 
+    /**
+     * Get the (optional) config for the VersionPolicy implementation used to calculate the project versions.
+     *
+     * @return The parsed XML of the provided config (an instance of XmlPlexusConfiguration) or null.
+     */
+    Object getProjectVersionPolicyConfig();
+
     /**
      * Get the role-hint for the release Strategy implementation.
      *
@@ -439,65 +443,63 @@ public interface ReleaseDescriptor
      * @return {@code String} The original version for the resolved snapshot dependency.
      * @param artifactKey the artifact key {@code String}
      */
-    String getDependencyOriginalVersion( String artifactKey );
+    String getDependencyOriginalVersion(String artifactKey);
 
     /**
      * <p>getDependencyReleaseVersion.</p>
      *
      * @return {@code String} the release version for the resolved snapshot dependency.
      * @param artifactKey the artifact key {@code String}
      */
-    String getDependencyReleaseVersion( String artifactKey );
+    String getDependencyReleaseVersion(String artifactKey);
 
     /**
      * <p>getDependencyDevelopmentVersion.</p>
      *
      * @return {@code String} the release version for the resolved snapshot dependency.
      * @param artifactKey the artifact key {@code String}
      */
-    String getDependencyDevelopmentVersion( String artifactKey );
-
+    String getDependencyDevelopmentVersion(String artifactKey);
 
     /**
      * <p>getProjectOriginalVersion.</p>
      *
      * @param projectKey a {@link java.lang.String} object
      * @return a {@link java.lang.String} object
      */
-    String getProjectOriginalVersion( String projectKey );
+    String getProjectOriginalVersion(String projectKey);
 
     /**
      * <p>getProjectDevelopmentVersion.</p>
      *
      * @param projectKey a {@link java.lang.String} object
      * @return a {@link java.lang.String} object
      */
-    String getProjectDevelopmentVersion( String projectKey );
+    String getProjectDevelopmentVersion(String projectKey);
 
     /**
      * <p>getProjectReleaseVersion.</p>
      *
      * @param key a {@link java.lang.String} object
      * @return a {@link java.lang.String} object
      */
-    String getProjectReleaseVersion( String key );
+    String getProjectReleaseVersion(String key);
 
     /**
      * <p>getOriginalScmInfo.</p>
      *
      * @param projectKey the project key {@code String}
      * @return the original {@code Scm} information.
      */
-    Scm getOriginalScmInfo( String projectKey );
+    Scm getOriginalScmInfo(String projectKey);
 
     /**
      * <p>hasOriginalScmInfo.</p>
      *
      * @param projectKey the project key {@code String}
      * @return has original Scm info.
      */
-    boolean hasOriginalScmInfo( String projectKey );
-
+    boolean hasOriginalScmInfo(String projectKey);
 
     // Modifiable
     /**
@@ -506,67 +508,67 @@ public interface ReleaseDescriptor
      * @param versionlessKey a {@link java.lang.String} object
      * @param string a {@link java.lang.String} object
      */
-    void addDependencyOriginalVersion( String versionlessKey, String string );
+    void addDependencyOriginalVersion(String versionlessKey, String string);
 
     /**
      * <p>addDependencyReleaseVersion.</p>
      *
      * @param versionlessKey a {@link java.lang.String} object
      * @param version a {@link java.lang.String} object
      */
-    void addDependencyReleaseVersion( String versionlessKey, String version );
+    void addDependencyReleaseVersion(String versionlessKey, String version);
 
     /**
      * <p>addDependencyDevelopmentVersion.</p>
      *
      * @param versionlessKey a {@link java.lang.String} object
      * @param version a {@link java.lang.String} object
      */
-    void addDependencyDevelopmentVersion( String versionlessKey, String version );
+    void addDependencyDevelopmentVersion(String versionlessKey, String version);
 
     /**
      * <p>addReleaseVersion.</p>
      *
      * @param projectId a {@link java.lang.String} object
      * @param nextVersion a {@link java.lang.String} object
      */
-    void addReleaseVersion( String projectId, String nextVersion );
+    void addReleaseVersion(String projectId, String nextVersion);
 
     /**
      * <p>addDevelopmentVersion.</p>
      *
      * @param projectId a {@link java.lang.String} object
      * @param nextVersion a {@link java.lang.String} object
      */
-    void addDevelopmentVersion( String projectId, String nextVersion );
+    void addDevelopmentVersion(String projectId, String nextVersion);
 
     /**
      * <p>setScmReleaseLabel.</p>
      *
      * @param tag a {@link java.lang.String} object
      */
-    void setScmReleaseLabel( String tag );
+    void setScmReleaseLabel(String tag);
 
     /**
      * <p>setScmReleasedPomRevision.</p>
      *
      * @param scmRevision a {@link java.lang.String} object
      */
-    void setScmReleasedPomRevision( String scmRevision );
+    void setScmReleasedPomRevision(String scmRevision);
 
     /**
      * <p>setScmRelativePathProjectDirectory.</p>
      *
      * @param scmRelativePathProjectDirectory a {@link java.lang.String} object
      */
-    void setScmRelativePathProjectDirectory( String scmRelativePathProjectDirectory );
+    void setScmRelativePathProjectDirectory(String scmRelativePathProjectDirectory);
 
     /**
      * <p>setScmSourceUrl.</p>
      *
      * @param scmUrl a {@link java.lang.String} object
      */
-    void setScmSourceUrl( String scmUrl );
+    void setScmSourceUrl(String scmUrl);
 
     /**
      * Returns whether unresolved SNAPSHOT dependencies should automatically be resolved.

maven-release-api/src/main/java/org/apache/maven/shared/release/env/ReleaseEnvironment.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.env;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.env;
 
 import java.io.File;
 
@@ -27,8 +26,7 @@
  * <p>ReleaseEnvironment interface.</p>
  *
  */
-public interface ReleaseEnvironment
-{
+public interface ReleaseEnvironment {
 
     /** Constant <code>DEFAULT_MAVEN_EXECUTOR_ID="forked-path"</code> */
     String DEFAULT_MAVEN_EXECUTOR_ID = "forked-path";

maven-release-api/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.phase;
 
 import org.apache.maven.shared.release.ReleaseResult;
 import org.slf4j.Logger;
@@ -28,13 +27,10 @@
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public abstract class AbstractReleasePhase
-    implements ReleasePhase
-{
-    private final Logger logger = LoggerFactory.getLogger( getClass() );
+public abstract class AbstractReleasePhase implements ReleasePhase {
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
-    protected Logger getLogger()
-    {
+    protected Logger getLogger() {
         return logger;
     }
 
@@ -44,10 +40,9 @@ protected Logger getLogger()
      * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
      * @param message a {@link java.lang.String} object
      */
-    protected void logInfo( ReleaseResult result, String message )
-    {
-        result.appendInfo( message );
-        getLogger().info( message );
+    protected void logInfo(ReleaseResult result, String message) {
+        result.appendInfo(message);
+        getLogger().info(message);
     }
 
     /**
@@ -56,10 +51,9 @@ protected void logInfo( ReleaseResult result, String message )
      * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
      * @param message a {@link java.lang.String} object
      */
-    protected void logWarn( ReleaseResult result, String message )
-    {
-        result.appendWarn( message );
-        getLogger().warn( message );
+    protected void logWarn(ReleaseResult result, String message) {
+        result.appendWarn(message);
+        getLogger().warn(message);
     }
 
     /**
@@ -68,10 +62,9 @@ protected void logWarn( ReleaseResult result, String message )
      * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
      * @param message a {@link java.lang.String} object
      */
-    protected void logError( ReleaseResult result, String message )
-    {
-        result.appendWarn( message );
-        getLogger().error( message );
+    protected void logError(ReleaseResult result, String message) {
+        result.appendWarn(message);
+        getLogger().error(message);
     }
 
     /**
@@ -80,10 +73,9 @@ protected void logError( ReleaseResult result, String message )
      * @param result a {@link org.apache.maven.shared.release.ReleaseResult} object
      * @param message a {@link java.lang.String} object
      */
-    protected void logDebug( ReleaseResult result, String message )
-    {
-        result.appendDebug( message );
-        getLogger().debug( message );
+    protected void logDebug(ReleaseResult result, String message) {
+        result.appendDebug(message);
+        getLogger().debug(message);
     }
 
     /**
@@ -93,22 +85,20 @@ protected void logDebug( ReleaseResult result, String message )
      * @param message a {@link java.lang.String} object
      * @param e a {@link java.lang.Exception} object
      */
-    protected void logDebug( ReleaseResult result, String message, Exception e )
-    {
-        result.appendDebug( message, e );
-        getLogger().debug( message, e );
+    protected void logDebug(ReleaseResult result, String message, Exception e) {
+        result.appendDebug(message, e);
+        getLogger().debug(message, e);
     }
 
     /**
      * <p>getReleaseResultSuccess.</p>
      *
      * @return a {@link org.apache.maven.shared.release.ReleaseResult} object
      */
-    protected ReleaseResult getReleaseResultSuccess()
-    {
+    protected ReleaseResult getReleaseResultSuccess() {
         ReleaseResult result = new ReleaseResult();
 
-        result.setResultCode( ReleaseResult.SUCCESS );
+        result.setResultCode(ReleaseResult.SUCCESS);
 
         return result;
     }

maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.phase;
+
+import java.util.List;
 
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.shared.release.ReleaseExecutionException;
@@ -26,15 +27,12 @@
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
-import java.util.List;
-
 /**
  * A phase in the release cycle.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public interface ReleasePhase
-{
+public interface ReleasePhase {
     /**
      * Execute the phase.
      *
@@ -45,9 +43,11 @@ public interface ReleasePhase
      * @throws ReleaseFailureException   a failure during the execution of the phase
      * @return the release result
      */
-    ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-                           List<MavenProject> reactorProjects )
-        throws ReleaseExecutionException, ReleaseFailureException;
+    ReleaseResult execute(
+            ReleaseDescriptor releaseDescriptor,
+            ReleaseEnvironment releaseEnvironment,
+            List<MavenProject> reactorProjects)
+            throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
      * Simulate the phase, but don't make any changes to the project.
@@ -59,8 +59,9 @@ ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment r
      * @throws ReleaseFailureException   a failure during the execution of the phase
      * @return the release result
      */
-    ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
-                            List<MavenProject> reactorProjects )
-        throws ReleaseExecutionException, ReleaseFailureException;
-
+    ReleaseResult simulate(
+            ReleaseDescriptor releaseDescriptor,
+            ReleaseEnvironment releaseEnvironment,
+            List<MavenProject> reactorProjects)
+            throws ReleaseExecutionException, ReleaseFailureException;
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/phase/ResourceGenerator.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.phase;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.phase;
 
 import java.util.List;
 
@@ -30,13 +29,12 @@
  * @author Robert Scholte
  * @since 3.0.0-M5
  */
-public interface ResourceGenerator
-{
+public interface ResourceGenerator {
     /**
      * Clean up after a phase if it leaves any additional files in the checkout.
      *
      * @param reactorProjects the reactor projects
      * @return the release result
      */
-    ReleaseResult clean( List<MavenProject> reactorProjects );
+    ReleaseResult clean(List<MavenProject> reactorProjects);
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/policy/PolicyException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,34 +16,31 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.policy;
 
 /**
  * <p>PolicyException class.</p>
  *
  * @since 2.5.1 (MRELEASE-431)
  */
-public class PolicyException
-    extends Exception
-{
+public class PolicyException extends Exception {
 
     /**
      * <p>Constructor for PolicyException.</p>
      *
      * @param message a {@link java.lang.String} object
      */
-    public PolicyException( String message )
-    {
-        super( message );
+    public PolicyException(String message) {
+        super(message);
     }
-    
+
     /**
      * <p>Constructor for PolicyException.</p>
      *
      * @param message a {@link java.lang.String} object
      * @param exception a {@link java.lang.Exception} object
      */
-    public PolicyException( String message, Exception exception )
-    {
-        super( message, exception );
+    public PolicyException(String message, Exception exception) {
+        super(message, exception);
     }
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicy.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.naming;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.policy.naming;
 
 import org.apache.maven.shared.release.policy.PolicyException;
 
@@ -26,16 +25,13 @@
  *
  * @since 3.0.0 (MRELEASE-979)
  */
-public interface NamingPolicy
-{
+public interface NamingPolicy {
     /**
      * <p>getName.</p>
      *
      * @return the calculation of the name used for branching or tagging.
      * @param request the {@code NamingPolicyRequest}
      * @throws org.apache.maven.shared.release.policy.PolicyException if exception in the policy
      */
-    NamingPolicyResult getName( NamingPolicyRequest request )
-        throws PolicyException;
-
+    NamingPolicyResult getName(NamingPolicyRequest request) throws PolicyException;
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.naming;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,28 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.policy.naming;
 
 /**
  * <p>NamingPolicyRequest class.</p>
  *
  * @author Robert Scholte
  * @since 3.0.0-M5
  */
-public class NamingPolicyRequest
-{
+public class NamingPolicyRequest {
     private String groupId;
-    
+
     private String artifactId;
-    
+
     private String version;
 
     /**
      * <p>Getter for the field <code>groupId</code>.</p>
      *
      * @return a {@link java.lang.String} object
      */
-    public String getGroupId()
-    {
+    public String getGroupId() {
         return groupId;
     }
 
@@ -49,8 +46,7 @@ public String getGroupId()
      * @param groupId a {@link java.lang.String} object
      * @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyRequest} object
      */
-    public NamingPolicyRequest setGroupId( String groupId )
-    {
+    public NamingPolicyRequest setGroupId(String groupId) {
         this.groupId = groupId;
         return this;
     }
@@ -60,8 +56,7 @@ public NamingPolicyRequest setGroupId( String groupId )
      *
      * @return a {@link java.lang.String} object
      */
-    public String getArtifactId()
-    {
+    public String getArtifactId() {
         return artifactId;
     }
 
@@ -71,8 +66,7 @@ public String getArtifactId()
      * @param artifactId a {@link java.lang.String} object
      * @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyRequest} object
      */
-    public NamingPolicyRequest setArtifactId( String artifactId )
-    {
+    public NamingPolicyRequest setArtifactId(String artifactId) {
         this.artifactId = artifactId;
         return this;
     }
@@ -82,8 +76,7 @@ public NamingPolicyRequest setArtifactId( String artifactId )
      *
      * @return a {@link java.lang.String} object
      */
-    public String getVersion()
-    {
+    public String getVersion() {
         return version;
     }
 
@@ -93,8 +86,7 @@ public String getVersion()
      * @param version a {@link java.lang.String} object
      * @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyRequest} object
      */
-    public NamingPolicyRequest setVersion( String version )
-    {
+    public NamingPolicyRequest setVersion(String version) {
         this.version = version;
         return this;
     }

maven-release-api/src/main/java/org/apache/maven/shared/release/policy/naming/NamingPolicyResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.naming;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.policy.naming;
 
 /**
  * <p>NamingPolicyResult class.</p>
  *
  * @since 3.0.0 (MRELEASE-979)
  */
-public class NamingPolicyResult
-{
+public class NamingPolicyResult {
     /**
      * The tag or branch name to use.
      */
@@ -36,8 +34,7 @@ public class NamingPolicyResult
      *
      * @return a {@link java.lang.String} object
      */
-    public String getName()
-    {
+    public String getName() {
         return name;
     }
 
@@ -47,10 +44,8 @@ public String getName()
      * @param name a {@link java.lang.String} object
      * @return a {@link org.apache.maven.shared.release.policy.naming.NamingPolicyResult} object
      */
-    public NamingPolicyResult setName( String name )
-    {
+    public NamingPolicyResult setName(String name) {
         this.name = name;
         return this;
     }
-
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicy.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.version;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,17 +16,17 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.policy.version;
 
 import org.apache.maven.shared.release.policy.PolicyException;
 import org.apache.maven.shared.release.versions.VersionParseException;
 
 /**
- * API for next version calculations, used by maven-release-plugin to suggest release and next develoment versions.
+ * API for next version calculations, used by maven-release-plugin to suggest release and next development versions.
  *
  * @since 2.5.1 (MRELEASE-431)
  */
-public interface VersionPolicy
-{
+public interface VersionPolicy {
     /**
      * <p>getReleaseVersion.</p>
      *
@@ -37,8 +35,7 @@ public interface VersionPolicy
      * @throws org.apache.maven.shared.release.policy.PolicyException if exception in the policy
      * @throws org.apache.maven.shared.release.versions.VersionParseException if exception parsing the version
      */
-    VersionPolicyResult getReleaseVersion( VersionPolicyRequest request )
-        throws PolicyException, VersionParseException;
+    VersionPolicyResult getReleaseVersion(VersionPolicyRequest request) throws PolicyException, VersionParseException;
 
     /**
      * <p>getDevelopmentVersion.</p>
@@ -48,6 +45,6 @@ VersionPolicyResult getReleaseVersion( VersionPolicyRequest request )
      * @throws org.apache.maven.shared.release.policy.PolicyException if exception in the policy
      * @throws org.apache.maven.shared.release.versions.VersionParseException if exception parsing the version
      */
-    VersionPolicyResult getDevelopmentVersion( VersionPolicyRequest request )
-        throws PolicyException, VersionParseException;
+    VersionPolicyResult getDevelopmentVersion(VersionPolicyRequest request)
+            throws PolicyException, VersionParseException;
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.version;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,28 +16,35 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.policy.version;
 
 import org.apache.maven.artifact.repository.metadata.Metadata;
+import org.apache.maven.scm.provider.ScmProvider;
+import org.apache.maven.scm.repository.ScmRepository;
 
 /**
  * <p>VersionPolicyRequest class.</p>
  *
  * @since 2.5.1 (MRELEASE-431)
  */
-public class VersionPolicyRequest
-{
+public class VersionPolicyRequest {
 
     private String version;
-    
+
     private Metadata metaData;
 
+    private ScmRepository scmRepository;
+    private ScmProvider scmProvider;
+    private String workingDirectory;
+
+    private String config;
+
     /**
      * <p>Getter for the field <code>version</code>.</p>
      *
      * @return a {@link java.lang.String} object
      */
-    public String getVersion()
-    {
+    public String getVersion() {
         return version;
     }
 
@@ -49,32 +54,108 @@ public String getVersion()
      * @param version a {@link java.lang.String} object
      * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
      */
-    public VersionPolicyRequest setVersion( String version )
-    {
+    public VersionPolicyRequest setVersion(String version) {
         this.version = version;
         return this;
     }
-    
+
     /**
      * <p>Getter for the field <code>metaData</code>.</p>
      *
      * @return a {@link org.apache.maven.artifact.repository.metadata.Metadata} object
      */
-    public Metadata getMetaData()
-    {
+    public Metadata getMetaData() {
         return metaData;
     }
-    
+
     /**
      * <p>Setter for the field <code>metaData</code>.</p>
      *
      * @param metaData a {@link org.apache.maven.artifact.repository.metadata.Metadata} object
      * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
      */
-    public VersionPolicyRequest setMetaData( Metadata metaData )
-    {
+    public VersionPolicyRequest setMetaData(Metadata metaData) {
         this.metaData = metaData;
         return this;
     }
-
+
+    /**
+     * <p>Getter for the field <code>scmRepository</code>.</p>
+     *
+     * @return a {@link ScmRepository} object
+     */
+    public ScmRepository getScmRepository() {
+        return scmRepository;
+    }
+
+    /**
+     * <p>Setter for the field <code>scmRepository</code>.</p>
+     *
+     * @param scmRepository The {@link ScmRepository} where the history can be retrieved.
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setScmRepository(ScmRepository scmRepository) {
+        this.scmRepository = scmRepository;
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>scmProvider</code>.</p>
+     *
+     * @return a {@link ScmProvider} object
+     */
+    public ScmProvider getScmProvider() {
+        return scmProvider;
+    }
+
+    /**
+     * <p>Setter for the field <code>scmProvider</code>.</p>
+     *
+     * @param scmProvider The {@link ScmProvider} where the history can be retrieved.
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setScmProvider(ScmProvider scmProvider) {
+        this.scmProvider = scmProvider;
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>workingDirectory</code>.</p>
+     *
+     * @return the {@link String} that contains the workingDirectory (can be null or empty).
+     */
+    public String getWorkingDirectory() {
+        return workingDirectory;
+    }
+
+    /**
+     * <p>Setter for the field <code>workingDirectory</code>.</p>
+     *
+     * @param workingDirectory The {@link String} that contains the workingDirectory (can be null or empty).
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setWorkingDirectory(String workingDirectory) {
+        this.workingDirectory = workingDirectory;
+        return this;
+    }
+
+    /**
+     * <p>Getter for the field <code>config</code>.</p>
+     *
+     * @return the {@link String} that contains the config (can be null or empty).
+     */
+    public String getConfig() {
+        return config;
+    }
+
+    /**
+     * <p>Setter for the field <code>config</code>.</p>
+     *
+     * @param config The {@link String} that contains the config (can be null or empty).
+     * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyRequest} object
+     */
+    public VersionPolicyRequest setConfig(String config) {
+        this.config = config;
+        return this;
+    }
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/policy/version/VersionPolicyResult.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.policy.version;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,23 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.policy.version;
 
 /**
  * <p>VersionPolicyResult class.</p>
  *
  * @since 2.5.1 (MRELEASE-431)
  */
-public class VersionPolicyResult
-{
+public class VersionPolicyResult {
     private String version;
 
     /**
      * <p>Getter for the field <code>version</code>.</p>
      *
      * @return a {@link java.lang.String} object
      */
-    public String getVersion()
-    {
+    public String getVersion() {
         return version;
     }
 
@@ -44,10 +41,8 @@ public String getVersion()
      * @param version a {@link java.lang.String} object
      * @return a {@link org.apache.maven.shared.release.policy.version.VersionPolicyResult} object
      */
-    public VersionPolicyResult setVersion( String version )
-    {
+    public VersionPolicyResult setVersion(String version) {
         this.version = version;
         return this;
     }
-
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/strategy/Strategy.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.strategy;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.strategy;
 
 import java.util.List;
 
@@ -28,36 +27,35 @@
  *
  * @author Robert Scholte
  */
-public interface Strategy
-{
+public interface Strategy {
     /**
      * <p>getPreparePhases.</p>
      *
      * @return The release phases to execute the calling the prepare goal
      */
     List<String> getPreparePhases();
-    
+
     /**
      * <p>getPerformPhases.</p>
      *
      * @return The release phases to execute the calling the perform goal
      */
     List<String> getPerformPhases();
-    
+
     /**
      * <p>getBranchPhases.</p>
      *
      * @return The release phases to execute the calling the branch goal
      */
     List<String> getBranchPhases();
-    
+
     /**
      * <p>getRollbackPhases.</p>
      *
      * @return The release phases to execute the calling the rollback goal
      */
     List<String> getRollbackPhases();
-    
+
     /**
      * <p>getUpdateVersionsPhases.</p>
      *

maven-release-api/src/main/java/org/apache/maven/shared/release/versions/AetherVersion.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,31 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.versions;
 
 import org.eclipse.aether.util.version.GenericVersionScheme;
 import org.eclipse.aether.version.InvalidVersionSpecificationException;
 
-class AetherVersion
-    implements org.eclipse.aether.version.Version
-{
+class AetherVersion implements org.eclipse.aether.version.Version {
     private final org.eclipse.aether.version.Version version;
 
-    AetherVersion( String version )
-        throws VersionParseException
-    {
-        try
-        {
-            this.version = new GenericVersionScheme().parseVersion( version );
-        }
-        catch ( InvalidVersionSpecificationException e )
-        {
-            throw new VersionParseException( e.getMessage() );
+    AetherVersion(String version) throws VersionParseException {
+        try {
+            this.version = new GenericVersionScheme().parseVersion(version);
+        } catch (InvalidVersionSpecificationException e) {
+            throw new VersionParseException(e.getMessage());
         }
     }
 
     @Override
-    public String toString()
-    {
+    public String toString() {
         return this.version.toString();
     }
 
@@ -52,8 +43,7 @@ public String toString()
      * @param other a {@link org.eclipse.aether.version.Version} object
      * @return a int
      */
-    public int compareTo( org.eclipse.aether.version.Version other )
-    {
-        return this.version.compareTo( other );
+    public int compareTo(org.eclipse.aether.version.Version other) {
+        return this.version.compareTo(other);
     }
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/versions/MavenArtifactVersion.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,55 +16,44 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.versions;
 
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 
-class MavenArtifactVersion
-    implements Comparable<MavenArtifactVersion>
-{
+class MavenArtifactVersion implements Comparable<MavenArtifactVersion> {
     private final ArtifactVersion version;
 
-    MavenArtifactVersion( String version )
-    {
-        this.version = new DefaultArtifactVersion( version );
+    MavenArtifactVersion(String version) {
+        this.version = new DefaultArtifactVersion(version);
     }
 
-    public int compareTo( MavenArtifactVersion o )
-    {
-        return version.compareTo( o.version );
+    public int compareTo(MavenArtifactVersion o) {
+        return version.compareTo(o.version);
     }
 
     @Override
-    public String toString()
-    {
+    public String toString() {
         return this.version.toString();
     }
 
     @Override
-    public int hashCode()
-    {
+    public int hashCode() {
         return this.version.hashCode();
     }
-    
+
     @Override
-    public boolean equals( Object other )
-    {
-        if ( this == other )
-        {
+    public boolean equals(Object other) {
+        if (this == other) {
             return true;
         }
-        if ( other == null )
-        {
+        if (other == null) {
             return false;
         }
 
-        if ( other instanceof MavenArtifactVersion )
-        {
-            return version.equals( ( (MavenArtifactVersion) other ).version );
+        if (other instanceof MavenArtifactVersion) {
+            return version.equals(((MavenArtifactVersion) other).version);
         }
         return false;
     }
-
-
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionComparisonConflictException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,13 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.versions;
 
 /**
  * <p>VersionComparisonConflictException class.</p>
  */
-public class VersionComparisonConflictException
-    extends RuntimeException
-{
+public class VersionComparisonConflictException extends RuntimeException {
 
     private final String lhsVersion;
 
@@ -42,20 +39,17 @@ public class VersionComparisonConflictException
      * @param aetherComparisonResult a int
      * @param mavenComparisonResult a int
      */
-    public VersionComparisonConflictException( String lhsVersion, String rhsVersion, int aetherComparisonResult,
-                                               int mavenComparisonResult )
-    {
+    public VersionComparisonConflictException(
+            String lhsVersion, String rhsVersion, int aetherComparisonResult, int mavenComparisonResult) {
         this.lhsVersion = lhsVersion;
         this.rhsVersion = rhsVersion;
         this.aetherComparisonResult = aetherComparisonResult;
         this.mavenComparisonResult = mavenComparisonResult;
     }
 
     @Override
-    public String getMessage()
-    {
+    public String getMessage() {
         return "Conflict when comparing " + lhsVersion + " with " + rhsVersion + "; Aether: " + aetherComparisonResult
-            + "; Maven: " + mavenComparisonResult;
+                + "; Maven: " + mavenComparisonResult;
     }
-
 }

maven-release-api/src/main/java/org/apache/maven/shared/release/versions/VersionParseException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.versions;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,20 +16,27 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.versions;
 
 /**
  * <p>VersionParseException class.</p>
  */
-public class VersionParseException
-    extends Exception
-{
+public class VersionParseException extends Exception {
+    /**
+     * <p>Constructor for VersionParseException.</p>
+     *
+     * @param message a {@link java.lang.String} object
+     */
+    public VersionParseException(String message) {
+        super(message);
+    }
+
     /**
      * <p>Constructor for VersionParseException.</p>
      *
      * @param message a {@link java.lang.String} object
      */
-    public VersionParseException( String message )
-    {
-        super( message );
+    public VersionParseException(String message, Throwable e) {
+        super(message, e);
     }
 }

maven-release-manager/pom.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-  <!--
+<!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
   ~ or more contributor license agreements.  See the NOTICE file
   ~ distributed with this work for additional information
@@ -17,14 +17,13 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
     <groupId>org.apache.maven.release</groupId>
     <artifactId>maven-release</artifactId>
-    <version>3.0.0-M7</version>
+    <version>3.0.0</version>
   </parent>
 
   <artifactId>maven-release-manager</artifactId>
@@ -162,6 +161,12 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-core</artifactId>
+      <version>1.3</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-compat</artifactId>
@@ -187,13 +192,11 @@
       <artifactId>slf4j-simple</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.sisu</groupId>
       <artifactId>org.eclipse.sisu.plexus</artifactId>
       <scope>test</scope>
     </dependency>
-
     <dependency>
       <groupId>org.eclipse.aether</groupId>
       <artifactId>aether-util</artifactId>
@@ -241,20 +244,20 @@
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>java</goal>
-            </goals>
-          </execution>
-        </executions>
         <configuration>
           <version>3.0.0</version>
           <packageWithVersion>false</packageWithVersion>
           <models>
             <model>src/main/mdo/release-descriptor.mdo</model>
           </models>
         </configuration>
+        <executions>
+          <execution>
+            <goals>
+              <goal>java</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>

maven-release-manager/src/main/java/org/apache/maven/shared/release/AbstractReleaseRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import java.util.List;
 
@@ -30,8 +29,7 @@
  * @author Robert Scholte
  * @since 2.3
  */
-public abstract class AbstractReleaseRequest
-{
+public abstract class AbstractReleaseRequest {
     private ReleaseDescriptorBuilder releaseDescriptorBuilder;
 
     private List<MavenProject> reactorProjects;
@@ -43,8 +41,7 @@ public abstract class AbstractReleaseRequest
      *
      * @return the releaseDescriptor
      */
-    public ReleaseDescriptorBuilder getReleaseDescriptorBuilder()
-    {
+    public ReleaseDescriptorBuilder getReleaseDescriptorBuilder() {
         return releaseDescriptorBuilder;
     }
 
@@ -53,8 +50,7 @@ public ReleaseDescriptorBuilder getReleaseDescriptorBuilder()
      *
      * @param releaseDescriptor the releaseDescriptor to set
      */
-    public void setReleaseDescriptorBuilder( ReleaseDescriptorBuilder releaseDescriptor )
-    {
+    public void setReleaseDescriptorBuilder(ReleaseDescriptorBuilder releaseDescriptor) {
         this.releaseDescriptorBuilder = releaseDescriptor;
     }
 
@@ -63,8 +59,7 @@ public void setReleaseDescriptorBuilder( ReleaseDescriptorBuilder releaseDescrip
      *
      * @return the reactorProjects
      */
-    public List<MavenProject> getReactorProjects()
-    {
+    public List<MavenProject> getReactorProjects() {
         return reactorProjects;
     }
 
@@ -73,8 +68,7 @@ public List<MavenProject> getReactorProjects()
      *
      * @param reactorProjects the reactorProjects to set
      */
-    public void setReactorProjects( List<MavenProject> reactorProjects )
-    {
+    public void setReactorProjects(List<MavenProject> reactorProjects) {
         this.reactorProjects = reactorProjects;
     }
 
@@ -83,8 +77,7 @@ public void setReactorProjects( List<MavenProject> reactorProjects )
      *
      * @return the releaseManagerListener
      */
-    public ReleaseManagerListener getReleaseManagerListener()
-    {
+    public ReleaseManagerListener getReleaseManagerListener() {
         return releaseManagerListener;
     }
 
@@ -93,8 +86,7 @@ public ReleaseManagerListener getReleaseManagerListener()
      *
      * @param releaseManagerListener the releaseManagerListener to set
      */
-    public void setReleaseManagerListener( ReleaseManagerListener releaseManagerListener )
-    {
+    public void setReleaseManagerListener(ReleaseManagerListener releaseManagerListener) {
         this.releaseManagerListener = releaseManagerListener;
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/DefaultReleaseManagerListener.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import java.util.List;
 
@@ -31,9 +30,7 @@
  *
  * @author Hervé Boutemy
  */
-public class DefaultReleaseManagerListener
-    implements ReleaseManagerListener
-{
+public class DefaultReleaseManagerListener implements ReleaseManagerListener {
     private final Log log;
 
     private final boolean dryRun;
@@ -49,9 +46,8 @@ public class DefaultReleaseManagerListener
      *
      * @param log a {@link org.apache.maven.plugin.logging.Log} object
      */
-    public DefaultReleaseManagerListener( Log log )
-    {
-        this( log, false );
+    public DefaultReleaseManagerListener(Log log) {
+        this(log, false);
     }
 
     /**
@@ -60,62 +56,53 @@ public DefaultReleaseManagerListener( Log log )
      * @param log a {@link org.apache.maven.plugin.logging.Log} object
      * @param dryRun a boolean
      */
-    public DefaultReleaseManagerListener( Log log, boolean dryRun )
-    {
+    public DefaultReleaseManagerListener(Log log, boolean dryRun) {
         this.log = log;
         this.dryRun = dryRun;
     }
 
-    private void nextPhase( String name )
-    {
+    private void nextPhase(String name) {
         currentPhase++;
-        if ( !name.equals( phases.get( currentPhase ) ) )
-        {
-            log.warn( "inconsistent phase name: expected '" + phases.get( currentPhase ) + "' but got '" + name + "'" );
+        if (!name.equals(phases.get(currentPhase))) {
+            log.warn("inconsistent phase name: expected '" + phases.get(currentPhase) + "' but got '" + name + "'");
         }
     }
 
-    public void goalStart( String goal, List<String> phases )
-    {
-        log.info( "starting " + buffer().mojo( goal ) + " goal" + ( dryRun ? " in dry-run mode" : "" )
-            + ", composed of " + phases.size() + " phases: " + StringUtils.join( phases.iterator(), ", " ) );
+    public void goalStart(String goal, List<String> phases) {
+        log.info("starting " + buffer().mojo(goal) + " goal" + (dryRun ? " in dry-run mode" : "") + ", composed of "
+                + phases.size() + " phases: " + StringUtils.join(phases.iterator(), ", "));
         currentPhase = -1;
         this.phases = phases;
         this.goal = goal;
     }
 
-    public void phaseStart( String name )
-    {
-        nextPhase( name );
-        log.info( ( currentPhase + 1 ) + "/" + phases.size() + ' ' + buffer().mojo( goal + ':' + name )
-            + ( dryRun ? " dry-run" : "" ) );
+    public void phaseStart(String name) {
+        nextPhase(name);
+        log.info((currentPhase + 1) + "/" + phases.size() + ' ' + buffer().mojo(goal + ':' + name)
+                + (dryRun ? " dry-run" : ""));
     }
 
     /**
      * <p>phaseEnd.</p>
      */
-    public void phaseEnd()
-    {
+    public void phaseEnd() {
         // NOOP
     }
 
-    public void phaseSkip( String name )
-    {
-        nextPhase( name );
+    public void phaseSkip(String name) {
+        nextPhase(name);
     }
 
     /**
      * <p>goalEnd.</p>
      */
-    public void goalEnd()
-    {
+    public void goalEnd() {
         goal = null;
         phases = null;
     }
 
-    public void error( String reason )
-    {
-        log.error( "error during phase " + ( currentPhase + 1 ) + "/" + phases.size() + " " + phases.get( currentPhase )
-            + ": " + reason );
+    public void error(String reason) {
+        log.error("error during phase " + (currentPhase + 1) + "/" + phases.size() + " " + phases.get(currentPhase)
+                + ": " + reason);
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseBranchRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,8 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import java.util.Properties;
+
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
 /**
@@ -28,22 +28,20 @@
  * @author Robert Scholte
  * @since 2.3
  */
-public class ReleaseBranchRequest extends AbstractReleaseRequest
-{
+public class ReleaseBranchRequest extends AbstractReleaseRequest {
     // using Boolean to detect if has been set explicitly
     private Boolean dryRun;
 
     private ReleaseEnvironment releaseEnvironment;
-    
+
     private Properties userProperties;
 
     /**
      * <p>Getter for the field <code>dryRun</code>.</p>
      *
      * @return the dryRun
      */
-    public Boolean getDryRun()
-    {
+    public Boolean getDryRun() {
         return dryRun;
     }
 
@@ -52,8 +50,7 @@ public Boolean getDryRun()
      *
      * @param dryRun the dryRun to set
      */
-    public void setDryRun( Boolean dryRun )
-    {
+    public void setDryRun(Boolean dryRun) {
         this.dryRun = dryRun;
     }
 
@@ -62,8 +59,7 @@ public void setDryRun( Boolean dryRun )
      *
      * @return the releaseEnvironment
      */
-    public ReleaseEnvironment getReleaseEnvironment()
-    {
+    public ReleaseEnvironment getReleaseEnvironment() {
         return releaseEnvironment;
     }
 
@@ -72,28 +68,25 @@ public ReleaseEnvironment getReleaseEnvironment()
      *
      * @param releaseEnvironment the releaseEnvironment to set
      */
-    public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
-    {
+    public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
         this.releaseEnvironment = releaseEnvironment;
     }
-    
+
     /**
      * <p>Getter for the field <code>userProperties</code>.</p>
      *
      * @return a {@link java.util.Properties} object
      */
-    public Properties getUserProperties()
-    {
+    public Properties getUserProperties() {
         return userProperties;
     }
-    
+
     /**
      * <p>Setter for the field <code>userProperties</code>.</p>
      *
      * @param userProperties a {@link java.util.Properties} object
      */
-    public void setUserProperties( Properties userProperties )
-    {
+    public void setUserProperties(Properties userProperties) {
         this.userProperties = userProperties;
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseCleanRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 /**
  * <p>ReleaseCleanRequest class.</p>
  *
  * @author Robert Scholte
  * @since 2.3
  */
-public class ReleaseCleanRequest
-    extends AbstractReleaseRequest
-{
-}
+public class ReleaseCleanRequest extends AbstractReleaseRequest {}

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManager.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 /**
  * Release management classes.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public interface ReleaseManager
-{
+public interface ReleaseManager {
     /**
      * Prepare a release.
      *
@@ -34,23 +32,23 @@ public interface ReleaseManager
      * @throws org.apache.maven.shared.release.ReleaseFailureException   if there is a problem performing the release
      * @since 2.3
      */
-    void prepare( ReleasePrepareRequest prepareRequest ) throws ReleaseExecutionException, ReleaseFailureException;
+    void prepare(ReleasePrepareRequest prepareRequest) throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
      * <p>prepareWithResult.</p>
      *
      * @param prepareRequest a {@link org.apache.maven.shared.release.ReleasePrepareRequest} object
      * @return a {@link org.apache.maven.shared.release.ReleaseResult} object
      */
-    ReleaseResult prepareWithResult( ReleasePrepareRequest prepareRequest );
+    ReleaseResult prepareWithResult(ReleasePrepareRequest prepareRequest);
 
     /**
      * <p>performWithResult.</p>
      *
      * @param performRequest a {@link org.apache.maven.shared.release.ReleasePerformRequest} object
      * @return a {@link org.apache.maven.shared.release.ReleaseResult} object
      */
-    ReleaseResult performWithResult( ReleasePerformRequest performRequest );
+    ReleaseResult performWithResult(ReleasePerformRequest performRequest);
 
     /**
      * Perform a release
@@ -60,8 +58,7 @@ public interface ReleaseManager
      * @throws org.apache.maven.shared.release.ReleaseFailureException   if there is a problem performing the release
      * @since 2.3
      */
-    void perform( ReleasePerformRequest performRequest )
-        throws ReleaseExecutionException, ReleaseFailureException;
+    void perform(ReleasePerformRequest performRequest) throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
      * Clean a release.
@@ -70,7 +67,7 @@ void perform( ReleasePerformRequest performRequest )
      * @throws org.apache.maven.shared.release.ReleaseFailureException if exception when releasing
      * @since 2.3
      */
-    void clean( ReleaseCleanRequest cleanRequest ) throws ReleaseFailureException;
+    void clean(ReleaseCleanRequest cleanRequest) throws ReleaseFailureException;
 
     /**
      * Rollback changes made by the previous release
@@ -80,8 +77,7 @@ void perform( ReleasePerformRequest performRequest )
      * @throws org.apache.maven.shared.release.ReleaseFailureException   if there is a problem during release rollback
      * @since 2.3
      */
-    void rollback( ReleaseRollbackRequest rollbackRequest )
-        throws ReleaseExecutionException, ReleaseFailureException;
+    void rollback(ReleaseRollbackRequest rollbackRequest) throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
      * Branch a project
@@ -91,7 +87,7 @@ void rollback( ReleaseRollbackRequest rollbackRequest )
      * @throws org.apache.maven.shared.release.ReleaseFailureException   if there is a problem during release branch
      * @since 2.3
      */
-    void branch( ReleaseBranchRequest branchRequest ) throws ReleaseExecutionException, ReleaseFailureException;
+    void branch(ReleaseBranchRequest branchRequest) throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
      * Update version numbers for a project
@@ -101,6 +97,6 @@ void rollback( ReleaseRollbackRequest rollbackRequest )
      * @throws org.apache.maven.shared.release.ReleaseFailureException   if there is a problem during update versions
      * @since 2.3
      */
-    void updateVersions( ReleaseUpdateVersionsRequest updateVersionsRequest )
-        throws ReleaseExecutionException, ReleaseFailureException;
+    void updateVersions(ReleaseUpdateVersionsRequest updateVersionsRequest)
+            throws ReleaseExecutionException, ReleaseFailureException;
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseManagerListener.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import java.util.List;
 
@@ -26,22 +25,21 @@
  *
  * @author Edwin Punzalan
  */
-public interface ReleaseManagerListener
-{
+public interface ReleaseManagerListener {
     /**
      * <p>goalStart.</p>
      *
      * @param goal a {@link java.lang.String} object
      * @param phases a {@link java.util.List} object
      */
-    void goalStart( String goal, List<String> phases );
+    void goalStart(String goal, List<String> phases);
 
     /**
      * <p>phaseStart.</p>
      *
      * @param name a {@link java.lang.String} object
      */
-    void phaseStart( String name );
+    void phaseStart(String name);
 
     /**
      * <p>phaseEnd.</p>
@@ -53,7 +51,7 @@ public interface ReleaseManagerListener
      *
      * @param name a {@link java.lang.String} object
      */
-    void phaseSkip( String name );
+    void phaseSkip(String name);
 
     /**
      * <p>goalEnd.</p>
@@ -65,5 +63,5 @@ public interface ReleaseManagerListener
      *
      * @param reason a {@link java.lang.String} object
      */
-    void error( String reason );
+    void error(String reason);
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePerformRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
@@ -27,9 +26,7 @@
  * @author Robert Scholte
  * @since 2.3
  */
-public class ReleasePerformRequest
-    extends AbstractReleaseRequest
-{
+public class ReleasePerformRequest extends AbstractReleaseRequest {
     // using Boolean to detect if has been set explicitly
     private Boolean dryRun;
 
@@ -43,8 +40,7 @@ public class ReleasePerformRequest
      *
      * @return the dryRun
      */
-    public Boolean getDryRun()
-    {
+    public Boolean getDryRun() {
         return dryRun;
     }
 
@@ -53,8 +49,7 @@ public Boolean getDryRun()
      *
      * @param dryRun the dryRun to set
      */
-    public void setDryRun( Boolean dryRun )
-    {
+    public void setDryRun(Boolean dryRun) {
         this.dryRun = dryRun;
     }
 
@@ -63,8 +58,7 @@ public void setDryRun( Boolean dryRun )
      *
      * @return the clean
      */
-    public Boolean getClean()
-    {
+    public Boolean getClean() {
         return clean;
     }
 
@@ -73,8 +67,7 @@ public Boolean getClean()
      *
      * @param clean the clean to set
      */
-    public void setClean( Boolean clean )
-    {
+    public void setClean(Boolean clean) {
         this.clean = clean;
     }
 
@@ -83,8 +76,7 @@ public void setClean( Boolean clean )
      *
      * @return the releaseEnvironment
      */
-    public ReleaseEnvironment getReleaseEnvironment()
-    {
+    public ReleaseEnvironment getReleaseEnvironment() {
         return releaseEnvironment;
     }
 
@@ -93,8 +85,7 @@ public ReleaseEnvironment getReleaseEnvironment()
      *
      * @param releaseEnvironment the releaseEnvironment to set
      */
-    public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
-    {
+    public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
         this.releaseEnvironment = releaseEnvironment;
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleasePrepareRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import java.util.Properties;
 
@@ -29,26 +28,23 @@
  * @author Robert Scholte
  * @since 2.3
  */
-public class ReleasePrepareRequest
-    extends AbstractReleaseRequest
-{
+public class ReleasePrepareRequest extends AbstractReleaseRequest {
     // using Boolean to detect if has been set explicitly
     private Boolean dryRun;
 
     // using Boolean to detect if has been set explicitly
     private Boolean resume;
 
     private ReleaseEnvironment releaseEnvironment;
-    
+
     private Properties userProperties;
 
     /**
      * <p>Getter for the field <code>dryRun</code>.</p>
      *
      * @return the dryRun
      */
-    public Boolean getDryRun()
-    {
+    public Boolean getDryRun() {
         return dryRun;
     }
 
@@ -57,8 +53,7 @@ public Boolean getDryRun()
      *
      * @param dryRun the dryRun to set
      */
-    public void setDryRun( Boolean dryRun )
-    {
+    public void setDryRun(Boolean dryRun) {
         this.dryRun = dryRun;
     }
 
@@ -67,8 +62,7 @@ public void setDryRun( Boolean dryRun )
      *
      * @return the resume
      */
-    public Boolean getResume()
-    {
+    public Boolean getResume() {
         return resume;
     }
 
@@ -77,8 +71,7 @@ public Boolean getResume()
      *
      * @param resume the resume to set
      */
-    public void setResume( Boolean resume )
-    {
+    public void setResume(Boolean resume) {
         this.resume = resume;
     }
 
@@ -87,8 +80,7 @@ public void setResume( Boolean resume )
      *
      * @return the releaseEnvironment
      */
-    public ReleaseEnvironment getReleaseEnvironment()
-    {
+    public ReleaseEnvironment getReleaseEnvironment() {
         return releaseEnvironment;
     }
 
@@ -97,28 +89,25 @@ public ReleaseEnvironment getReleaseEnvironment()
      *
      * @param releaseEnvironment the releaseEnvironment to set
      */
-    public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
-    {
+    public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
         this.releaseEnvironment = releaseEnvironment;
     }
-    
+
     /**
      * <p>Getter for the field <code>userProperties</code>.</p>
      *
      * @return a {@link java.util.Properties} object
      */
-    public Properties getUserProperties()
-    {
+    public Properties getUserProperties() {
         return userProperties;
     }
-    
+
     /**
      * <p>Setter for the field <code>userProperties</code>.</p>
      *
      * @param userProperties a {@link java.util.Properties} object
      */
-    public void setUserProperties( Properties userProperties )
-    {
+    public void setUserProperties(Properties userProperties) {
         this.userProperties = userProperties;
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseRollbackRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
@@ -27,18 +26,15 @@
  * @author Robert Scholte
  * @since 2.3
  */
-public class ReleaseRollbackRequest
-    extends AbstractReleaseRequest
-{
+public class ReleaseRollbackRequest extends AbstractReleaseRequest {
     private ReleaseEnvironment releaseEnvironment;
 
     /**
      * <p>Getter for the field <code>releaseEnvironment</code>.</p>
      *
      * @return the releaseEnvironment
      */
-    public ReleaseEnvironment getReleaseEnvironment()
-    {
+    public ReleaseEnvironment getReleaseEnvironment() {
         return releaseEnvironment;
     }
 
@@ -47,8 +43,7 @@ public ReleaseEnvironment getReleaseEnvironment()
      *
      * @param releaseEnvironment the releaseEnvironment to set
      */
-    public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
-    {
+    public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
         this.releaseEnvironment = releaseEnvironment;
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/ReleaseUpdateVersionsRequest.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release;
 
 import java.util.Properties;
 
@@ -29,20 +28,17 @@
  * @author Robert Scholte
  * @since 2.3
  */
-public class ReleaseUpdateVersionsRequest
-    extends AbstractReleaseRequest
-{
+public class ReleaseUpdateVersionsRequest extends AbstractReleaseRequest {
     private ReleaseEnvironment releaseEnvironment;
-    
+
     private Properties userProperties;
 
     /**
      * <p>Getter for the field <code>releaseEnvironment</code>.</p>
      *
      * @return the releaseEnvironment
      */
-    public ReleaseEnvironment getReleaseEnvironment()
-    {
+    public ReleaseEnvironment getReleaseEnvironment() {
         return releaseEnvironment;
     }
 
@@ -51,28 +47,25 @@ public ReleaseEnvironment getReleaseEnvironment()
      *
      * @param releaseEnvironment the releaseEnvironment to set
      */
-    public void setReleaseEnvironment( ReleaseEnvironment releaseEnvironment )
-    {
+    public void setReleaseEnvironment(ReleaseEnvironment releaseEnvironment) {
         this.releaseEnvironment = releaseEnvironment;
     }
-    
+
     /**
      * <p>Getter for the field <code>userProperties</code>.</p>
      *
      * @return a {@link java.util.Properties} object
      */
-    public Properties getUserProperties()
-    {
+    public Properties getUserProperties() {
         return userProperties;
     }
-    
+
     /**
      * <p>Setter for the field <code>userProperties</code>.</p>
      *
      * @param userProperties a {@link java.util.Properties} object
      */
-    public void setUserProperties( Properties userProperties )
-    {
+    public void setUserProperties(Properties userProperties) {
         this.userProperties = userProperties;
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStore.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.config;
 
 /**
  * Storage for reading and writing release configuration.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public interface ReleaseDescriptorStore
-{
+public interface ReleaseDescriptorStore {
     /**
      * Read a configuration.
      *
@@ -34,22 +32,20 @@ public interface ReleaseDescriptorStore
      * @return the configuration
      * @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
      */
-    ReleaseDescriptorBuilder read( ReleaseDescriptorBuilder mergeDescriptor )
-            throws ReleaseDescriptorStoreException;
+    ReleaseDescriptorBuilder read(ReleaseDescriptorBuilder mergeDescriptor) throws ReleaseDescriptorStoreException;
 
     /**
      * Save a configuration.
      *
      * @param config the configuration
      * @throws org.apache.maven.shared.release.config.ReleaseDescriptorStoreException if any.
      */
-    void write( ReleaseDescriptor config )
-            throws ReleaseDescriptorStoreException;
+    void write(ReleaseDescriptor config) throws ReleaseDescriptorStoreException;
 
     /**
      * Remove a configuration.
      *
      * @param config the location of the configuration
      */
-    void delete( ReleaseDescriptor config );
+    void delete(ReleaseDescriptor config);
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/config/ReleaseDescriptorStoreException.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.config;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,23 +16,21 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.config;
 
 /**
  * Exception occurring within the configuration store.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public class ReleaseDescriptorStoreException
-        extends Exception
-{
+public class ReleaseDescriptorStoreException extends Exception {
     /**
      * <p>Constructor for ReleaseDescriptorStoreException.</p>
      *
      * @param message a {@link java.lang.String} object
      * @param t       a {@link java.lang.Throwable} object
      */
-    public ReleaseDescriptorStoreException( String message, Throwable t )
-    {
-        super( message, t );
+    public ReleaseDescriptorStoreException(String message, Throwable t) {
+        super(message, t);
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/env/DefaultReleaseEnvironment.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.env;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.env;
 
 import java.io.File;
 
@@ -26,9 +25,7 @@
 /**
  * <p>DefaultReleaseEnvironment class.</p>
  */
-public class DefaultReleaseEnvironment
-        implements ReleaseEnvironment
-{
+public class DefaultReleaseEnvironment implements ReleaseEnvironment {
     private File mavenHome;
 
     private File javaHome;
@@ -40,14 +37,12 @@ public class DefaultReleaseEnvironment
     private String mavenExecutorId = DEFAULT_MAVEN_EXECUTOR_ID;
 
     @Override
-    public File getMavenHome()
-    {
+    public File getMavenHome() {
         return mavenHome;
     }
 
     @Override
-    public Settings getSettings()
-    {
+    public Settings getSettings() {
         return settings;
     }
 
@@ -57,8 +52,7 @@ public Settings getSettings()
      * @param mavenHome a {@link java.io.File} object
      * @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
      */
-    public DefaultReleaseEnvironment setMavenHome( File mavenHome )
-    {
+    public DefaultReleaseEnvironment setMavenHome(File mavenHome) {
         this.mavenHome = mavenHome;
         return this;
     }
@@ -69,15 +63,13 @@ public DefaultReleaseEnvironment setMavenHome( File mavenHome )
      * @param settings a {@link org.apache.maven.settings.Settings} object
      * @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
      */
-    public DefaultReleaseEnvironment setSettings( Settings settings )
-    {
+    public DefaultReleaseEnvironment setSettings(Settings settings) {
         this.settings = settings;
         return this;
     }
 
     @Override
-    public String getMavenExecutorId()
-    {
+    public String getMavenExecutorId() {
         return mavenExecutorId;
     }
 
@@ -87,15 +79,13 @@ public String getMavenExecutorId()
      * @param mavenExecutorId a {@link java.lang.String} object
      * @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
      */
-    public DefaultReleaseEnvironment setMavenExecutorId( String mavenExecutorId )
-    {
+    public DefaultReleaseEnvironment setMavenExecutorId(String mavenExecutorId) {
         this.mavenExecutorId = mavenExecutorId;
         return this;
     }
 
     @Override
-    public File getJavaHome()
-    {
+    public File getJavaHome() {
         return javaHome;
     }
 
@@ -105,20 +95,17 @@ public File getJavaHome()
      * @param javaHome a {@link java.io.File} object
      * @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
      */
-    public DefaultReleaseEnvironment setJavaHome( File javaHome )
-    {
+    public DefaultReleaseEnvironment setJavaHome(File javaHome) {
         this.javaHome = javaHome;
         return this;
     }
 
     @Override
-    public File getLocalRepositoryDirectory()
-    {
+    public File getLocalRepositoryDirectory() {
         File localRepo = localRepositoryDirectory;
 
-        if ( localRepo == null && settings != null && settings.getLocalRepository() != null )
-        {
-            localRepo = new File( settings.getLocalRepository() ).getAbsoluteFile();
+        if (localRepo == null && settings != null && settings.getLocalRepository() != null) {
+            localRepo = new File(settings.getLocalRepository()).getAbsoluteFile();
         }
 
         return localRepo;
@@ -130,8 +117,7 @@ public File getLocalRepositoryDirectory()
      * @param localRepositoryDirectory a {@link java.io.File} object
      * @return a {@link org.apache.maven.shared.release.env.DefaultReleaseEnvironment} object
      */
-    public DefaultReleaseEnvironment setLocalRepositoryDirectory( File localRepositoryDirectory )
-    {
+    public DefaultReleaseEnvironment setLocalRepositoryDirectory(File localRepositoryDirectory) {
         this.localRepositoryDirectory = localRepositoryDirectory;
         return this;
     }

maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.exec;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -42,48 +41,52 @@
 /**
  * <p>Abstract AbstractMavenExecutor class.</p>
  */
-public abstract class AbstractMavenExecutor
-        implements MavenExecutor
-{
-    private final Logger logger = LoggerFactory.getLogger( getClass() );
+public abstract class AbstractMavenExecutor implements MavenExecutor {
+    private final Logger logger = LoggerFactory.getLogger(getClass());
 
     private final MavenCrypto mavenCrypto;
 
-    protected AbstractMavenExecutor( MavenCrypto mavenCrypto )
-    {
-        this.mavenCrypto = requireNonNull( mavenCrypto );
+    protected AbstractMavenExecutor(MavenCrypto mavenCrypto) {
+        this.mavenCrypto = requireNonNull(mavenCrypto);
     }
 
     @Override
-    public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
-                              boolean interactive, String additionalArguments, String pomFileName,
-                              ReleaseResult result )
-            throws MavenExecutorException
-    {
+    public void executeGoals(
+            File workingDirectory,
+            String goals,
+            ReleaseEnvironment releaseEnvironment,
+            boolean interactive,
+            String additionalArguments,
+            String pomFileName,
+            ReleaseResult result)
+            throws MavenExecutorException {
         List<String> goalsList = new ArrayList<>();
-        if ( goals != null )
-        {
+        if (goals != null) {
             // accept both space and comma, so the old way still work
             // also accept line separators, so that goal lists can be spread
             // across multiple lines in the POM.
-            Collections.addAll( goalsList, StringUtils.split( goals, ", \n\r\t" ) );
+            Collections.addAll(goalsList, StringUtils.split(goals, ", \n\r\t"));
         }
-        executeGoals( workingDirectory, goalsList, releaseEnvironment, interactive, additionalArguments, pomFileName,
-                result );
+        executeGoals(
+                workingDirectory, goalsList, releaseEnvironment, interactive, additionalArguments, pomFileName, result);
     }
 
-    protected abstract void executeGoals( File workingDirectory, List<String> goals,
-                                          ReleaseEnvironment releaseEnvironment, boolean interactive,
-                                          String additionalArguments, String pomFileName, ReleaseResult result )
+    protected abstract void executeGoals(
+            File workingDirectory,
+            List<String> goals,
+            ReleaseEnvironment releaseEnvironment,
+            boolean interactive,
+            String additionalArguments,
+            String pomFileName,
+            ReleaseResult result)
             throws MavenExecutorException;
 
     /**
      * <p>Getter for the field <code>logger</code>.</p>
      *
      * @return a {@link Logger} object
      */
-    protected final Logger getLogger()
-    {
+    protected final Logger getLogger() {
         return logger;
     }
 
@@ -93,50 +96,35 @@ protected final Logger getLogger()
      * @param settings a {@link org.apache.maven.settings.Settings} object
      * @return a {@link org.apache.maven.settings.Settings} object
      */
-    protected Settings encryptSettings( Settings settings )
-    {
-        Settings encryptedSettings = SettingsUtils.copySettings( settings );
+    protected Settings encryptSettings(Settings settings) {
+        Settings encryptedSettings = SettingsUtils.copySettings(settings);
 
-        for ( Server server : encryptedSettings.getServers() )
-        {
+        for (Server server : encryptedSettings.getServers()) {
             String password = server.getPassword();
-            if ( password != null && !mavenCrypto.isEncryptedString( password ) )
-            {
-                try
-                {
-                    server.setPassword( mavenCrypto.encryptAndDecorate( password ) );
-                }
-                catch ( MavenCryptoException e )
-                {
+            if (password != null && !mavenCrypto.isEncryptedString(password)) {
+                try {
+                    server.setPassword(mavenCrypto.encryptAndDecorate(password));
+                } catch (MavenCryptoException e) {
                     // ignore
                 }
             }
 
             String passphrase = server.getPassphrase();
-            if ( passphrase != null && !mavenCrypto.isEncryptedString( passphrase ) )
-            {
-                try
-                {
-                    server.setPassphrase( mavenCrypto.encryptAndDecorate( passphrase ) );
-                }
-                catch ( MavenCryptoException e )
-                {
+            if (passphrase != null && !mavenCrypto.isEncryptedString(passphrase)) {
+                try {
+                    server.setPassphrase(mavenCrypto.encryptAndDecorate(passphrase));
+                } catch (MavenCryptoException e) {
                     // ignore
                 }
             }
         }
 
-        for ( Proxy proxy : encryptedSettings.getProxies() )
-        {
+        for (Proxy proxy : encryptedSettings.getProxies()) {
             String password = proxy.getPassword();
-            if ( password != null && !mavenCrypto.isEncryptedString( password ) )
-            {
-                try
-                {
-                    proxy.setPassword( mavenCrypto.encryptAndDecorate( password ) );
-                }
-                catch ( MavenCryptoException e )
-                {
+            if (password != null && !mavenCrypto.isEncryptedString(password)) {
+                try {
+                    proxy.setPassword(mavenCrypto.encryptAndDecorate(password));
+                } catch (MavenCryptoException e) {
                     // ignore
                 }
             }
@@ -150,8 +138,7 @@ protected Settings encryptSettings( Settings settings )
      *
      * @return a {@link org.apache.maven.settings.io.xpp3.SettingsXpp3Writer} object
      */
-    protected SettingsXpp3Writer getSettingsWriter()
-    {
+    protected SettingsXpp3Writer getSettingsWriter() {
         return new SettingsXpp3Writer();
     }
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/CommandLineFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.exec;
 
 import org.codehaus.plexus.util.cli.Commandline;
 
@@ -26,8 +25,7 @@
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
-public interface CommandLineFactory
-{
+public interface CommandLineFactory {
     /**
      * Create a command line object with default environment for the given executable.
      *
@@ -36,6 +34,5 @@ public interface CommandLineFactory
      * @throws org.apache.maven.shared.release.exec.MavenExecutorException if there was a problem creating
      *                                                                     the command line
      */
-    Commandline createCommandLine( String executable )
-            throws MavenExecutorException;
+    Commandline createCommandLine(String executable) throws MavenExecutorException;
 }

maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/DefaultCommandLineFactory.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.exec;
 
 import javax.inject.Named;
 import javax.inject.Singleton;
@@ -31,23 +30,16 @@
  */
 @Singleton
 @Named
-public class DefaultCommandLineFactory
-        implements CommandLineFactory
-{
+public class DefaultCommandLineFactory implements CommandLineFactory {
     @Override
-    public Commandline createCommandLine( String executable )
-            throws MavenExecutorException
-    {
+    public Commandline createCommandLine(String executable) throws MavenExecutorException {
         Commandline commandline = new Commandline();
-        commandline.setExecutable( executable );
+        commandline.setExecutable(executable);
 
-        try
-        {
+        try {
             commandline.addSystemEnvironment();
-        }
-        catch ( Exception e )
-        {
-            throw new MavenExecutorException( e.getMessage(), e );
+        } catch (Exception e) {
+            throw new MavenExecutorException(e.getMessage(), e);
         }
 
         return commandline;

maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/ForkedMavenExecutor.java

@@ -1,5 +1,3 @@
-package org.apache.maven.shared.release.exec;
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,6 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
+package org.apache.maven.shared.release.exec;
 
 import javax.inject.Inject;
 import javax.inject.Named;
@@ -28,6 +27,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.nio.file.Files;
 import java.util.List;
 
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
@@ -46,131 +46,108 @@
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
 @Singleton
-@Named( "forked-path" )
-public class ForkedMavenExecutor
-        extends AbstractMavenExecutor
-{
+@Named("forked-path")
+public class ForkedMavenExecutor extends AbstractMavenExecutor {
     /**
      * Command line factory.
      */
     private final CommandLineFactory commandLineFactory;
 
     @Inject
-    public ForkedMavenExecutor( MavenCrypto mavenCrypto,
-                                CommandLineFactory commandLineFactory )
-    {
-        super( mavenCrypto );
-        this.commandLineFactory = requireNonNull( commandLineFactory );
+    public ForkedMavenExecutor(MavenCrypto mavenCrypto, CommandLineFactory commandLineFactory) {
+        super(mavenCrypto);
+        this.commandLineFactory = requireNonNull(commandLineFactory);
     }
 
     /*
      * @noinspection UseOfSystemOutOrSystemErr
      */
     @Override
-    public void executeGoals( File workingDirectory, List<String> goals, ReleaseEnvironment releaseEnvironment,
-                              boolean interactive, String additionalArguments, String pomFileName,
-                              ReleaseResult relResult )
-            throws MavenExecutorException
-    {
+    public void executeGoals(
+            File workingDirectory,
+            List<String> goals,
+            ReleaseEnvironment releaseEnvironment,
+            boolean interactive,
+            String additionalArguments,
+            String pomFileName,
+            ReleaseResult relResult)
+            throws MavenExecutorException {
         String mavenPath;
         // if null we use the current one
-        if ( releaseEnvironment.getMavenHome() != null )
-        {
+        if (releaseEnvironment.getMavenHome() != null) {
             mavenPath = releaseEnvironment.getMavenHome().getAbsolutePath();
-        }
-        else
-        {
-            mavenPath = System.getProperty( "maven.home" );
+        } else {
+            mavenPath = System.getProperty("maven.home");
         }
 
         File settingsFile = null;
-        if ( releaseEnvironment.getSettings() != null )
-        {
+        if (releaseEnvironment.getSettings() != null) {
             // Have to serialize to a file as if Maven is embedded, there may not actually be a settings.xml on disk
-            try
-            {
-                settingsFile = File.createTempFile( "release-settings", ".xml" );
+            try {
+                settingsFile = Files.createTempFile("release-settings", ".xml").toFile();
                 SettingsXpp3Writer writer = getSettingsWriter();
 
-                try ( FileWriter fileWriter = new FileWriter( settingsFile ) )
-                {
-                    writer.write( fileWriter, encryptSettings( releaseEnvironment.getSettings() ) );
+                try (FileWriter fileWriter = new FileWriter(settingsFile)) {
+                    writer.write(fileWriter, encryptSettings(releaseEnvironment.getSettings()));
                 }
-            }
-            catch ( IOException e )
-            {
-                throw new MavenExecutorException( "Could not create temporary file for release settings.xml", e );
+            } catch (IOException e) {
+                throw new MavenExecutorException("Could not create temporary file for release settings.xml", e);
             }
         }
-        try
-        {
+        try {
 
             Commandline cl =
-                    commandLineFactory.createCommandLine( mavenPath + File.separator + "bin" + File.separator + "mvn" );
+                    commandLineFactory.createCommandLine(mavenPath + File.separator + "bin" + File.separator + "mvn");
 
-            cl.setWorkingDirectory( workingDirectory.getAbsolutePath() );
+            cl.setWorkingDirectory(workingDirectory.getAbsolutePath());
 
             // FIX for MRELEASE-1105
-            //cl.addEnvironment( "MAVEN_DEBUG_OPTS", "" );
+            // cl.addEnvironment( "MAVEN_DEBUG_OPTS", "" );
 
-            cl.addEnvironment( "MAVEN_TERMINATE_CMD", "on" );
+            cl.addEnvironment("MAVEN_TERMINATE_CMD", "on");
 
-            if ( settingsFile != null )
-            {
-                cl.createArg().setValue( "-s" );
-                cl.createArg().setFile( settingsFile );
+            if (settingsFile != null) {
+                cl.createArg().setValue("-s");
+                cl.createArg().setFile(settingsFile);
             }
 
-            if ( pomFileName != null )
-            {
-                cl.createArg().setValue( "-f" );
-                cl.createArg().setValue( pomFileName );
+            if (pomFileName != null) {
+                cl.createArg().setValue("-f");
+                cl.createArg().setValue(pomFileName);
             }
 
-            for ( String goal : goals )
-            {
-                cl.createArg().setValue( goal );
+            for (String goal : goals) {
+                cl.createArg().setValue(goal);
             }
 
-            if ( !interactive )
-            {
-                cl.createArg().setValue( "--batch-mode" );
+            if (!interactive) {
+                cl.createArg().setValue("--batch-mode");
             }
 
-            if ( !StringUtils.isEmpty( additionalArguments ) )
-            {
-                cl.createArg().setLine( additionalArguments );
+            if (!StringUtils.isEmpty(additionalArguments)) {
+                cl.createArg().setLine(additionalArguments);
             }
 
-            TeeOutputStream stdOut = new TeeOutputStream( System.out );
+            TeeOutputStream stdOut = new TeeOutputStream(System.out);
 
-            TeeOutputStream stdErr = new TeeOutputStream( System.err );
+            TeeOutputStream stdErr = new TeeOutputStream(System.err);
 
-            try
-            {
-                relResult.appendInfo( "Executing: " + cl );
-                getLogger().info( "Executing: " + cl );
+            try {
+                relResult.appendInfo("Executing: " + cl);
+                getLogger().info("Executing: " + cl);
 
-                int result = executeCommandLine( cl, System.in, stdOut, stdErr );
+                int result = executeCommandLine(cl, System.in, stdOut, stdErr);
 
-                if ( result != 0 )
-                {
-                    throw new MavenExecutorException( "Maven execution failed, exit code: '" + result + "'", result );
+                if (result != 0) {
+                    throw new MavenExecutorException("Maven execution failed, exit code: '" + result + "'", result);
                 }
+            } catch (CommandLineException e) {
+                throw new MavenExecutorException("Can't run goal " + goals, e);
+            } finally {
+                relResult.appendOutput(stdOut.toString());
             }
-            catch ( CommandLineException e )
-            {
-                throw new MavenExecutorException( "Can't run goal " + goals, e );
-            }
-            finally
-            {
-                relResult.appendOutput( stdOut.toString() );
-            }
-        }
-        finally
-        {
-            if ( settingsFile != null && settingsFile.exists() && !settingsFile.delete() )
-            {
+        } finally {
+            if (settingsFile != null && settingsFile.exists() && !settingsFile.delete()) {
                 settingsFile.deleteOnExit();
             }
         }
@@ -186,89 +163,67 @@ public void executeGoals( File workingDirectory, List<String> goals, ReleaseEnvi
      * @return a int
      * @throws org.codehaus.plexus.util.cli.CommandLineException if any.
      */
-    public static int executeCommandLine( Commandline cl, InputStream systemIn, OutputStream systemOut,
-                                          OutputStream systemErr )
-            throws CommandLineException
-    {
-        if ( cl == null )
-        {
-            throw new IllegalArgumentException( "cl cannot be null." );
+    public static int executeCommandLine(
+            Commandline cl, InputStream systemIn, OutputStream systemOut, OutputStream systemErr)
+            throws CommandLineException {
+        if (cl == null) {
+            throw new IllegalArgumentException("cl cannot be null.");
         }
 
         Process p = cl.execute();
 
-        //processes.put( new Long( cl.getPid() ), p );
+        // processes.put( new Long( cl.getPid() ), p );
 
         RawStreamPumper inputFeeder = null;
 
-        if ( systemIn != null )
-        {
-            inputFeeder = new RawStreamPumper( systemIn, p.getOutputStream(), true );
+        if (systemIn != null) {
+            inputFeeder = new RawStreamPumper(systemIn, p.getOutputStream(), true);
         }
 
-        RawStreamPumper outputPumper = new RawStreamPumper( p.getInputStream(), systemOut );
-        RawStreamPumper errorPumper = new RawStreamPumper( p.getErrorStream(), systemErr );
+        RawStreamPumper outputPumper = new RawStreamPumper(p.getInputStream(), systemOut);
+        RawStreamPumper errorPumper = new RawStreamPumper(p.getErrorStream(), systemErr);
 
-        if ( inputFeeder != null )
-        {
+        if (inputFeeder != null) {
             inputFeeder.start();
         }
 
         outputPumper.start();
 
         errorPumper.start();
 
-        try
-        {
+        try {
             int returnValue = p.waitFor();
 
-            if ( inputFeeder != null )
-            {
+            if (inputFeeder != null) {
                 inputFeeder.setDone();
             }
             outputPumper.setDone();
             errorPumper.setDone();
 
-            //processes.remove( new Long( cl.getPid() ) );
+            // processes.remove( new Long( cl.getPid() ) );
 
             return returnValue;
-        }
-        catch ( InterruptedException ex )
-        {
-            //killProcess( cl.getPid() );
-            throw new CommandLineException( "Error while executing external command, process killed.", ex );
-        }
-        finally
-        {
-            try
-            {
+        } catch (InterruptedException ex) {
+            // killProcess( cl.getPid() );
+            throw new CommandLineException("Error while executing external command, process killed.", ex);
+        } finally {
+            try {
                 errorPumper.closeInput();
+            } catch (IOException e) {
+                // ignore
             }
-            catch ( IOException e )
-            {
-                //ignore
-            }
-            try
-            {
+            try {
                 outputPumper.closeInput();
+            } catch (IOException e) {
+                // ignore
             }
-            catch ( IOException e )
-            {
-                //ignore
-            }
-            if ( inputFeeder != null )
-            {
-                try
-                {
+            if (inputFeeder != null) {
+                try {
                     inputFeeder.closeOutput();
-                }
-                catch ( IOException e )
-                {
-                    //ignore
+                } catch (IOException e) {
+                    // ignore
                 }
             }
         }
     }
-
-
 }