Author: mauro
Date: Tue Dec 4 03:25:25 2007
New Revision: 600887
URL: http://svn.apache.org/viewvc?rev=600887&view=rev
Log:
Backported -r597038:597039 from trunk to surefire-2.3.x branch
Modified:
maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Modified:
maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
URL:
http://svn.apache.org/viewvc/maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java?rev=600887&r1=600886&r2=600887&view=diff
==============================================================================
---
maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
(original)
+++
maven/surefire/branches/surefire-2.3.x/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java
Tue Dec 4 03:25:25 2007
@@ -314,7 +314,21 @@
* @parameter
*/
private File[] suiteXmlFiles;
-
+
+ /**
+ * Allows you to specify the name of the JUnit artifact. If not set,
<code>junit:junit</code> will be used.
+ *
+ * @parameter expression="${junitArtifactName}" default-value="junit:junit"
+ */
+ private String junitArtifactName;
+
+ /**
+ * Allows you to specify the name of the TestNG artifact. If not set,
<code>org.testng:testng</code> will be used.
+ *
+ * @parameter expression="${testNGArtifactName}"
default-value="org.testng:testng"
+ */
+ private String testNGArtifactName;
+
/**
* The attribute thread-count allows you to specify how many threads
should be allocated for this execution. Only
* makes sense to use in conjunction with parallel.
@@ -494,10 +508,10 @@
{
addArtifact( surefireBooter, surefireArtifact );
- junitArtifact = (Artifact) projectArtifactMap.get( "junit:junit" );
+ junitArtifact = (Artifact) projectArtifactMap.get(
junitArtifactName );
// TODO: this is pretty manual, but I'd rather not require the
plugin > dependencies section right now
- testNgArtifact = (Artifact) projectArtifactMap.get(
"org.testng:testng" );
+ testNgArtifact = (Artifact) projectArtifactMap.get(
testNGArtifactName );
if ( testNgArtifact != null )
{
