You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2016/07/10 11:54:28 UTC
svn commit: r1752081 - in /maven/plugins/trunk/maven-invoker-plugin: ./
src/main/java/org/apache/maven/plugin/invoker/
src/test/java/org/apache/maven/plugin/invoker/
Author: khmarbaise
Date: Sun Jul 10 11:54:28 2016
New Revision: 1752081
URL: http://svn.apache.org/viewvc?rev=1752081&view=rev
Log:
[MINVOKER-164] Maven Invoker still using -r option when such is no longer supported
o Drop Maven 2 support using maven-invoker component 3.0.0
Modified:
maven/plugins/trunk/maven-invoker-plugin/pom.xml
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java
Modified: maven/plugins/trunk/maven-invoker-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/pom.xml?rev=1752081&r1=1752080&r2=1752081&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-invoker-plugin/pom.xml Sun Jul 10 11:54:28 2016
@@ -78,7 +78,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-invoker</artifactId>
- <version>2.2</version>
+ <version>3.0.0-SNAPSHOT</version>
</dependency>
<dependency> <!-- temporary -->
<groupId>org.apache.maven</groupId>
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java?rev=1752081&r1=1752080&r2=1752081&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/AbstractInvokerMojo.java Sun Jul 10 11:54:28 2016
@@ -858,7 +858,7 @@ public abstract class AbstractInvokerMoj
*/
private void collectProjects( File projectsDir, String projectPath, Collection<String> projectPaths,
boolean included )
- throws MojoExecutionException
+ throws MojoExecutionException
{
projectPath = projectPath.replace( '\\', '/' );
File pomFile = new File( projectsDir, projectPath );
@@ -1177,7 +1177,7 @@ public abstract class AbstractInvokerMoj
{
SettingsBuildingRequest request = new DefaultSettingsBuildingRequest();
request.setGlobalSettingsFile( interpolatedSettingsFile );
-
+
Settings dominantSettings = settingsBuilder.build( request ).getEffectiveSettings();
Settings recessiveSettings = cloneSettings();
SettingsUtils.merge( dominantSettings, recessiveSettings, TrackableBase.USER_LEVEL );
@@ -1390,7 +1390,7 @@ public abstract class AbstractInvokerMoj
*/
private void runBuild( File projectsDir, BuildJob buildJob, File settingsFile, File actualJavaHome,
CharSequence actualJreVersion )
- throws MojoExecutionException
+ throws MojoExecutionException
{
File pomFile = new File( projectsDir, buildJob.getProject() );
File basedir;
@@ -1638,7 +1638,7 @@ public abstract class AbstractInvokerMoj
*/
private boolean runBuild( File basedir, File pomFile, File settingsFile, File actualJavaHome,
InvokerProperties invokerProperties )
- throws MojoExecutionException, RunFailureException
+ throws MojoExecutionException, RunFailureException
{
if ( getLog().isDebugEnabled() && !invokerProperties.getProperties().isEmpty() )
{
@@ -1681,7 +1681,7 @@ public abstract class AbstractInvokerMoj
request.setLocalRepositoryDirectory( localRepositoryPath );
- request.setInteractive( false );
+ request.setBatchMode( true );
request.setShowErrors( showErrors );
@@ -1909,7 +1909,7 @@ public abstract class AbstractInvokerMoj
*/
private void verify( InvocationResult result, int invocationIndex, InvokerProperties invokerProperties,
FileLogger logger )
- throws RunFailureException
+ throws RunFailureException
{
if ( result.getExecutionException() != null )
{
@@ -2359,7 +2359,7 @@ public abstract class AbstractInvokerMoj
{
// interpolation with token @...@
Map<String, Object> composite = getInterpolationValueSource();
- reader =
+ reader =
new InterpolationFilterReader( ReaderFactory.newXmlReader( originalFile ), composite, "@", "@" );
xml = IOUtil.toString( reader );
Modified: maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java?rev=1752081&r1=1752080&r2=1752081&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/main/java/org/apache/maven/plugin/invoker/InvokerProperties.java Sun Jul 10 11:54:28 2016
@@ -25,6 +25,7 @@ import java.util.Arrays;
import java.util.Properties;
import org.apache.maven.shared.invoker.InvocationRequest;
+import org.apache.maven.shared.invoker.InvocationRequest.ReactorFailureBehavior;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -192,7 +193,8 @@ class InvokerProperties
if ( profiles != null )
{
// CHECKSTYLE_OFF: LineLength
- request.setProfiles( new ArrayList<String>( Arrays.asList( StringUtils.split( profiles, ", \t\n\r\f" ) ) ) );
+ request.setProfiles( new ArrayList<String>( Arrays.asList( StringUtils.split( profiles,
+ ", \t\n\r\f" ) ) ) );
// CHECKSTYLE_ON: LineLength
}
@@ -205,7 +207,9 @@ class InvokerProperties
String failureBehavior = get( InvocationProperty.FAILURE_BEHAVIOR, index );
if ( failureBehavior != null )
{
- request.setFailureBehavior( failureBehavior );
+ ReactorFailureBehavior valueOf =
+ InvocationRequest.ReactorFailureBehavior.valueOfByLongOption( failureBehavior );
+ request.setReactorFailureBehavior( valueOf );
}
String nonRecursive = get( InvocationProperty.NON_RECURSIVE, index );
Modified: maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java?rev=1752081&r1=1752080&r2=1752081&view=diff
==============================================================================
--- maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java (original)
+++ maven/plugins/trunk/maven-invoker-plugin/src/test/java/org/apache/maven/plugin/invoker/InvokerPropertiesTest.java Sun Jul 10 11:54:28 2016
@@ -196,13 +196,13 @@ public class InvokerPropertiesTest
InvocationRequest request = new DefaultInvocationRequest();
- request.setFailureBehavior( "fail-at-end" );
+ request.setReactorFailureBehavior( InvocationRequest.ReactorFailureBehavior.FailAtEnd );
facade.configureInvocation( request, 0 );
- assertEquals( "fail-at-end", request.getFailureBehavior() );
+ assertEquals( InvocationRequest.ReactorFailureBehavior.FailAtEnd, request.getReactorFailureBehavior() );
- props.setProperty( "invoker.failureBehavior", "fail-never" );
+ props.setProperty( "invoker.failureBehavior", InvocationRequest.ReactorFailureBehavior.FailNever.getLongOption() );
facade.configureInvocation( request, 0 );
- assertEquals( "fail-never", request.getFailureBehavior() );
+ assertEquals( "fail-never", request.getReactorFailureBehavior().getLongOption() );
}
public void testConfigureRequestRecursion()