You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2018/01/15 21:18:54 UTC

[maven-release] 03/03: Remove more deprecated/overloaded methods

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

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

commit 94dee2aca4dc916c968a69cacf8f3cc137f7bfb0
Author: rfscholte <rf...@apache.org>
AuthorDate: Mon Jan 15 22:18:40 2018 +0100

    Remove more deprecated/overloaded methods
---
 .../shared/release/exec/AbstractMavenExecutor.java | 27 -----------
 .../maven/shared/release/exec/MavenExecutor.java   | 52 ----------------------
 .../shared/release/phase/AbstractReleasePhase.java | 23 ----------
 .../release/phase/AbstractRunGoalsPhase.java       | 13 ------
 .../maven/shared/release/phase/ReleasePhase.java   | 33 --------------
 .../release/exec/AbstractMavenExecutorTest.java    | 15 ++++---
 .../release/exec/ForkedMavenExecutorTest.java      | 13 +++---
 .../release/exec/InvokerMavenExecutorTest.java     |  2 +-
 .../release/phase/AbstractBackupPomsPhaseTest.java |  5 +--
 .../shared/release/phase/ReleasePhaseStub.java     | 25 -----------
 .../shared/release/stubs/MavenExecutorWrapper.java | 24 ----------
 11 files changed, 17 insertions(+), 215 deletions(-)

diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
index 3ad1ce7..e70fa0e 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/AbstractMavenExecutor.java
@@ -29,7 +29,6 @@ import org.apache.maven.settings.Settings;
 import org.apache.maven.settings.SettingsUtils;
 import org.apache.maven.settings.io.xpp3.SettingsXpp3Writer;
 import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.logging.LogEnabled;
@@ -71,32 +70,6 @@ public abstract class AbstractMavenExecutor
     }
 
     @Override
-    public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
-                              String pomFileName, ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments,
-                      pomFileName, result );
-    }
-
-    @Override
-    public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
-                              ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executeGoals( workingDirectory, goals, new DefaultReleaseEnvironment(), interactive, additionalArguments,
-                      result );
-    }
-
-    @Override
-    public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
-                              boolean interactive, String arguments, ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executeGoals( workingDirectory, goals, releaseEnvironment, interactive, arguments, null, result );
-    }
-
-    @Override
     public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
                               boolean interactive, String additionalArguments, String pomFileName,
                               ReleaseResult result )
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
index 3fa7bec..e1fe9f5 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/MavenExecutor.java
@@ -46,56 +46,4 @@ public interface MavenExecutor
     void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
                        boolean interactive, String additionalArguments, String pomFileName, ReleaseResult result )
         throws MavenExecutorException;
-
-    /**
-     * Execute goals using Maven.
-     *
-     * @param workingDirectory    the directory to execute in
-     * @param goals               the goals to run (space delimited)
-     * @param releaseEnvironment  the environmental settings, maven-home, etc used for this release
-     * @param interactive         whether to execute in interactive mode, or the default batch mode
-     * @param additionalArguments additional arguments to pass to the Maven command
-     * @param result              holds all results of the execution
-     * @throws MavenExecutorException if an error occurred executing Maven
-     */
-    void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
-                       boolean interactive, String additionalArguments, ReleaseResult result )
-        throws MavenExecutorException;
-
-    /**
-     * Execute goals using Maven.
-     *
-     * @param workingDirectory    the directory to execute in
-     * @param goals               the goals to run (space delimited)
-     * @param interactive         whether to execute in interactive mode, or the default batch mode
-     * @param additionalArguments additional arguments to pass to the Maven command
-     * @param pomFileName         the file name of the POM to execute on
-     * @param result              holds all results of the execution
-     * @throws MavenExecutorException if an error occurred executing Maven
-     *
-     * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String, String,
-     * ReleaseResult)} instead
-     */
-    @Deprecated
-    void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
-                       String pomFileName, ReleaseResult result )
-        throws MavenExecutorException;
-
-    /**
-     * Execute goals using Maven.
-     *
-     * @param workingDirectory    the directory to execute in
-     * @param goals               the goals to run (space delimited)
-     * @param interactive         whether to execute in interactive mode, or the default batch mode
-     * @param additionalArguments additional arguments to pass to the Maven command
-     * @param result              holds all results of the execution
-     * @throws MavenExecutorException if an error occurred executing Maven
-     *
-     * @deprecated Use {@link MavenExecutor#executeGoals(File, String, ReleaseEnvironment, boolean, String,
-     * ReleaseResult)} instead
-     */
-    @Deprecated
-    void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
-                       ReleaseResult result )
-        throws MavenExecutorException;
 }
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
index 39a35e1..a533a98 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractReleasePhase.java
@@ -20,12 +20,7 @@ package org.apache.maven.shared.release.phase;
  */
 
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
-import org.apache.maven.shared.release.ReleaseExecutionException;
-import org.apache.maven.shared.release.ReleaseFailureException;
 import org.apache.maven.shared.release.ReleaseResult;
