Repository: flume Updated Branches: refs/heads/trunk f3c4a40ed -> d116f9707
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/d116f970 Tree: http://git-wip-us.apache.org/repos/asf/flume/tree/d116f970 Diff: http://git-wip-us.apache.org/repos/asf/flume/diff/d116f970 Branch: refs/heads/trunk Commit: d116f9707d5b5da501b1bb9a5fca812db7ce849b Parents: f3c4a40 Author: Miklos Csanady <[email protected]> Authored: Tue Nov 21 11:27:53 2017 +0100 Committer: Ferenc Szabo <[email protected]> Committed: Tue Nov 21 11:27:53 2017 +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/d116f970/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 e41adfc..8071222 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> @@ -103,13 +102,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/d116f970/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index da84b5b..e3359ce 100644 --- a/pom.xml +++ b/pom.xml @@ -96,9 +96,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> @@ -817,9 +815,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>
