[maven-release-plugin] copy for tag surefire-2.4
git-svn-id: https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4@606990 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-surefire-plugin/pom.xml b/maven-surefire-plugin/pom.xml
index 2946cbc..c63227f 100644
--- a/maven-surefire-plugin/pom.xml
+++ b/maven-surefire-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-surefire-plugin</artifactId>
diff --git a/maven-surefire-report-plugin/pom.xml b/maven-surefire-report-plugin/pom.xml
index b0aad6e..b5906e9 100644
--- a/maven-surefire-report-plugin/pom.xml
+++ b/maven-surefire-report-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>maven-surefire-report-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 07427c0..d94a491 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,7 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>maven-parent</artifactId>
@@ -30,7 +29,7 @@
<artifactId>surefire</artifactId>
<packaging>pom</packaging>
<name>SureFire</name>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
<description>Surefire is a test framework project.</description>
<url>http://maven.apache.org/surefire</url>
<issueManagement>
@@ -72,21 +71,21 @@
</contributor>
</contributors>
<scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/trunk/</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/trunk/</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/trunk</url>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.4</url>
</scm>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-api</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-booter</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</dependency>
<dependency>
<groupId>org.codehaus.plexus</groupId>
diff --git a/surefire-api/pom.xml b/surefire-api/pom.xml
index 76dcf4f..ae95f9f 100644
--- a/surefire-api/pom.xml
+++ b/surefire-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>surefire-api</artifactId>
diff --git a/surefire-booter/pom.xml b/surefire-booter/pom.xml
index 4cf82dd..bb3a2bc 100644
--- a/surefire-booter/pom.xml
+++ b/surefire-booter/pom.xml
@@ -2,7 +2,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>surefire-booter</artifactId>
diff --git a/surefire-integration-tests/pom.xml b/surefire-integration-tests/pom.xml
index fefef71..e482e80 100644
--- a/surefire-integration-tests/pom.xml
+++ b/surefire-integration-tests/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.maven.surefire</groupId>
diff --git a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
index 7d98169..9216595 100644
--- a/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
+++ b/surefire-integration-tests/src/test/resources/testng-junit-together/pom.xml
@@ -48,11 +48,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.4-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.5</source>
diff --git a/surefire-providers/pom.xml b/surefire-providers/pom.xml
index 7e20d6a..a9fcc7e 100644
--- a/surefire-providers/pom.xml
+++ b/surefire-providers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>surefire</artifactId>
<groupId>org.apache.maven.surefire</groupId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>surefire-providers</artifactId>
diff --git a/surefire-providers/surefire-junit/pom.xml b/surefire-providers/surefire-junit/pom.xml
index 3af8ac8..54dd675 100644
--- a/surefire-providers/surefire-junit/pom.xml
+++ b/surefire-providers/surefire-junit/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<artifactId>surefire-junit</artifactId>
<name>SureFire JUnit Runner</name>
diff --git a/surefire-providers/surefire-junit4/pom.xml b/surefire-providers/surefire-junit4/pom.xml
index fe106f6..abc2b94 100644
--- a/surefire-providers/surefire-junit4/pom.xml
+++ b/surefire-providers/surefire-junit4/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<artifactId>surefire-junit4</artifactId>
<name>SureFire JUnit4 Runner</name>
diff --git a/surefire-providers/surefire-testng/pom.xml b/surefire-providers/surefire-testng/pom.xml
index 3e1e151..e0a9d2f 100644
--- a/surefire-providers/surefire-testng/pom.xml
+++ b/surefire-providers/surefire-testng/pom.xml
@@ -17,13 +17,12 @@
~ under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire-providers</artifactId>
- <version>2.4-SNAPSHOT</version>
+ <version>2.4</version>
</parent>
<artifactId>surefire-testng</artifactId>
<name>SureFire TestNG Runner</name>
diff --git a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
index 6f46167..0188602 100644
--- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
@@ -22,7 +22,6 @@
import java.io.File;
import java.lang.reflect.Constructor;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -153,7 +152,7 @@
private static List loadListenerClasses(String listenerClasses) throws TestSetFailedException
{
if (listenerClasses == null || "".equals(listenerClasses.trim())) {
- return Collections.emptyList();
+ return new ArrayList();
}
List classes = new ArrayList();
