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

o Tidied up dependencies 

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@989911 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2010-08-26 20:09:34 +00:00
parent f52c2d2dd6
commit 66b0cd1d44
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
maven-core/pom.xml
View File

@ -56,12 +56,23 @@
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-aether-provider</artifactId>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-impl</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-api</artifactId>
<version>${aetherVersion}</version>
</dependency>
<dependency>
<groupId>org.sonatype.aether</groupId>
<artifactId>aether-util</artifactId>
<version>${aetherVersion}</version>
</dependency>
<!-- Plexus -->
<dependency>
<groupId>org.sonatype.spice</groupId>

6
maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
View File

@ -39,7 +39,7 @@ import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.util.StringUtils;
import org.sonatype.aether.impl.MetadataResolver;
import org.sonatype.aether.RepositorySystem;
import org.sonatype.aether.repository.ArtifactRepository;
import org.sonatype.aether.repository.LocalRepository;
import org.sonatype.aether.repository.RemoteRepository;
@ -65,7 +65,7 @@ public class DefaultPluginVersionResolver
private Logger logger;
@Requirement
private MetadataResolver metadataResolver;
private RepositorySystem repositorySystem;
@Requirement
private MetadataReader metadataReader;
@ -114,7 +114,7 @@ public class DefaultPluginVersionResolver
requests.add( new MetadataRequest( metadata, repository, REPOSITORY_CONTEXT ) );
}
List<MetadataResult> results = metadataResolver.resolveMetadata( request.getRepositorySession(), requests );
List<MetadataResult> results = repositorySystem.resolveMetadata( request.getRepositorySession(), requests );
LocalRepository localRepo = request.getRepositorySession().getLocalRepository();