Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven

This commit is contained in:
Jason van Zyl 2014-02-03 17:37:52 -05:00
parent 90ab970006 d55dca85a1
commit 3bf568eda6
5 changed files with 100 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
maven-core/src/test/java/org/apache/maven/MavenLifecycleParticipantTest.java
View File

@ -15,11 +15,11 @@
* the License.
*/
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenExecutionRequest;
@ -71,6 +71,32 @@ public void afterSessionStart( MavenSession session )
}
public static class InjectReactorDependency
extends AbstractMavenLifecycleParticipant
{
@Override
public void afterProjectsRead( MavenSession session )
{
injectReactorDependency( session.getProjects(), "module-a", "module-b" );
}
private void injectReactorDependency( List<MavenProject> projects, String moduleFrom, String moduleTo )
{
for ( MavenProject project : projects )
{
if ( moduleFrom.equals( project.getArtifactId() ) )
{
Dependency dependency = new Dependency();
dependency.setArtifactId( moduleTo );
dependency.setGroupId( project.getGroupId() );
dependency.setVersion( project.getVersion() );
project.getModel().addDependency( dependency );
}
}
}
}
@Override
protected void setupContainer()
{
@ -111,4 +137,37 @@ public void testDependencyInjection()
assertEquals( 1, artifacts.size() );
assertEquals( INJECTED_ARTIFACT_ID, artifacts.get( 0 ).getArtifactId() );
}
public void testReactorDependencyInjection()
throws Exception
{
List<String> reactorOrder =
getReactorOrder( "lifecycle-participant-reactor-dependency-injection", InjectReactorDependency.class );
assertEquals( Arrays.asList( "parent", "module-b", "module-a" ), reactorOrder );
}
private <T> List<String> getReactorOrder( String testProject, Class<T> participant )
throws Exception
{
PlexusContainer container = getContainer();
ComponentDescriptor<T> cd = new ComponentDescriptor<T>( participant, container.getContainerRealm() );
cd.setRoleClass( AbstractMavenLifecycleParticipant.class );
container.addComponentDescriptor( cd );
Maven maven = container.lookup( Maven.class );
File pom = getProject( testProject );
MavenExecutionRequest request = createMavenExecutionRequest( pom );
request.setGoals( Arrays.asList( "validate" ) );
MavenExecutionResult result = maven.execute( request );
assertFalse( result.getExceptions().toString(), result.hasExceptions() );
List<String> order = new ArrayList<String>();
for ( MavenProject project : result.getTopologicallySortedProjects() )
{
order.add( project.getArtifactId() );
}
return order;
}
}

12
maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-a/pom.xml Normal file
View File

@ -0,0 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>lifecycle-participant-reactor-dependency-injection</groupId>
<artifactId>parent</artifactId>
<version>1.0</version>
</parent>
<artifactId>module-a</artifactId>
</project>

12
maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/module-b/pom.xml Normal file
View File

@ -0,0 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>lifecycle-participant-reactor-dependency-injection</groupId>
<artifactId>parent</artifactId>
<version>1.0</version>
</parent>
<artifactId>module-b</artifactId>
</project>

13
maven-core/src/test/projects/lifecycle-listener/lifecycle-participant-reactor-dependency-injection/pom.xml Normal file
View File

@ -0,0 +1,13 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>lifecycle-participant-reactor-dependency-injection</groupId>
<artifactId>parent</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<modules>
<module>module-a</module>
<module>module-b</module>
</modules>
</project>

4
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -504,7 +504,7 @@ private void encryption( CliRequest cliRequest )
Console cons;
char[] password;
if ( ( cons = System.console() ) != null
&& ( password = cons.readPassword( "Master password:") ) != null )
&& ( password = cons.readPassword( "Master password: " ) ) != null )
{
// Cipher uses Strings
passwd = String.copyValueOf( password );
@ -529,7 +529,7 @@ else if ( cliRequest.commandLine.hasOption( CLIManager.ENCRYPT_PASSWORD ) )
Console cons;
char[] password;
if ( ( cons = System.console() ) != null
&& ( password = cons.readPassword( "Password:" ) ) != null )
&& ( password = cons.readPassword( "Password: " ) ) != null )
{
// Cipher uses Strings
passwd = String.copyValueOf( password );