From 7d5666109c9d4952fc66af170c7d46918d7378dd Mon Sep 17 00:00:00 2001
From: aggarwalakshay <86252783+aggarwalakshay@users.noreply.github.com>
Date: Mon, 4 Apr 2022 23:56:15 -0700
Subject: [PATCH] upgrade surefire 3.0.0-M6 (#12395)

* upgrade surefire 3.0.0-M6

* increasing memory
---
 .travis.yml | 2 +-
 pom.xml     | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a41d50d476c..7c4fc858907 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -204,7 +204,7 @@ jobs:
         # Set MAVEN_OPTS for Surefire launcher. Skip remoteresources to avoid intermittent connection timeouts when
         # resolving the SIGAR dependency.
         - >
-          MAVEN_OPTS='-Xmx1100m' ${MVN} test -pl ${MAVEN_PROJECTS}
+          MAVEN_OPTS='-Xmx2048m' ${MVN} test -pl ${MAVEN_PROJECTS}
           ${MAVEN_SKIP} -Dremoteresources.skip=true -Ddruid.generic.useDefaultValueForNull=${DRUID_USE_DEFAULT_VALUE_FOR_NULL}
         - sh -c "dmesg | egrep -i '(oom|out of memory|kill process|killed).*' -C 1 || exit 0"
         - free -m
diff --git a/pom.xml b/pom.xml
index e45e7e2a69a..8989bf5dd31 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1488,10 +1488,7 @@
               <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <!--- stay on M4 until M6 is released with a fix for
-                    https://issues.apache.org/jira/browse/SUREFIRE-1815
-                    causing issues in RetryUtilsTest -->
-                    <version>3.0.0-M4</version>
+                    <version>3.0.0-M6</version>
                     <configuration>
                         <!-- locale settings must be set on the command line before startup -->
                         <!-- set default options -->