diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml index 19449fc2a..81501fb17 100644 --- a/maven-release-manager/pom.xml +++ b/maven-release-manager/pom.xml @@ -88,7 +88,7 @@ org.apache.maven.shared maven-invoker - 2.2 + 3.2.0 org.apache.commons diff --git a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java index 974a8e45d..2a6e061bc 100644 --- a/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java +++ b/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java @@ -214,8 +214,7 @@ protected void setupRequest( InvocationRequest req, if ( cli.hasOption( QUIET ) ) { - // TODO: setQuiet() currently not supported by InvocationRequest - req.setDebug( false ); + req.setQuiet( true ); } else if ( cli.hasOption( DEBUG ) ) { @@ -252,11 +251,11 @@ else if ( cli.hasOption( NON_RECURSIVE ) ) if ( cli.hasOption( CHECKSUM_FAILURE_POLICY ) ) { - req.setGlobalChecksumPolicy( InvocationRequest.CHECKSUM_POLICY_FAIL ); + req.setGlobalChecksumPolicy( InvocationRequest.CheckSumPolicy.Fail ); } else if ( cli.hasOption( CHECKSUM_WARNING_POLICY ) ) { - req.setGlobalChecksumPolicy( InvocationRequest.CHECKSUM_POLICY_WARN ); + req.setGlobalChecksumPolicy( InvocationRequest.CheckSumPolicy.Warn ); } if ( cli.hasOption( ALTERNATE_USER_SETTINGS ) ) @@ -271,15 +270,15 @@ else if ( cli.hasOption( CHECKSUM_WARNING_POLICY ) ) if ( cli.hasOption( FAIL_AT_END ) ) { - req.setFailureBehavior( InvocationRequest.REACTOR_FAIL_AT_END ); + req.setReactorFailureBehavior( InvocationRequest.ReactorFailureBehavior.FailAtEnd ); } else if ( cli.hasOption( FAIL_FAST ) ) { - req.setFailureBehavior( InvocationRequest.REACTOR_FAIL_FAST ); + req.setReactorFailureBehavior( InvocationRequest.ReactorFailureBehavior.FailFast ); } if ( cli.hasOption( FAIL_NEVER ) ) { - req.setFailureBehavior( InvocationRequest.REACTOR_FAIL_NEVER ); + req.setReactorFailureBehavior( InvocationRequest.ReactorFailureBehavior.FailNever ); } if ( cli.hasOption( ALTERNATE_POM_FILE ) ) { @@ -300,7 +299,7 @@ else if ( cli.hasOption( FAIL_FAST ) ) if ( cli.hasOption( BATCH_MODE ) ) { - req.setInteractive( false ); + req.setBatchMode( true ); } if ( cli.hasOption( ALTERNATE_USER_TOOLCHAINS ) ) @@ -343,13 +342,17 @@ public void executeGoals( File workingDirectory, List goals, ReleaseEnvi } mavenPath = mavenHome == null ? null : new File( mavenHome ); } - Invoker invoker = - new DefaultInvoker().setMavenHome( mavenPath ).setLogger( bridge ) - .setOutputHandler( handler ).setErrorHandler( handler ); - InvocationRequest req = - new DefaultInvocationRequest().setDebug( getLogger().isDebugEnabled() ) - .setBaseDirectory( workingDirectory ).setInteractive( interactive ); + Invoker invoker = new DefaultInvoker() + .setMavenHome( mavenPath ) + .setLogger( bridge ); + + InvocationRequest req = new DefaultInvocationRequest() + .setDebug( getLogger().isDebugEnabled() ) + .setBaseDirectory( workingDirectory ) + .setBatchMode( !interactive ) + .setOutputHandler( handler ) + .setErrorHandler( handler ); if ( pomFileName != null ) { 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 57327e205..cdb2cedae 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 @@ -89,17 +89,15 @@ public void testBatch() executor.enableLogging( logger ); InvocationRequest req = new DefaultInvocationRequest(); - // bug: assertEquals( true, req.isInteractive() ); - req = new DefaultInvocationRequest(); - req.setInteractive( true ); + req.setBatchMode( false ); executor.setupRequest( req, null, "-B" ); - assertEquals( false, req.isInteractive() ); + assertTrue( req.isBatchMode() ); req = new DefaultInvocationRequest(); - req.setInteractive( true ); + req.setBatchMode( false ); executor.setupRequest( req, null, "\"-B\"" ); - assertEquals( false, req.isInteractive() ); + assertTrue( req.isBatchMode() ); } @Test