You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ti...@apache.org on 2014/12/27 11:08:07 UTC
maven-surefire git commit: [SUREFIRE-1128] Fix mvn 2.2.1 build
process https://builds.apache.org/view/All/job/maven-surefire-mvn-2.2.1
Repository: maven-surefire
Updated Branches:
refs/heads/master 4c07642ad -> 12d2c4b4a
[SUREFIRE-1128] Fix mvn 2.2.1 build process https://builds.apache.org/view/All/job/maven-surefire-mvn-2.2.1
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/12d2c4b4
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/12d2c4b4
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/12d2c4b4
Branch: refs/heads/master
Commit: 12d2c4b4a44402f36fbc66ebabf1c400b5c6451a
Parents: 4c07642
Author: unknown <di...@SK-ZA-04278.vsb>
Authored: Fri Dec 26 21:35:50 2014 +0100
Committer: unknown <di...@SK-ZA-04278.vsb>
Committed: Sat Dec 27 11:07:16 2014 +0100
----------------------------------------------------------------------
.../it/jetty-war-test-failing/invoker.properties | 3 +++
.../it/jetty-war-test-passing/invoker.properties | 3 +++
.../surefire/report/StatelessXmlReporterTest.java | 4 +++-
.../surefire-1055-parallelTestCount/pom.xml | 17 ++++++++++++-----
.../java/listeners/MarkAsFailureListener.java | 18 +++++++++---------
5 files changed, 30 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties b/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
index ab6608f..82e0bc1 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-failing/invoker.properties
@@ -17,3 +17,6 @@
# under the License.
#
invoker.buildResult=failure
+
+# build project if JRE version is 1.7 or higher
+invoker.java.version = 1.7+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
----------------------------------------------------------------------
diff --git a/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties b/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
index c56128f..dca9bcd 100644
--- a/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
+++ b/maven-failsafe-plugin/src/it/jetty-war-test-passing/invoker.properties
@@ -17,3 +17,6 @@
# under the License.
#
invoker.buildResult=success
+
+# build project if JRE version is 1.7 or higher
+invoker.java.version = 1.7+
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
----------------------------------------------------------------------
diff --git a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
index 6c2982a..dad0ac2 100644
--- a/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
+++ b/maven-surefire-common/src/test/java/org/apache/maven/plugin/surefire/report/StatelessXmlReporterTest.java
@@ -60,6 +60,7 @@ public class StatelessXmlReporterTest
private final static String TEST_TWO = "bTestMethod";
private final static String TEST_THREE = "cTestMethod";
+ @Override
protected void setUp()
throws Exception
{
@@ -71,7 +72,8 @@ public class StatelessXmlReporterTest
reporter.cleanTestHistoryMap();
}
- @Override protected void tearDown()
+ @Override
+ protected void tearDown()
throws Exception
{
super.tearDown();
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
index 56f6457..d405a8c 100644
--- a/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
+++ b/surefire-integration-tests/src/test/resources/surefire-1055-parallelTestCount/pom.xml
@@ -20,9 +20,16 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>it-parent</artifactId>
+ <version>1.0</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+
<groupId>foo</groupId>
<artifactId>foo</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>1.0</version>
<packaging>jar</packaging>
<name>foo</name>
@@ -37,6 +44,7 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
+ <scope>test</scope>
</dependency>
</dependencies>
@@ -45,17 +53,16 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>1.5</source>
+ <target>1.5</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire.version}</version>
<configuration>
+ <forkMode>once</forkMode>
<parallel>classesAndMethods</parallel>
<perCoreThreadCount>false</perCoreThreadCount>
<useUnlimitedThreads>true</useUnlimitedThreads>
http://git-wip-us.apache.org/repos/asf/maven-surefire/blob/12d2c4b4/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
----------------------------------------------------------------------
diff --git a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java b/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
index a104604..5ba401f 100644
--- a/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
+++ b/surefire-integration-tests/src/test/resources/testng-listeners/src/test/java/listeners/MarkAsFailureListener.java
@@ -31,12 +31,12 @@ import org.testng.ITestResult;
*/
public class MarkAsFailureListener implements ITestListener, IInvokedMethodListener {
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void onTestStart(ITestResult result) {
}
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void onTestSuccess(ITestResult result) {
}
@@ -46,37 +46,37 @@ public class MarkAsFailureListener implements ITestListener, IInvokedMethodListe
* I will be called twice in some condition!!!
* @param result
*/
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void onTestFailure(ITestResult result) {
System.out.println(++counter);
}
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void onTestSkipped(ITestResult result) {
}
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void onTestFailedButWithinSuccessPercentage(ITestResult result) {
}
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void onStart(ITestContext context) {
}
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void onFinish(ITestContext context) {
}
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void beforeInvocation(IInvokedMethod method, ITestResult testResult) {
}
- @Override
+ //todo add @Override in surefire 3.0 running on the top of JDK 6
public void afterInvocation(IInvokedMethod method, ITestResult testResult) {
testResult.setStatus(ITestResult.FAILURE);
}