From f3a3ef2632683dd1627ca42a4ded87337e937823 Mon Sep 17 00:00:00 2001 From: Karl Heinz Marbaise Date: Fri, 16 Oct 2015 20:26:28 +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 | 11 +++-------- 1 file changed, 3 insertions(+), 8 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 6903f17210..243a7f24c4 100644 --- a/maven-core/src/main/java/org/apache/maven/ReactorReader.java +++ b/maven-core/src/main/java/org/apache/maven/ReactorReader.java @@ -54,8 +54,7 @@ class ReactorReader { public static final String HINT = "reactor"; - private static final Collection COMPILE_PHASE_TYPES = - Arrays.asList( "war", "rar", "jar", "ejb-client", "wsdl" ); + private static final Collection COMPILE_PHASE_TYPES = Arrays.asList( "war", "rar", "jar", "ejb-client" ); private Map projectsByGAV; @@ -176,8 +175,7 @@ class ReactorReader } else { - String type = artifact.getProperty( "type", "" ); - if ( project.hasLifecyclePhase( "compile" ) && COMPILE_PHASE_TYPES.contains( type ) ) + if ( project.hasLifecyclePhase( "compile" ) ) { return new File( project.getBuild().getOutputDirectory() ); } @@ -221,10 +219,7 @@ class ReactorReader { if ( attachedArtifactComparison( requestedArtifact, attachedArtifact ) ) { - if ( requestedRepositoryConflictId.equals( ArtifactIdUtils.toVersionlessId( attachedArtifact ) ) ) - { - return attachedArtifact; - } + return attachedArtifact; } }