From 8f272dc79f9eb55971666da6410bb12ed06eb564 Mon Sep 17 00:00:00 2001 From: Kenney Westerhof Date: Mon, 26 Sep 2005 20:03:38 +0000 Subject: [PATCH] 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 --- sandbox/maven-it-plugin/pom.xml | 14 ++++---- .../org/apache/maven/plugin/it/ForkMojo.java | 33 ++++++++++--------- 2 files changed, 24 insertions(+), 23 deletions(-) diff --git a/sandbox/maven-it-plugin/pom.xml b/sandbox/maven-it-plugin/pom.xml index ba8e35f69f..32da3ec5a7 100644 --- a/sandbox/maven-it-plugin/pom.xml +++ b/sandbox/maven-it-plugin/pom.xml @@ -7,7 +7,7 @@ maven-plugin-parent org.apache.maven.plugins - 2.0-beta-1-SNAPSHOT + 2.0-beta-3-SNAPSHOT maven-it-plugin maven-plugin @@ -16,33 +16,33 @@ org.apache.maven maven-core - 2.0-beta-1-SNAPSHOT + 2.0-beta-3-SNAPSHOT org.apache.maven maven-project - 2.0-beta-1-SNAPSHOT + 2.0-beta-3-SNAPSHOT org.apache.maven maven-artifact - 2.0-beta-1-SNAPSHOT + 2.0-beta-3-SNAPSHOT org.apache.maven maven-artifact-manager - 2.0-beta-1-SNAPSHOT + 2.0-beta-3-SNAPSHOT org.apache.maven maven-settings - 2.0-beta-1-SNAPSHOT + 2.0-beta-3-SNAPSHOT org.apache.maven maven-archiver - 2.0-beta-1-SNAPSHOT + 2.0-beta-3-SNAPSHOT diff --git a/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java b/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java index 18dc7caf32..3bde0ed0f1 100644 --- a/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java +++ b/sandbox/maven-it-plugin/src/main/java/org/apache/maven/plugin/it/ForkMojo.java @@ -17,7 +17,6 @@ package org.apache.maven.plugin.it; */ 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.MavenProjectBuilder; 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 @@ public class ForkMojo rm, goals, integrationTestsDirectory.toString() ); + forkedSession.setUsingPOMsFromFilesystem( true ); + MavenExecutionResponse response = lifecycleExecutor.execute( forkedSession, rm, forkedSession.getEventDispatcher() ); @@ -177,26 +178,26 @@ public class ForkMojo 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 @@ public class ForkMojo } return poms; - */ + */ } }