You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/02/09 03:22:05 UTC

svn commit: r620062 [2/2] - in /maven/components/branches/CAP: maven-core/src/main/java/org/apache/maven/extension/ maven-core/src/main/java/org/apache/maven/plugin/ maven-core/src/main/java/org/apache/maven/plugin/version/ maven-core/src/test/java/org...

Modified: maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml?rev=620062&r1=620061&r2=620062&view=diff
==============================================================================
--- maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml (original)
+++ maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/ProjectClasspathTest.xml Fri Feb  8 18:22:02 2008
@@ -19,20 +19,6 @@
 
 <plexus>
   <components>
-    <!-- Due to PLX-108, have to work around it...
-    <component>
-      <role>org.apache.maven.artifact.ArtifactResolver</role>
-      <implementation>org.apache.maven.project.TestArtifactResolvertion>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-    -->
     <component>
       <role>org.apache.maven.profiles.injection.ProfileInjector</role>
       <role-hint>test</role-hint>
@@ -59,14 +45,6 @@
       <role>org.apache.maven.project.TestArtifactResolver</role>
       <implementation>org.apache.maven.project.TestArtifactResolver</implementation>
       <requirements>
-        <!--
-        <requirement>
-          <role>org.apache.maven.artifact.manager.ArtifactManager</role>
-        </requirement>
-        -->
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
         <requirement>
           <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
         </requirement>
@@ -105,9 +83,6 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.project.path.PathTranslator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
         </requirement>
         <requirement>
           <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>

Modified: maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml
URL: http://svn.apache.org/viewvc/maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml?rev=620062&r1=620061&r2=620062&view=diff
==============================================================================
--- maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml (original)
+++ maven/components/branches/CAP/maven-project/src/test/resources/org/apache/maven/project/canonical/CanonicalProjectBuilderTest.xml Fri Feb  8 18:22:02 2008
@@ -19,20 +19,6 @@
 
 <plexus>
   <components>
-    <!-- Due to PLX-108, have to work around it...
-    <component>
-      <role>org.apache.maven.artifact.ArtifactResolver</role>
-      <implementation>org.apache.maven.project.TestArtifactResolvertion>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-    -->
     <component>
       <role>org.apache.maven.profiles.injection.ProfileInjector</role>
       <role-hint>test</role-hint>
@@ -46,9 +32,6 @@
           <role>org.apache.maven.artifact.manager.WagonManager</role>
         </requirement>
         <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
           <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
         </requirement>
         <requirement>
@@ -103,9 +86,6 @@
         </requirement>
         <requirement>
           <role>org.apache.maven.project.path.PathTranslator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
         </requirement>
         <requirement>
           <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>