svn commit: r804390 - in /maven/plugin-testing/branches/plugin-testing-mvn-3.x: ./ maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/ maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/

[olamy]

Author: olamy
Date: Fri Aug 14 21:50:01 2009
New Revision: 804390

URL: http://svn.apache.org/viewvc?rev=804390&view=rev
Log:
fix compilation with current mvn trunk.

Modified:
    
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
    
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
    maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml

Modified: 
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java?rev=804390&r1=804389&r2=804390&view=diff
==============================================================================
--- 
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
 (original)
+++ 
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-harness/src/main/java/org/apache/maven/plugin/testing/stubs/StubArtifactCollector.java
 Fri Aug 14 21:50:01 2009
@@ -26,6 +26,7 @@
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
 import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.RepositoryRequest;
 import org.apache.maven.artifact.resolver.ArtifactCollector;
 import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
 import org.apache.maven.artifact.resolver.ResolutionListener;
@@ -67,4 +68,14 @@
         // TODO check if we have to do more here
         return new ArtifactResolutionResult();
     }
+
+    public ArtifactResolutionResult collect( Set<Artifact> artifacts, Artifact 
originatingArtifact,
+                                             Map managedVersions, 
RepositoryRequest repositoryRequest,
+                                             ArtifactMetadataSource source, 
ArtifactFilter filter,
+                                             List<ResolutionListener> 
listeners,
+                                             List<ConflictResolver> 
conflictResolvers )
+    {
+        // TODO check if we have to do more here
+        return new ArtifactResolutionResult();
+    }
 }

Modified: 
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
URL: 
http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java?rev=804390&r1=804389&r2=804390&view=diff
==============================================================================
--- 
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
 (original)
+++ 
maven/plugin-testing/branches/plugin-testing-mvn-3.x/maven-plugin-testing-tools/src/main/java/org/apache/maven/shared/test/plugin/ProjectTool.java
 Fri Aug 14 21:50:01 2009
@@ -134,7 +134,7 @@
                 .createLocalArtifactRepositoryInstance( localRepositoryBasedir 
);
 
             ProjectBuildingRequest request = new 
DefaultProjectBuildingRequest();
-            return projectBuilder.build( pomFile, request );
+            return projectBuilder.build( pomFile, request ).getProject();
         }
         catch ( ProjectBuildingException e )
         {
@@ -173,7 +173,7 @@
                 .createLocalArtifactRepositoryInstance( localRepositoryBasedir 
);
 
             ProjectBuildingRequest request = new 
DefaultProjectBuildingRequest();
-            return projectBuilder.buildProjectWithDependencies( pomFile, 
request ).getProject();
+            return projectBuilder.build( pomFile, request ).getProject();
         }
         catch ( ProjectBuildingException e )
         {
@@ -250,7 +250,7 @@
         {
             ProjectBuildingRequest request = new 
DefaultProjectBuildingRequest();
             request.setLocalRepository( 
artifactRepositoryFactory.createArtifactRepository( "local", "file://", 
"default", null, null ) );
-            MavenProject project = projectBuilder.build( pomInfo.getPomFile(), 
request );
+            MavenProject project = projectBuilder.build( pomInfo.getPomFile(), 
request ).getProject();
 
             Artifact artifact = artifactFactory.createArtifact( 
project.getGroupId(), project.getArtifactId(), project
                 .getVersion(), null, project.getPackaging() );

Modified: maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml
URL: 
http://svn.apache.org/viewvc/maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml?rev=804390&r1=804389&r2=804390&view=diff
==============================================================================
--- maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml (original)
+++ maven/plugin-testing/branches/plugin-testing-mvn-3.x/pom.xml Fri Aug 14 
21:50:01 2009
@@ -260,6 +260,15 @@
             </configuration>
           </plugin>
         </plugins>
+        <pluginManagement>
+          <plugins>
+            <plugin>
+              <groupId>org.apache.maven.plugins</groupId>
+              <artifactId>maven-resources-plugin</artifactId>
+              <version>2.4-SNAPSHOT</version>
+            </plugin>
+          </plugins>
+        </pluginManagement>
       </build>
     </profile>
   </profiles>