diff --git a/maven-repository-discovery/pom.xml b/maven-repository-discovery/pom.xml
index 651c4f4e2..8426562e3 100755
--- a/maven-repository-discovery/pom.xml
+++ b/maven-repository-discovery/pom.xml
@@ -21,5 +21,13 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-repository-metadata</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+    </dependency>
   </dependencies>
 </project>
diff --git a/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml b/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml
index ceccd778a..3e8ef2c39 100644
--- a/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml
+++ b/maven-repository-discovery/src/main/resources/META-INF/plexus/components.xml
@@ -1,5 +1,11 @@
 <component-set>
   <components>
+    <component>
+    	<role>org.apache.maven.repository.discovery.MetadataDiscoverer</role>
+    	<role-hint>default</role-hint>
+    	<implementation>org.apache.maven.repository.discovery.DefaultMetadataDiscoverer</implementation>
+    	<instantiation-strategy>per-lookup</instantiation-strategy>
+    </component>    
     <component>
       <role>org.apache.maven.repository.discovery.ArtifactDiscoverer</role>
       <role-hint>legacy</role-hint>
@@ -11,7 +17,6 @@
         </requirement>
       </requirements>
     </component>
-
     <component>
       <role>org.apache.maven.repository.discovery.ArtifactDiscoverer</role>
       <role-hint>default</role-hint>
diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
index 902742124..6d2ef2427 100644
--- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
+++ b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/DefaultArtifactDiscovererTest.java
@@ -276,7 +276,7 @@ public void testJavaSourcesInclusion()
         assertNotNull( "Check artifacts not null", artifacts );
 
         assertTrue( "Check normal included",
-                    artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source" ) ) );
+                    artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source", "sources" ) ) );
     }
 
     public void testDistributionInclusion()
diff --git a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
index 3798f9aec..cf33067d6 100644
--- a/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
+++ b/maven-repository-discovery/src/test/java/org/apache/maven/repository/discovery/LegacyArtifactDiscovererTest.java
@@ -261,7 +261,7 @@ public void testJavaSourcesInclusion()
         assertNotNull( "Check artifacts not null", artifacts );
 
         assertTrue( "Check normal included",
-                    artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source" ) ) );
+                    artifacts.contains( createArtifact( "org.apache.maven", "testing", "1.0", "java-source", "sources" ) ) );
     }
 
     public void testDistributionInclusion()
diff --git a/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml b/maven-repository-discovery/src/test/repository/org/apache/maven/some-ejb/1.0/maven-metadata-repository.xml
new file mode 100644
index 000000000..e69de29bb