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

o Fixed resolution of system dependencies 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/branches/MNG-2766@778223 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-05-24 20:41:14 +00:00
parent 1e35b2784e
commit c7461bf048
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
maven-core/src/main/java/org/apache/maven/project/artifact/MavenMetadataSource.java
View File

@ -15,6 +15,7 @@ package org.apache.maven.project.artifact;
* 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.Component;
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 @@ public class MavenMetadataSource
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 @@ public class MavenMetadataSource
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 );
}
}