-import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.codehaus.plexus.logging.AbstractLogEnabled;
 
 import java.util.List;
@@ -54,24 +49,6 @@ public abstract class AbstractReleasePhase
         return getReleaseResultSuccess();
     }
 
-    @Override
-    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor,
-                                  Settings settings,
-                                  List<MavenProject> reactorProjects )
-        throws ReleaseExecutionException, ReleaseFailureException
-    {
-        return execute( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
-    }
-
-    @Override
-    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor,
-                                   Settings settings,
-                                   List<MavenProject> reactorProjects )
-        throws ReleaseExecutionException, ReleaseFailureException
-    {
-        return simulate( releaseDescriptor, new DefaultReleaseEnvironment().setSettings( settings ), reactorProjects );
-    }
-
     protected void logInfo( ReleaseResult result, String message )
     {
         result.appendInfo( message );
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
index 43b5add..7f43212 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRunGoalsPhase.java
@@ -25,7 +25,6 @@ import java.util.Map;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
-import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 import org.apache.maven.shared.release.exec.MavenExecutor;
 import org.apache.maven.shared.release.exec.MavenExecutorException;
@@ -46,18 +45,6 @@ public abstract class AbstractRunGoalsPhase
     @Requirement( role = MavenExecutor.class )
     private Map<String, MavenExecutor> mavenExecutors;
 
-    /**
-     * @deprecated Use {@link AbstractRunGoalsPhase#execute(ReleaseDescriptor, ReleaseEnvironment, File, String)}
-     * instead.
-     */
-    @Deprecated
-    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, File workingDirectory,
-                                  String additionalArguments )
-        throws ReleaseExecutionException
-    {
-        return execute( releaseDescriptor, new DefaultReleaseEnvironment(), workingDirectory, additionalArguments );
-    }
-
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment,
                                   File workingDirectory, String additionalArguments )
         throws ReleaseExecutionException
diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
index eef87b7..d925ec6 100644
--- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
+++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/ReleasePhase.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.release.phase;
  */
 
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.ReleaseExecutionException;
 import org.apache.maven.shared.release.ReleaseFailureException;
 import org.apache.maven.shared.release.ReleaseResult;
