You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by kh...@apache.org on 2015/10/18 16:14:52 UTC
maven git commit: Revert "[MNG-5898] Multi-module build with ear
fails to resolve war in 3.3.3"
Repository: maven
Updated Branches:
refs/heads/master f3a3ef263 -> 20854ce7b
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
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/20854ce7
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/20854ce7
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/20854ce7
Branch: refs/heads/master
Commit: 20854ce7be9837639f1e5f92f33bfb28370d1690
Parents: f3a3ef2
Author: Karl Heinz Marbaise <kh...@apache.org>
Authored: Sun Oct 18 16:14:13 2015 +0200
Committer: Karl Heinz Marbaise <kh...@apache.org>
Committed: Sun Oct 18 16:14:13 2015 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/maven/ReactorReader.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/20854ce7/maven-core/src/main/java/org/apache/maven/ReactorReader.java
----------------------------------------------------------------------
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 243a7f2..7fd89e4 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.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() );
}