From 43f5b2a69a0b9db8da471a49eeb81a9ff6b9cd5c Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Thu, 9 Sep 2021 17:26:45 +0200
Subject: [PATCH 1/2] PHOENIX-5893 Code coverage report not generated sometimes
 because of malformed input

increase forkedProcessExitTimeoutInSeconds to 180s
---
 pom.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pom.xml b/pom.xml
index f92950c3b65..b94788efa37 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,6 +311,7 @@
           <configuration>
             <encoding>UTF-8</encoding>
             <forkCount>${numForkedIT}</forkCount>
+            <forkedProcessExitTimeoutInSeconds>180</forkedProcessExitTimeoutInSeconds>
             <runOrder>alphabetical</runOrder>
             <redirectTestOutputToFile>${test.output.tofile}</redirectTestOutputToFile>
             <shutdown>kill</shutdown>
@@ -552,6 +553,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
           <forkCount>${numForkedUT}</forkCount>
+          <forkedProcessExitTimeoutInSeconds>180</forkedProcessExitTimeoutInSeconds>
           <reuseForks>true</reuseForks>
           <argLine>@{jacocoArgLine} -enableassertions -Xmx2250m -XX:MaxPermSize=128m
             -Djava.security.egd=file:/dev/./urandom "-Djava.library.path=${hadoop.library.path}${path.separator}${java.library.path}" -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=./target/</argLine>

From 031d4434c70917ac14965be7d413148db6921ea0 Mon Sep 17 00:00:00 2001
From: Istvan Toth <stoty@apache.org>
Date: Fri, 10 Sep 2021 10:45:12 +0200
Subject: [PATCH 2/2] bump surefire plugin to to latest (3.0.0-M5) version

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b94788efa37..ea617fba2a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -147,7 +147,7 @@
     <maven-antlr-eclipse-plugin.version>${antlr.version}</maven-antlr-eclipse-plugin.version>
     <maven-project-info-reports-plugin.version>3.1.1</maven-project-info-reports-plugin.version>
     <!-- Override property in ASF parent -->
-    <surefire.version>2.22.2</surefire.version>
+    <surefire.version>3.0.0-M5</surefire.version>
     <spotbugs-maven-plugin.version>4.1.3</spotbugs-maven-plugin.version>
     <spotbugs.version>4.1.3</spotbugs.version>
     <jacoco-maven-plugin.version>0.8.5</jacoco-maven-plugin.version>