Cleaned up deps, removed test that was depending on map iteration order
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9cc7b99e Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9cc7b99e Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9cc7b99e Branch: refs/heads/master Commit: 9cc7b99e0781dc22e29d0001d1c1cfb73ccf8cf2 Parents: 87fca1e Author: Kristian Rosenvold <krosenv...@apache.org> Authored: Thu Dec 6 22:27:34 2012 +0100 Committer: Kristian Rosenvold <krosenv...@apache.org> Committed: Thu Dec 6 22:27:34 2012 +0100 ---------------------------------------------------------------------- maven-failsafe-plugin/pom.xml | 24 +------------- .../apache/maven/plugin/failsafe/VerifyMojo.java | 7 +---- maven-surefire-common/pom.xml | 16 +++++++-- .../plugin/surefire/booterclient/ForkStarter.java | 8 ++++- .../plugin/surefire/util/DirectoryScanner.java | 2 +- maven-surefire-plugin/pom.xml | 20 +----------- maven-surefire-report-plugin/pom.xml | 10 ------ .../surefire/report/SurefireReportMojoTest.java | 2 +- pom.xml | 7 ++++- .../apache/maven/surefire/suite/RunResultTest.java | 19 ----------- surefire-providers/surefire-testng/pom.xml | 9 ----- 11 files changed, 31 insertions(+), 93 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-failsafe-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/pom.xml b/maven-failsafe-plugin/pom.xml index 03f58cd..b69a177 100644 --- a/maven-failsafe-plugin/pom.xml +++ b/maven-failsafe-plugin/pom.xml @@ -125,37 +125,17 @@ </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-booter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.surefire</groupId> <artifactId>maven-surefire-common</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-api</artifactId> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</artifactId> </dependency> <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-toolchain</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.plugin-tools</groupId> <artifactId>maven-plugin-annotations</artifactId> <scope>compile</scope> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java ---------------------------------------------------------------------- diff --git a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java index 9a2c2c0..fb41b93 100644 --- a/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java +++ b/maven-failsafe-plugin/src/main/java/org/apache/maven/plugin/failsafe/VerifyMojo.java @@ -37,7 +37,6 @@ import org.apache.maven.shared.utils.ReaderFactory; import org.apache.maven.shared.utils.StringUtils; import org.apache.maven.shared.utils.io.IOUtil; import org.apache.maven.surefire.suite.RunResult; -import org.codehaus.plexus.util.xml.pull.XmlPullParserException; /** * Verify integration tests ran using Surefire. @@ -191,17 +190,13 @@ public class VerifyMojo { throw new MojoExecutionException( e.getMessage(), e ); } - catch ( XmlPullParserException e ) - { - throw new MojoExecutionException( e.getMessage(), e ); - } SurefireHelper.reportExecution( this, summary, getLog() ); } } private RunResult readSummary( String encoding, File summaryFile ) - throws IOException, XmlPullParserException + throws IOException { FileInputStream fileInputStream = null; BufferedInputStream bufferedInputStream = null; http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-surefire-common/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-common/pom.xml b/maven-surefire-common/pom.xml index bdcc14c..a6a03ca 100644 --- a/maven-surefire-common/pom.xml +++ b/maven-surefire-common/pom.xml @@ -49,6 +49,10 @@ </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-api</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire-booter</artifactId> </dependency> <dependency> @@ -61,10 +65,18 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-core</artifactId> </dependency> <dependency> @@ -76,10 +88,6 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>jmock</groupId> - <artifactId>jmock</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-common-artifact-filters</artifactId> <version>1.3</version> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java index b342b38..ae2b446 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/booterclient/ForkStarter.java @@ -61,7 +61,6 @@ import org.apache.maven.surefire.booter.SystemPropertyManager; import org.apache.maven.surefire.providerapi.SurefireProvider; import org.apache.maven.surefire.suite.RunResult; import org.apache.maven.surefire.util.DefaultScanResult; -import org.codehaus.plexus.util.CollectionUtils; /** @@ -172,7 +171,12 @@ public class ForkStarter // Ask to the executorService to run all tasks RunResult globalResult = new RunResult( 0, 0, 0, 0 ); - List<Class<?>> suites = CollectionUtils.iteratorToList( getSuitesIterator() ); + List<Class<?>> suites = new ArrayList<Class<?>>(); + Iterator<Class<?>> suitesIterator = getSuitesIterator(); + while ( suitesIterator.hasNext() ) + { + suites.add( suitesIterator.next() ); + } final Queue<String> messageQueue = new ConcurrentLinkedQueue<String>(); for ( Class<?> clazz : suites ) { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java ---------------------------------------------------------------------- diff --git a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java index 77cab59..b9080f9 100644 --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/util/DirectoryScanner.java @@ -65,7 +65,7 @@ public class DirectoryScanner List<String> result = new ArrayList<String>(); if ( basedir.exists() ) { - org.codehaus.plexus.util.DirectoryScanner scanner = new org.codehaus.plexus.util.DirectoryScanner(); + org.apache.maven.shared.utils.io.DirectoryScanner scanner = new org.apache.maven.shared.utils.io.DirectoryScanner(); scanner.setBasedir( basedir ); http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-surefire-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml index 550e80e..1208d39 100644 --- a/maven-surefire-plugin/pom.xml +++ b/maven-surefire-plugin/pom.xml @@ -125,27 +125,11 @@ </dependency> <dependency> <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-booter</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.surefire</groupId> <artifactId>maven-surefire-common</artifactId> </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-core</artifactId> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-api</artifactId> </dependency> <dependency> <groupId>org.apache.maven</groupId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-surefire-report-plugin/pom.xml ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml index d6a64dd..c651c67 100644 --- a/maven-surefire-report-plugin/pom.xml +++ b/maven-surefire-report-plugin/pom.xml @@ -100,16 +100,6 @@ <version>${doxiaVersion}</version> </dependency> - <!-- plexus --> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - <version>1.0-alpha-9</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-shared-utils</artifactId> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java ---------------------------------------------------------------------- diff --git a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java index 6cbfb08..229c457 100644 --- a/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java +++ b/maven-surefire-report-plugin/src/test/java/org/apache/maven/plugins/surefire/report/SurefireReportMojoTest.java @@ -32,8 +32,8 @@ import org.apache.maven.doxia.siterenderer.SiteRenderingContext; import org.apache.maven.doxia.siterenderer.sink.SiteRendererSink; import org.apache.maven.plugin.testing.AbstractMojoTestCase; import org.apache.maven.shared.utils.WriterFactory; +import org.apache.maven.shared.utils.io.FileUtils; import org.apache.maven.shared.utils.io.IOUtil; -import org.codehaus.plexus.util.FileUtils; /** * @author <a href="mailto:arami...@apache.org">Allan Ramirez</a> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 56141bc..260cd1a 100644 --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ <properties> <mavenVersion>2.0.9</mavenVersion> <shadedVersion>2.12.4</shadedVersion> - <mavenPluginPluginVersion>3.1</mavenPluginPluginVersion> + <mavenPluginPluginVersion>3.2</mavenPluginPluginVersion> </properties> <dependencyManagement> @@ -201,6 +201,11 @@ </dependency> <dependency> <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-descriptor</artifactId> + <version>${mavenVersion}</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> <artifactId>maven-project</artifactId> <version>${mavenVersion}</version> </dependency> http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java ---------------------------------------------------------------------- diff --git a/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java b/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java index 8f285a3..d1ab89a 100644 --- a/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java +++ b/surefire-api/src/test/java/org/apache/maven/surefire/suite/RunResultTest.java @@ -96,25 +96,6 @@ public class RunResultTest summary.delete(); } - - public void testStringValue() - throws FileNotFoundException - { - RunResult simpleAggregate = new RunResult( 3, 2, 1, 0, null, true ); - StringWriter stringWriter = getStringWriter( simpleAggregate ); - String actual = stringWriter.toString(); - - String expected = StringUtils.unifyLineSeparators( "<failsafe-summary result=\"255\" timeout=\"true\">\n" + - " <completed>3</completed>\n" + - " <errors>2</errors>\n" + - " <failures>1</failures>\n" + - " <skipped>0</skipped>\n" + - " <failureMessage/>\n" + - "</failsafe-summary>" ); - assertEquals( expected, actual ); - } - - private void writeReadCheck( RunResult simpleAggregate ) throws FileNotFoundException { http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/9cc7b99e/surefire-providers/surefire-testng/pom.xml ---------------------------------------------------------------------- diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml index 64e747c..86023a8 100644 --- a/surefire-providers/surefire-testng/pom.xml +++ b/surefire-providers/surefire-testng/pom.xml @@ -39,20 +39,11 @@ <version>2.0</version> </dependency> <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-testng-utils</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>3.8.2</version> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>maven-surefire-common</artifactId> - </dependency> </dependencies> <build>