From b9cc9c3652d43f0efce36d57c0ec1de35d4e7c56 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Fri, 16 Oct 2015 17:25:00 +0200 Subject: [PATCH] [MNG-5898] Multi-module build with ear fails to resolve war in 3.3.3 Followup to fix core IT's. --- .../src/main/java/org/apache/maven/ReactorReader.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/ReactorReader.java b/maven-core/src/main/java/org/apache/maven/ReactorReader.java index 11e78a5c47..6903f17210 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -42,8 +42,8 @@ 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,8 @@ class ReactorReader { public static final String HINT = "reactor"; - private static final Collection COMPILE_PHASE_TYPES = Arrays.asList( "jar", "ejb-client" ); + private static final Collection COMPILE_PHASE_TYPES = + Arrays.asList( "war", "rar", "jar", "ejb-client", "wsdl" ); private Map projectsByGAV; @@ -175,7 +176,8 @@ else if ( !hasBeenPackaged( project ) ) } 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() ); }