svn commit: r773213 - in /maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project: DefaultMavenProjectBuilder.java artifact/MavenMetadataSource.java

[bentmann]

Author: bentmann
Date: Sat May  9 12:17:06 2009
New Revision: 773213

URL: http://svn.apache.org/viewvc?rev=773213&view=rev
Log:
o Fixed resolution of project dependencies

Modified:
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
    
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java?rev=773213&r1=773212&r2=773213&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/DefaultMavenProjectBuilder.java
 Sat May  9 12:17:06 2009
@@ -306,7 +306,7 @@
         Artifact pomArtifact = repositorySystem.createProjectArtifact( 
project.getGroupId(), project.getArtifactId(), project.getVersion() );
         pomArtifact.setFile( pomFile );
 
-        ArtifactResolutionRequest request = new 
ArtifactResolutionRequest().setArtifact( pomArtifact ).setArtifactDependencies( 
project.getDependencyArtifacts() )
+        ArtifactResolutionRequest request = new 
ArtifactResolutionRequest().setArtifact( pomArtifact ).setResolveTransitively( 
true ).setArtifactDependencies( project.getDependencyArtifacts() )
             .setLocalRepository( configuration.getLocalRepository() 
).setRemoteRepostories( project.getRemoteArtifactRepositories() 
).setManagedVersionMap( project.getManagedVersionMap() );
 
         ArtifactResolutionResult result = repositorySystem.resolve( request );

Modified: 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
URL: 
http://svn.apache.org/viewvc/maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java?rev=773213&r1=773212&r2=773213&view=diff
==============================================================================
--- 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 (original)
+++ 
maven/components/branches/MNG-2766/maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
 Sat May  9 12:17:06 2009
@@ -65,6 +65,11 @@
     {
         Artifact pomArtifact = repositorySystem.createProjectArtifact( 
artifact.getGroupId(), artifact.getArtifactId(), artifact.getVersion() );
 
+        if ( "pom".equals( artifact.getType() ) )
+        {
+            pomArtifact.setFile( artifact.getFile() );
+        }
+
         Set<Artifact> artifacts = Collections.emptySet();
 
         ProjectBuilderConfiguration configuration = new 
DefaultProjectBuilderConfiguration();
@@ -79,7 +84,15 @@
 
             if ( !artifact.getArtifactHandler().isIncludesDependencies() )
             {                
-                ArtifactFilter filter = new ScopeArtifactFilter( 
artifact.getScope() ); 
+                ArtifactFilter filter;
+                if ( artifact.getScope() == null )
+                {
+                    filter = null;
+                }
+                else
+                {
+                    filter = new ScopeArtifactFilter( artifact.getScope() );
+                }
                                 
                 artifacts = project.createArtifacts( filter );