svn commit: r1403533 - in /maven/release/trunk/maven-release-manager: pom.xml src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java

[rf...@apache.org]

Author: rfscholte
Date: Mon Oct 29 21:10:07 2012
New Revision: 1403533

URL: http://svn.apache.org/viewvc?rev=1403533&view=rev
Log:
[MRELEASE-786] -Darguments doesn't allow -T to be passed to forked builds for multi threading 

Modified:
    maven/release/trunk/maven-release-manager/pom.xml
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
    maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java

Modified: maven/release/trunk/maven-release-manager/pom.xml
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/pom.xml?rev=1403533&r1=1403532&r2=1403533&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/pom.xml (original)
+++ maven/release/trunk/maven-release-manager/pom.xml Mon Oct 29 21:10:07 2012
@@ -106,7 +106,7 @@
     <dependency>
       <groupId>org.apache.maven.shared</groupId>
       <artifactId>maven-invoker</artifactId>
-      <version>2.0.11</version>
+      <version>2.1</version>
     </dependency>
     <dependency>
       <groupId>commons-lang</groupId>

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java?rev=1403533&r1=1403532&r2=1403533&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/exec/InvokerMavenExecutor.java Mon Oct 29 21:10:07 2012
@@ -339,7 +339,7 @@ public class InvokerMavenExecutor
             
             if( cli.hasOption( THREADS ) )
             {
-                getLogger().warn( "Specifying the threadcount is currently not supported ." );
+                req.setThreads( cli.getOptionValue( THREADS ) );
             }
         }
         catch ( Exception e )

Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java?rev=1403533&r1=1403532&r2=1403533&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/exec/InvokerMavenExecutorTest.java Mon Oct 29 21:10:07 2012
@@ -1,9 +1,9 @@
 package org.apache.maven.shared.release.exec;
 
+import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
 
+import org.apache.maven.shared.invoker.DefaultInvocationRequest;
 import org.apache.maven.shared.invoker.InvocationRequest;
 import org.codehaus.plexus.logging.Logger;
 import org.junit.Test;
@@ -16,14 +16,20 @@ public class InvokerMavenExecutorTest
     public void testThreads() throws Exception
     {
         InvokerMavenExecutor executor = new InvokerMavenExecutor();
-        InvocationRequest req = mock( InvocationRequest.class );
         Logger logger = mock( Logger.class );
         executor.enableLogging( logger );
         
+        InvocationRequest req = new DefaultInvocationRequest();
         executor.setupRequest( req, null, "-T 3" );
-        executor.setupRequest( req, null, "-T3" );
-        executor.setupRequest( req, null, "\"-T3\"" );
+        assertEquals( "3", req.getThreads() );
+        
+        req = new DefaultInvocationRequest();
+        executor.setupRequest( req, null, "-T4" );
+        assertEquals( "4", req.getThreads() );
+        
+        req = new DefaultInvocationRequest();
+        executor.setupRequest( req, null, "\"-T5\"" );
+        assertEquals( "5", req.getThreads() );
         
-        verify( logger, times( 3 ) ).warn( "Specifying the threadcount is currently not supported ." );
     }
 }