You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by ke...@apache.org on 2005/09/26 22:03:43 UTC
svn commit: r291724 - in /maven/components/trunk/sandbox/maven-it-plugin:
pom.xml src/main/java/org/apache/maven/plugin/it/ForkMojo.java
Author: kenney
Date: Mon Sep 26 13:03:38 2005
New Revision: 291724
URL: http://svn.apache.org/viewcvs?rev=291724&view=rev
Log:
Update versions to reflect changes in maven-core that broke this plugin.
Modified:
maven/components/trunk/sandbox/maven-it-plugin/pom.xml
maven/components/trunk/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java
Modified: maven/components/trunk/sandbox/maven-it-plugin/pom.xml
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-it-plugin/pom.xml?rev=291724&r1=291723&r2=291724&view=diff
==============================================================================
--- maven/components/trunk/sandbox/maven-it-plugin/pom.xml (original)
+++ maven/components/trunk/sandbox/maven-it-plugin/pom.xml Mon Sep 26 13:03:38 2005
@@ -7,7 +7,7 @@
<parent>
<artifactId>maven-plugin-parent</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-3-SNAPSHOT</version>
</parent>
<artifactId>maven-it-plugin</artifactId>
<packaging>maven-plugin</packaging>
@@ -16,33 +16,33 @@
<dependency> <!-- for MavenSession, since session.container doesn't work -->
<groupId>org.apache.maven</groupId>
<artifactId>maven-core</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-project</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-artifact-manager</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-settings</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-3-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
<artifactId>maven-archiver</artifactId>
- <version>2.0-beta-1-SNAPSHOT</version>
+ <version>2.0-beta-3-SNAPSHOT</version>
</dependency>
</dependencies>
</model>
Modified: maven/components/trunk/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java?rev=291724&r1=291723&r2=291724&view=diff
==============================================================================
--- maven/components/trunk/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java (original)
+++ maven/components/trunk/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java Mon Sep 26 13:03:38 2005
@@ -17,7 +17,6 @@
*/
import java.io.File;
-import java.util.Arrays;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -36,8 +35,8 @@
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.settings.Settings;
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.dag.CycleDetectedException;
/**
* @goal fork
@@ -121,6 +120,8 @@
rm, goals, integrationTestsDirectory.toString()
);
+ forkedSession.setUsingPOMsFromFilesystem( true );
+
MavenExecutionResponse response = lifecycleExecutor.execute( forkedSession,
rm, forkedSession.getEventDispatcher()
);
@@ -177,26 +178,26 @@
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();
-
- List poms = new ArrayList();
+ scanner.scan();
+
+ List poms = new ArrayList();
- for ( int i = 0; i < scanner.getIncludedFiles().length; i++ )
- {
- poms.add( new File( integrationTestsDirectory, scanner.getIncludedFiles()[i] ) );
- }
+ for ( int i = 0; i < scanner.getIncludedFiles().length; i++ )
+ {
+ poms.add( new File( integrationTestsDirectory, scanner.getIncludedFiles()[i] ) );
+ }
- return poms;
+ return poms;
- /*
+ /*
List poms = new ArrayList();
File [] children = integrationTestsDirectory.listFiles();
@@ -215,6 +216,6 @@
}
return poms;
- */
+ */
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org