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

o look for the pom first 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@780101 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jason van Zyl 2009-05-29 20:35:37 +00:00
parent 73adb2f34f
commit 0c021975aa
1 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
View File

@ -35,35 +35,7 @@ public class ReactorArtifactRepository
if ( project != null ) if ( project != null )
{ {
File artifactFile = project.getArtifact().getFile(); if ( artifact.getType().equals( "pom" ) )
if ( artifactFile != null && artifactFile.exists() )
{
//TODO: This is really completely wrong and should probably be based on the phase that is currently being executed.
// If we are running before the packaging phase there is going to be no archive anyway, but if we are running prior to package
// we shouldn't even take the archive anyway.
artifact.setFile( artifactFile );
artifact.setFromAuthoritativeRepository( true );
artifact.setResolved( true );
}
/*
TODO: This is being left out because Maven 2.x does not set this internally and it is only done by the compiler
plugin and not done generally. This should be done generally but currently causes problems with MNG-3023
else if ( new File( project.getBuild().getOutputDirectory() ).exists() )
{
artifact.setFile( new File( project.getBuild().getOutputDirectory() ) );
artifact.setFromAuthoritativeRepository( true );
artifact.setResolved( true );
}
*/
else if ( artifact.getType().equals( "pom" ) )
{ {
artifact.setFile( project.getFile() ); artifact.setFile( project.getFile() );
@ -71,6 +43,37 @@ public class ReactorArtifactRepository
artifact.setResolved( true ); artifact.setResolved( true );
} }
else
{
File artifactFile = project.getArtifact().getFile();
if ( artifactFile != null && artifactFile.exists() )
{
//TODO: This is really completely wrong and should probably be based on the phase that is currently being executed.
// If we are running before the packaging phase there is going to be no archive anyway, but if we are running prior to package
// we shouldn't even take the archive anyway.
artifact.setFile( artifactFile );
artifact.setFromAuthoritativeRepository( true );
artifact.setResolved( true );
}
/*
TODO: This is being left out because Maven 2.x does not set this internally and it is only done by the compiler
plugin and not done generally. This should be done generally but currently causes problems with MNG-3023
else if ( new File( project.getBuild().getOutputDirectory() ).exists() )
{
artifact.setFile( new File( project.getBuild().getOutputDirectory() ) );
artifact.setFromAuthoritativeRepository( true );
artifact.setResolved( true );
}
*/
}
} }
return artifact; return artifact;