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

[MNG-5898] Multi-module build with ear fails to resolve war in 3.3.3 

Followup to fix core IT's.
This commit is contained in:
Karl Heinz Marbaise 2015-10-16 20:26:28 +02:00
parent 618e62dd33
commit f3a3ef2632
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maven-core/src/main/java/org/apache/maven/ReactorReader.java
View File

@ -54,8 +54,7 @@ class ReactorReader
{ {
public static final String HINT = "reactor"; public static final String HINT = "reactor";
private static final Collection<String> COMPILE_PHASE_TYPES = private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "war", "rar", "jar", "ejb-client" );
Arrays.asList( "war", "rar", "jar", "ejb-client", "wsdl" );
private Map<String, MavenProject> projectsByGAV; private Map<String, MavenProject> projectsByGAV;
@ -176,8 +175,7 @@ class ReactorReader
} }
else else
{ {
String type = artifact.getProperty( "type", "" ); if ( project.hasLifecyclePhase( "compile" ) )
if ( project.hasLifecyclePhase( "compile" ) && COMPILE_PHASE_TYPES.contains( type ) )
{ {
return new File( project.getBuild().getOutputDirectory() ); return new File( project.getBuild().getOutputDirectory() );
} }
@ -221,10 +219,7 @@ class ReactorReader
{ {
if ( attachedArtifactComparison( requestedArtifact, attachedArtifact ) ) if ( attachedArtifactComparison( requestedArtifact, attachedArtifact ) )
{ {
if ( requestedRepositoryConflictId.equals( ArtifactIdUtils.toVersionlessId( attachedArtifact ) ) ) return attachedArtifact;
{
return attachedArtifact;
}
} }
} }