Author: stephenc
Date: Mon Aug 9 10:36:53 2010
New Revision: 983577
URL: http://svn.apache.org/viewvc?rev=983577&view=rev
Log:
[SUREFIRE-615] Fixed. (I hope again, but this time I really think its fixed)
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
Modified: maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml?rev=983577&r1=983576&r2=983577&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit/pom.xml Mon Aug 9
10:36:53 2010
@@ -36,6 +36,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
</project>
Modified:
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java?rev=983577&r1=983576&r2=983577&view=diff
==============================================================================
---
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
(original)
+++
maven/surefire/trunk/surefire-providers/surefire-junit/src/main/java/org/apache/maven/surefire/junit/JUnitDirectoryTestSuite.java
Mon Aug 9 10:36:53 2010
@@ -49,6 +49,10 @@ public class JUnitDirectoryTestSuite
{
junitClass = classLoader.loadClass( Test.class.getName() );
}
+ catch ( NoClassDefFoundError e)
+ {
+ // ignore this
+ }
catch ( ClassNotFoundException e )
{
// ignore this
@@ -69,7 +73,7 @@ public class JUnitDirectoryTestSuite
}
return testSet;
}
-
+
private boolean classHasPublicNoArgConstructor( Class testClass )
{
try
Modified: maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml?rev=983577&r1=983576&r2=983577&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit4/pom.xml Mon Aug 9
10:36:53 2010
@@ -36,6 +36,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.0</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
Modified: maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml?rev=983577&r1=983576&r2=983577&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-junit47/pom.xml Mon Aug 9
10:36:53 2010
@@ -36,6 +36,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
Modified: maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml
URL:
http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml?rev=983577&r1=983576&r2=983577&view=diff
==============================================================================
--- maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml (original)
+++ maven/surefire/trunk/surefire-providers/surefire-testng/pom.xml Mon Aug 9
10:36:53 2010
@@ -41,6 +41,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
+ <scope>provided</scope>
</dependency>
</dependencies>
