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 2010/08/26 22:09:35 UTC
svn commit: r989911 - in /maven/maven-3/trunk/maven-core: pom.xml
src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
Author: bentmann
Date: Thu Aug 26 20:09:34 2010
New Revision: 989911
URL: http://svn.apache.org/viewvc?rev=989911&view=rev
Log:
o Tidied up dependencies
Modified:
maven/maven-3/trunk/maven-core/pom.xml
maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
Modified: maven/maven-3/trunk/maven-core/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/pom.xml?rev=989911&r1=989910&r2=989911&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/pom.xml Thu Aug 26 20:09:34 2010
@@ -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>
Modified: maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java?rev=989911&r1=989910&r2=989911&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java (original)
+++ maven/maven-3/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java Thu Aug 26 20:09:34 2010
@@ -39,7 +39,7 @@ import org.codehaus.plexus.component.ann
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 DefaultPluginVersionResolve
private Logger logger;
@Requirement
- private MetadataResolver metadataResolver;
+ private RepositorySystem repositorySystem;
@Requirement
private MetadataReader metadataReader;
@@ -114,7 +114,7 @@ public class DefaultPluginVersionResolve
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();