diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index e379dc810d..7156355b01 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -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>
diff --git a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
index fc2ef3ea52..4b1d30868e 100644
--- a/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
+++ b/maven-core/src/main/java/org/apache/maven/plugin/version/internal/DefaultPluginVersionResolver.java
@@ -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();