@@ -65,38 +64,6 @@ public interface ReleasePhase
         throws ReleaseExecutionException, ReleaseFailureException;
 
     /**
-     * Execute the phase.
-     *
-     * @param releaseDescriptor the configuration to use
-     * @param settings          the settings.xml configuration
-     * @param reactorProjects   the reactor projects
-     * @throws ReleaseExecutionException an exception during the execution of the phase
-     * @throws ReleaseFailureException   a failure during the execution of the phase
-     * @return the release result
-     *
-     * @deprecated Use {@link ReleasePhase#execute(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
-     */
-    @Deprecated
-    ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
-        throws ReleaseExecutionException, ReleaseFailureException;
-
-    /**
-     * Simulate the phase, but don't make any changes to the project.
-     *
-     * @param releaseDescriptor the configuration to use
-     * @param settings          the settings.xml configuration
-     * @param reactorProjects   the reactor projects
-     * @throws ReleaseExecutionException an exception during the execution of the phase
-     * @throws ReleaseFailureException   a failure during the execution of the phase
-     * @return the release result
-     *
-     * @deprecated Use {@link ReleasePhase#simulate(ReleaseDescriptor, ReleaseEnvironment, List)} instead.
-     */
-    @Deprecated
-    ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
-        throws ReleaseExecutionException, ReleaseFailureException;
-
-    /**
      * Clean up after a phase if it leaves any additional files in the checkout.
      *
      * @param reactorProjects the reactor projects
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
index 559497a..5b7f904 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/AbstractMavenExecutorTest.java
@@ -34,6 +34,7 @@ import java.util.List;
 import junit.framework.TestCase;
 
 import org.apache.maven.shared.release.ReleaseResult;
+import org.apache.maven.shared.release.env.DefaultReleaseEnvironment;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
 
 public class AbstractMavenExecutorTest
@@ -45,48 +46,48 @@ public class AbstractMavenExecutorTest
     {
         AbstractMavenExecutor executor = spy( new AbstractMavenExecutorSpy() );
 
-        executor.executeGoals( null, null, true, null, null );
+        executor.executeGoals( null, (String) null, new DefaultReleaseEnvironment(), true, null, null, null );
         verify( executor ).executeGoals( isNull( File.class ), eq( new ArrayList<String>() ),
                                          isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
                                          isNull( String.class ), isNull( ReleaseResult.class ) );
         reset( executor );
 
-        executor.executeGoals( null, " clean verify ", true, null, null );
+        executor.executeGoals( null, " clean verify ", new DefaultReleaseEnvironment(), true, null, null, null );
         verify( executor ).executeGoals( isNull( File.class ),
                                          eq( Arrays.asList( "clean", "verify" ) ),
                                          isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
                                          isNull( String.class ), isNull( ReleaseResult.class ) );
         reset( executor );
 
-        executor.executeGoals( null, ",clean,verify,", true, null, null );
+        executor.executeGoals( null, ",clean,verify,", new DefaultReleaseEnvironment(), true, null, null, null );
         verify( executor ).executeGoals( isNull( File.class ),
                                          eq( Arrays.asList( "clean", "verify" ) ),
                                          isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
                                          isNull( String.class ), isNull( ReleaseResult.class ) );
         reset( executor );
 
-        executor.executeGoals( null, "\nclean\nverify\n", true, null, null );
+        executor.executeGoals( null, "\nclean\nverify\n", new DefaultReleaseEnvironment(), true, null, null, null );
         verify( executor ).executeGoals( isNull( File.class ),
                                          eq( Arrays.asList( "clean", "verify" ) ),
                                          isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
                                          isNull( String.class ), isNull( ReleaseResult.class ) );
         reset( executor );
 
-        executor.executeGoals( null, "\rclean\rverify\r", true, null, null );
+        executor.executeGoals( null, "\rclean\rverify\r", new DefaultReleaseEnvironment(), true, null, null, null );
         verify( executor ).executeGoals( isNull( File.class ),
                                          eq( Arrays.asList( "clean", "verify" ) ),
                                          isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
                                          isNull( String.class ), isNull( ReleaseResult.class ) );
         reset( executor );
 
-        executor.executeGoals( null, "\r\nclean\r\nverify\r\n", true, null, null );
+        executor.executeGoals( null, "\r\nclean\r\nverify\r\n", new DefaultReleaseEnvironment(), true, null, null, null );
         verify( executor ).executeGoals( isNull( File.class ),
                                          eq( Arrays.asList( "clean", "verify" ) ),
                                          isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
                                          isNull( String.class ), isNull( ReleaseResult.class ) );
         reset( executor );
 
-        executor.executeGoals( null, "\tclean\tverify\t", true, null, null );
+        executor.executeGoals( null, "\tclean\tverify\t", new DefaultReleaseEnvironment(), true, null, null, null );
         verify( executor ).executeGoals( isNull( File.class ),
                                          eq( Arrays.asList( "clean", "verify" ) ),
                                          isA( ReleaseEnvironment.class ), eq( true ), isNull( String.class ),
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
index ddf4878..7ef8d6e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/ForkedMavenExecutorTest.java
@@ -95,7 +95,8 @@ public class ForkedMavenExecutorTest
         executor.setCommandLineFactory( commandLineFactoryMock );
 
         // execute
-        executor.executeGoals( workingDirectory, "clean integration-test", false, null, new ReleaseResult() );
+        executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null,
+                               null, new ReleaseResult() );
 
         // verify
         verify( mockProcess ).getInputStream();
@@ -137,7 +138,7 @@ public class ForkedMavenExecutorTest
         executor.setCommandLineFactory( commandLineFactoryMock );
 
         // execute
-        executor.executeGoals( workingDirectory, "clean integration-test", false, null, "my-pom.xml",
+        executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null, "my-pom.xml",
                                new ReleaseResult() );
         // verify
         verify( mockProcess ).getInputStream();
@@ -182,7 +183,7 @@ public class ForkedMavenExecutorTest
 
         // execute
         String arguments = "-DperformRelease=true -Dmaven.test.skip=true";
-        executor.executeGoals( workingDirectory, "clean integration-test", false, arguments, new ReleaseResult() );
+        executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, arguments, null, new ReleaseResult() );
 
         // verify
         verify( mockProcess ).getInputStream();
@@ -229,7 +230,7 @@ public class ForkedMavenExecutorTest
         // execute
         try
         {
-            executor.executeGoals( workingDirectory, "clean integration-test", false, null, new ReleaseResult() );
+            executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null, null, new ReleaseResult() );
 
             fail( "Should have thrown an exception" );
         }
@@ -277,7 +278,7 @@ public class ForkedMavenExecutorTest
         // execute
         try
         {
-            executor.executeGoals( workingDirectory, "clean integration-test", false, null, new ReleaseResult() );
+            executor.executeGoals( workingDirectory, "clean integration-test", new DefaultReleaseEnvironment(), false, null, null, new ReleaseResult() );
 
             fail( "Should have thrown an exception" );
         }
@@ -341,7 +342,7 @@ public class ForkedMavenExecutorTest
 
         when( executorSpy.getSettingsWriter() ).thenReturn( settingsWriter );
 
-        executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, new ReleaseResult() );
+        executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, null, new ReleaseResult() );
 
         verify( settingsWriter ).write( isA( Writer.class ), encryptedSettings.capture() );
 
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
index c11f400..3f4789d 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
@@ -171,7 +171,7 @@ public class InvokerMavenExecutorTest
 
         try
         {
-            executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, new ReleaseResult() );
+            executorSpy.executeGoals( workingDirectory, "validate", releaseEnvironment, false, null, null, new ReleaseResult() );
         }
         catch ( MavenExecutorException e )
         {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
index 8300e3a..ce8e00e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/AbstractBackupPomsPhaseTest.java
@@ -27,7 +27,6 @@ import org.codehaus.plexus.util.ReaderFactory;
 
 import java.io.File;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 /**
@@ -65,10 +64,8 @@ public abstract class AbstractBackupPomsPhaseTest
 
         reactorProjects.add( mainProject );
 
-        for ( Iterator modules = mainProject.getModel().getModules().iterator(); modules.hasNext(); )
+        for ( String module : mainProject.getModel().getModules() )
         {
-            String module = modules.next().toString();
-
             File modulePom = new File( projectPath + "/" + module, pomFilename );
 
             MavenProject subproject = createMavenProject( modulePom );
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
index 4423dd0..69b3f8e 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/ReleasePhaseStub.java
@@ -20,7 +20,6 @@ package org.apache.maven.shared.release.phase;
  */
 
 import org.apache.maven.project.MavenProject;
