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

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

This reverts commits f3a3ef2 b9cc9c3 72e2478 all related to MNG-5898
This commit is contained in:
Karl Heinz Marbaise 2015-10-18 16:14:13 +02:00
parent f3a3ef2632
commit 20854ce7be
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;
/**
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either as packaged
* jar if it has been built, or only compile output directory if packaging hasn't happened yet.
* An implementation of a workspace reader that knows how to search the Maven reactor for artifacts, either
* as packaged jar if it has been built, or only compile output directory if packaging hasn't happened yet.
*
* @author Jason van Zyl
*/
@ -54,7 +54,7 @@ class ReactorReader
{
public static final String HINT = "reactor";
private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "war", "rar", "jar", "ejb-client" );
private static final Collection<String> COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" );
private Map<String, MavenProject> projectsByGAV;
@ -165,6 +165,7 @@ class ReactorReader
else if ( !hasBeenPackaged( project ) )
{
// fallback to loose class files only if artifacts haven't been packaged yet
// and only for plain old jars. Not war files, not ear files, not anything else.
if ( isTestArtifact( artifact ) )
{
@ -175,7 +176,8 @@ class ReactorReader
}
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() );
}