You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sj...@apache.org on 2022/04/26 21:29:53 UTC
[maven-release] branch MRELEASE-1085 created (now caf1fe32)
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a change to branch MRELEASE-1085
in repository https://gitbox.apache.org/repos/asf/maven-release.git
at caf1fe32 [MRELEASE-1085] Upgrade Maven Invoker to 3.2.0
This branch includes the following new commits:
new caf1fe32 [MRELEASE-1085] Upgrade Maven Invoker to 3.2.0
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-release] 01/01: [MRELEASE-1085] Upgrade Maven Invoker to 3.2.0
Posted by sj...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sjaranowski pushed a commit to branch MRELEASE-1085
in repository https://gitbox.apache.org/repos/asf/maven-release.git
commit caf1fe3285088885640789812932fd6c3ed3c0e4
Author: Slawomir Jaranowski <s....@gmail.com>
AuthorDate: Tue Apr 26 23:28:37 2022 +0200
[MRELEASE-1085] Upgrade Maven Invoker to 3.2.0
---
maven-release-manager/pom.xml | 2 +-
.../shared/release/exec/InvokerMavenExecutor.java | 31 ++++++++++++----------
.../release/exec/InvokerMavenExecutorTest.java | 10 +++----
3 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/maven-release-manager/pom.xml b/maven-release-manager/pom.xml
index 19449fc2..81501fb1 100644
--- 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/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 974a8e45..2a6e061b 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 @@ public class InvokerMavenExecutor
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 @@ public class InvokerMavenExecutor
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 @@ public class InvokerMavenExecutor
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 @@ public class InvokerMavenExecutor
if ( cli.hasOption( BATCH_MODE ) )
{
- req.setInteractive( false );
+ req.setBatchMode( true );
}
if ( cli.hasOption( ALTERNATE_USER_TOOLCHAINS ) )
@@ -343,13 +342,17 @@ public class InvokerMavenExecutor
}
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 57327e20..cdb2ceda 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 class InvokerMavenExecutorTest
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