Merge remote-tracking branch 'origin/SUREFIRE-1152' into SUREFIRE-1152
Conflicts:
surefire-integration-tests/src/test/resources/surefire-1152-rerunFailingTestsCount-suite/src/test/java/jiras/surefire1152/FlakyParent.java
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/d0683512
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/d0683512
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/d0683512
Branch: refs/heads/master
Commit: d0683512365fb5d6da7381b33a0c21f74c6749b4
Parents: fc9c08a 7552ea9
Author: Tibor17 <tibo...@lycos.com>
Authored: Tue Apr 28 22:19:54 2015 +0200
Committer: Tibor17 <tibo...@lycos.com>
Committed: Tue Apr 28 22:19:54 2015 +0200
----------------------------------------------------------------------
.../Surefire1152RerunFailingTestsInSuiteIT.java | 27 ++++++++-
.../pom.xml | 61 ++++++++++++++++++++
.../java/jiras/surefire1152/FlakyParent.java | 2 +-
.../common/junit4/JUnit4ProviderUtil.java | 44 ++++++--------
.../common/junit4/JUnit4ProviderUtilTest.java | 8 +--
.../surefire/junitcore/JUnitCoreProvider.java | 2 +-
6 files changed, 109 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