-import org.apache.maven.settings.Settings;
 import org.apache.maven.shared.release.ReleaseResult;
 import org.apache.maven.shared.release.config.ReleaseDescriptor;
 import org.apache.maven.shared.release.env.ReleaseEnvironment;
@@ -51,30 +50,6 @@ public class ReleasePhaseStub
     private boolean cleaned;
 
     @Override
-    public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
-    {
-        ReleaseResult result = new ReleaseResult();
-
-        executed = true;
-
-        result.setResultCode( ReleaseResult.SUCCESS );
-
-        return result;
-    }
-
-    @Override
-    public ReleaseResult simulate( ReleaseDescriptor releaseDescriptor, Settings settings, List<MavenProject> reactorProjects )
-    {
-        ReleaseResult result = new ReleaseResult();
-
-        simulated = true;
-
-        result.setResultCode( ReleaseResult.SUCCESS );
-
-        return result;
-    }
-
-    @Override
     public ReleaseResult execute( ReleaseDescriptor releaseDescriptor, ReleaseEnvironment releaseEnvironment, List<MavenProject> reactorProjects )
     {
         ReleaseResult result = new ReleaseResult();
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
index 209ae95..af71c61 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/stubs/MavenExecutorWrapper.java
@@ -44,28 +44,4 @@ public class MavenExecutorWrapper implements MavenExecutor
         executor.executeGoals( workingDirectory, goals, releaseEnvironment, interactive, additionalArguments,
                                pomFileName, result );
     }
-
-    @Override
-    public void executeGoals( File workingDirectory, String goals, ReleaseEnvironment releaseEnvironment,
-                              boolean interactive, String additionalArguments, ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executor.executeGoals( workingDirectory, goals, releaseEnvironment, interactive, additionalArguments, result );
-    }
-
-    @Override
-    public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
-                              String pomFileName, ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executor.executeGoals( workingDirectory, goals, interactive, additionalArguments, pomFileName, result );
-    }
-
-    @Override
-    public void executeGoals( File workingDirectory, String goals, boolean interactive, String additionalArguments,
-                              ReleaseResult result )
-        throws MavenExecutorException
-    {
-        executor.executeGoals( workingDirectory, goals, interactive, additionalArguments, result );
-    }
 }

-- 
To stop receiving notification emails like this one, please contact
"commits@maven.apache.org" <co...@maven.apache.org>.