Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update versions to reflect changes in maven-core that broke this plugin. 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@291724 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kenney Westerhof 2005-09-26 20:03:38 +00:00
parent 078a49a1cf
commit 8f272dc79f
2 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sandbox/maven-it-plugin/pom.xml
View File

@ -7,7 +7,7 @@
<parent> <parent>
<artifactId>maven-plugin-parent</artifactId> <artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<version>2.0-beta-1-SNAPSHOT</version> <version>2.0-beta-3-SNAPSHOT</version>
</parent> </parent>
<artifactId>maven-it-plugin</artifactId> <artifactId>maven-it-plugin</artifactId>
<packaging>maven-plugin</packaging> <packaging>maven-plugin</packaging>
@ -16,33 +16,33 @@
<dependency> <!-- for MavenSession, since session.container doesn't work --> <dependency> <!-- for MavenSession, since session.container doesn't work -->
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId> <artifactId>maven-core</artifactId>
<version>2.0-beta-1-SNAPSHOT</version> <version>2.0-beta-3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId> <artifactId>maven-project</artifactId>
<version>2.0-beta-1-SNAPSHOT</version> <version>2.0-beta-3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId> <artifactId>maven-artifact</artifactId>
<version>2.0-beta-1-SNAPSHOT</version> <version>2.0-beta-3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId> <artifactId>maven-artifact-manager</artifactId>
<version>2.0-beta-1-SNAPSHOT</version> <version>2.0-beta-3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId> <artifactId>maven-settings</artifactId>
<version>2.0-beta-1-SNAPSHOT</version> <version>2.0-beta-3-SNAPSHOT</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.maven</groupId> <groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId> <artifactId>maven-archiver</artifactId>
<version>2.0-beta-1-SNAPSHOT</version> <version>2.0-beta-3-SNAPSHOT</version>
</dependency> </dependency>
</dependencies> </dependencies>
</model> </model>

33
sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java
View File

@ -17,7 +17,6 @@ package org.apache.maven.plugin.it;
*/ */
import java.io.File; import java.io.File;
import java.util.Arrays;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
@ -36,8 +35,8 @@ import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException; import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.settings.Settings; import org.apache.maven.settings.Settings;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException; import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
import org.codehaus.plexus.util.dag.CycleDetectedException;
import org.codehaus.plexus.util.DirectoryScanner; import org.codehaus.plexus.util.DirectoryScanner;
import org.codehaus.plexus.util.dag.CycleDetectedException;
/** /**
* @goal fork * @goal fork
@ -121,6 +120,8 @@ public class ForkMojo
rm, goals, integrationTestsDirectory.toString() rm, goals, integrationTestsDirectory.toString()
); );
forkedSession.setUsingPOMsFromFilesystem( true );
MavenExecutionResponse response = lifecycleExecutor.execute( forkedSession, MavenExecutionResponse response = lifecycleExecutor.execute( forkedSession,
rm, forkedSession.getEventDispatcher() rm, forkedSession.getEventDispatcher()
); );
@ -177,26 +178,26 @@ public class ForkMojo
private List listITPoms() private List listITPoms()
{ {
DirectoryScanner scanner = new DirectoryScanner(); DirectoryScanner scanner = new DirectoryScanner();
scanner.setBasedir( integrationTestsDirectory ); scanner.setBasedir( integrationTestsDirectory );
scanner.setIncludes( includes ); scanner.setIncludes( includes );
scanner.setExcludes( excludes ); scanner.setExcludes( excludes );
scanner.scan(); scanner.scan();
List poms = new ArrayList(); List poms = new ArrayList();
for ( int i = 0; i < scanner.getIncludedFiles().length; i++ ) for ( int i = 0; i < scanner.getIncludedFiles().length; i++ )
{ {
poms.add( new File( integrationTestsDirectory, scanner.getIncludedFiles()[i] ) ); poms.add( new File( integrationTestsDirectory, scanner.getIncludedFiles()[i] ) );
} }
return poms; return poms;
/* /*
List poms = new ArrayList(); List poms = new ArrayList();
File [] children = integrationTestsDirectory.listFiles(); File [] children = integrationTestsDirectory.listFiles();
@ -215,6 +216,6 @@ public class ForkMojo
} }
return poms; return poms;
*/ */
} }
} }