[MRELEASE-1085] Upgrade Maven Invoker to 3.2.0

apache · Apr 27, 2022 · 85d973c · 85d973c
1 parent a6551e5
commit 85d973c
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
@@ -88,7 +88,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-invoker</artifactId>
-      <version>2.2</version>
+      <version>3.2.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/...ease-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java b/...ease-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<String> 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/...-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java b/...-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