Author: brett
Date: Wed Mar 1 05:58:47 2006
New Revision: 382020
URL: http://svn.apache.org/viewcvs?rev=382020&view=rev
Log:
[MSUREFIRE-23] separate out the test ng provider (sort of)
Modified:
maven/plugins/branches/maven-surefire-plugin-testng/pom.xml
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
Modified: maven/plugins/branches/maven-surefire-plugin-testng/pom.xml
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-surefire-plugin-testng/pom.xml?rev=382020&r1=382019&r2=382020&view=diff
==============================================================================
--- maven/plugins/branches/maven-surefire-plugin-testng/pom.xml (original)
+++ maven/plugins/branches/maven-surefire-plugin-testng/pom.xml Wed Mar 1
05:58:47 2006
@@ -17,26 +17,9 @@
</contributors>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-booter</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <scope>runtime</scope>
+ <version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.maven</groupId>
Modified:
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
URL:
http://svn.apache.org/viewcvs/maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java?rev=382020&r1=382019&r2=382020&view=diff
==============================================================================
---
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
(original)
+++
maven/plugins/branches/maven-surefire-plugin-testng/src/main/java/org/apache/maven/test/SurefirePlugin.java
Wed Mar 1 05:58:47 2006
@@ -416,7 +416,7 @@
// TODO: this is crude for now. We really want to get
"surefire-booter" and all its dependencies, but the
// artifacts don't keep track of their children. We could just
throw all of them in, but that would add an
// unnecessary maven-artifact dependency which is precisely the
reason we are isolating the classloader
- if ( "junit".equals( artifact.getArtifactId() ) ||
"surefire".equals( artifact.getArtifactId() ) ||
+ if ( "junit".equals( artifact.getArtifactId() ) ||
"surefire-api".equals( artifact.getArtifactId() ) ||
"surefire-booter".equals( artifact.getArtifactId() ) ||
"plexus-utils".equals( artifact.getArtifactId() ) ||
( "testng-jdk14".equals( artifact.getArtifactId() ) && !jvm15
) ||