FLUME-3158: Upgrade surefire version and config Set surefire version to the latest and configure it to rerun failed tests. This way the flaky tests will not break the build as often.
This closes #182 Reviewers: Ferenc Szabo (Miklos Csanady via Ferenc Szabo) Project: http://git-wip-us.apache.org/repos/asf/flume/repo Commit: http://git-wip-us.apache.org/repos/asf/flume/commit/e3a0f8b2 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/e3a0f8b2 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/e3a0f8b2 Branch: refs/heads/trunk Commit: e3a0f8b29243298541aaaa3fc51fdfa82623dbe1 Parents: 5a70cd7 Author: Miklos Csanady <[email protected]> Authored: Tue Nov 21 11:27:53 2017 +0100 Committer: Denes Arvay <[email protected]> Committed: Fri Jan 26 16:23:26 2018 +0100 ---------------------------------------------------------------------- flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml | 5 ----- pom.xml | 10 +++++----- 2 files changed, 5 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flume/blob/e3a0f8b2/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml ---------------------------------------------------------------------- diff --git a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml index 84ddf94..202e4fd 100644 --- a/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml +++ b/flume-ng-sinks/flume-ng-morphline-solr-sink/pom.xml @@ -32,7 +32,6 @@ limitations under the License. <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <solr.version>${solr-global.version}</solr.version> <solr.expected.version>${solr-global.version}</solr.expected.version> <!-- sanity check to verify we actually run against the expected version rather than some outdated version --> - <surefire.version>${mvn-surefire-plugin-old-morphline.version}</surefire.version> </properties> <dependencies> @@ -126,13 +125,9 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${surefire.version}</version> <configuration> <argLine>-Dtests.locale=en_us</argLine> <redirectTestOutputToFile>true</redirectTestOutputToFile> - <systemPropertyVariables> - <!--<solr.expected.version>${solr.expected.version}</solr.expected.version>--> - </systemPropertyVariables> </configuration> </plugin> http://git-wip-us.apache.org/repos/asf/flume/blob/e3a0f8b2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 14a7e89..3904b15 100644 --- a/pom.xml +++ b/pom.xml @@ -95,9 +95,7 @@ limitations under the License. <mvn-project-info-reports-plugin.version>2.4</mvn-project-info-reports-plugin.version> <mvn-site-plugin.version>3.3</mvn-site-plugin.version> <mvn-sphinx-plugin>1.0.2</mvn-sphinx-plugin> - <mvn-surefire-plugin.version>2.14.1</mvn-surefire-plugin.version> - <mvn-surefire-plugin-old.version>2.12.3</mvn-surefire-plugin-old.version> - <mvn-surefire-plugin-old-morphline.version>2.12.4</mvn-surefire-plugin-old-morphline.version> + <mvn-surefire-plugin.version>2.20.1</mvn-surefire-plugin.version> <netty.version>3.9.4.Final</netty.version> <protobuf.version>2.5.0</protobuf.version> <rat.version>0.11</rat.version> @@ -918,9 +916,11 @@ limitations under the License. <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> - <version>${mvn-surefire-plugin-old.version}</version> + <version>${mvn-surefire-plugin.version}</version> <configuration> - <forkMode>always</forkMode> + <reuseForks>false</reuseForks> + <forkCount>1</forkCount> + <rerunFailingTestsCount>10</rerunFailingTestsCount> <forkedProcessTimeoutInSeconds>900</forkedProcessTimeoutInSeconds> <redirectTestOutputToFile>true</redirectTestOutputToFile> <includes>
