You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2009/09/15 15:46:52 UTC
svn commit: r815327 - in /maven/maven-3/trunk:
maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/repository/legacy/
maven-core/src/main/java/org/apache/maven/
maven-core/src/main/java/org/apache/maven/pro...
Author: bentmann
Date: Tue Sep 15 13:46:52 2009
New Revision: 815327
URL: http://svn.apache.org/viewvc?rev=815327&view=rev
Log:
[MNG-4359] [regression] Locally reachable parent POMs outside of reactor are not found during dependency resolution
Modified:
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java?rev=815327&r1=815326&r2=815327&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/artifact/Artifact.java Tue Sep 15 13:46:52 2009
@@ -35,6 +35,9 @@
public interface Artifact
extends Comparable<Artifact>
{
+
+ String RELEASE_VERSION = "RELEASE";
+
String LATEST_VERSION = "LATEST";
String SNAPSHOT_VERSION = "SNAPSHOT";
@@ -59,8 +62,6 @@
String SCOPE_IMPORT = "import"; // Used to import dependencyManagement dependencies
- String RELEASE_VERSION = "RELEASE";
-
String getGroupId();
String getArtifactId();
Modified: maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java?rev=815327&r1=815326&r2=815327&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java (original)
+++ maven/maven-3/trunk/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java Tue Sep 15 13:46:52 2009
@@ -179,6 +179,7 @@
if ( artifact.isResolved() )
{
+ artifact.setRepository( repository );
break;
}
}
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java?rev=815327&r1=815326&r2=815327&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/ReactorArtifactRepository.java Tue Sep 15 13:46:52 2009
@@ -46,9 +46,7 @@
{
if ( "pom".equals( artifact.getType() ) )
{
- artifact.setFile( project.getFile() );
-
- artifact.setResolved( true );
+ resolve( artifact, project.getFile() );
}
else
{
@@ -62,9 +60,7 @@
// 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( projectArtifact.getFile() );
-
- artifact.setResolved( true );
+ resolve( artifact, projectArtifact.getFile() );
}
else if ( isProjectOutputValid( project ) )
{
@@ -81,9 +77,7 @@
if ( classesDir.isDirectory() )
{
- artifact.setFile( classesDir );
-
- artifact.setResolved( true );
+ resolve( artifact, classesDir );
}
}
}
@@ -92,6 +86,15 @@
return artifact;
}
+ private void resolve( Artifact artifact, File file )
+ {
+ artifact.setFile( file );
+
+ artifact.setResolved( true );
+
+ artifact.setRepository( this );
+ }
+
@Override
public String getId()
{
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java?rev=815327&r1=815326&r2=815327&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/project/DefaultProjectBuilder.java Tue Sep 15 13:46:52 2009
@@ -209,7 +209,9 @@
"Error resolving project artifact: " + e.getMessage(), e );
}
- return build( artifact.getFile(), false, configuration );
+ boolean localProject = artifact.getRepository() != null && "reactor".equals( artifact.getRepository().getId() );
+
+ return build( artifact.getFile(), localProject, configuration );
}
/**