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 17:25:00 +02:00
parent 72e2478ec5
commit b9cc9c3652
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,8 +42,8 @@ import org.eclipse.aether.repository.WorkspaceRepository;
import org.eclipse.aether.util.artifact.ArtifactIdUtils; import org.eclipse.aether.util.artifact.ArtifactIdUtils;
/** /**
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either * An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either as packaged
* as packaged jar if it has been built, or only compile output directory if packaging hasn't happened yet. * jar if it has been built, or only compile output directory if packaging hasn't happened yet.
* *
* @author Jason van Zyl * @author Jason van Zyl
*/ */
@ -54,7 +54,8 @@ class ReactorReader
{ {
public static final String HINT = "reactor"; public static final String HINT = "reactor";
private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); private static final Collection<String> COMPILE_PHASE_TYPES =
Arrays.asList( "war", "rar", "jar", "ejb-client", "wsdl" );
private Map<String, MavenProject> projectsByGAV; private Map<String, MavenProject> projectsByGAV;
@ -175,7 +176,8 @@ class ReactorReader
} }
else else
{ {
if ( project.hasLifecyclePhase( "compile" ) ) String type = artifact.getProperty( "type", "" );
if ( project.hasLifecyclePhase( "compile" ) && COMPILE_PHASE_TYPES.contains( type ) )
{ {
return new File( project.getBuild().getOutputDirectory() ); return new File( project.getBuild().getOutputDirectory() );
} }