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

[be...@apache.org]

Author: bentmann
Date: Sun May 24 20:41:14 2009
New Revision: 778223

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

Modified:
    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/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=778223&r1=778222&r2=778223&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 Sun May 24 20:41:14 2009
@@ -15,6 +15,7 @@
  * the License.
  */
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
@@ -46,8 +47,6 @@
 import org.codehaus.plexus.component.annotations.Requirement;
 import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
 import org.codehaus.plexus.logging.Logger;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.Initializable;
-import org.codehaus.plexus.personality.plexus.lifecycle.phase.InitializationException;
 
 /**
  * @author Jason van Zyl
@@ -90,6 +89,8 @@
         configuration.setRemoteRepositories( remoteRepositories );
         // We don't care about processing plugins here, all we're interested in is the dependencies.
         configuration.setProcessPlugins( false );
+        // FIXME: We actually need the execution properties here...
+        configuration.setExecutionProperties( System.getProperties() );
 
         MavenProject project;
 
@@ -119,6 +120,11 @@
                             dependencyArtifact = repositorySystem.createArtifact( d.getGroupId(), d.getArtifactId(), d.getVersion(), effectiveScope, d.getType() );
                         }
 
+                        if ( Artifact.SCOPE_SYSTEM.equals( effectiveScope ) )
+                        {
+                            dependencyArtifact.setFile( new File( d.getSystemPath() ) );
+                        }
+
                         artifacts.add( dependencyArtifact );
                     }
                 }