From ecc12903c5ede4afdfd0b62045898a08112f26b0 Mon Sep 17 00:00:00 2001
From: Chris Vest <christianvest_hansen@apple.com>
Date: Wed, 10 Feb 2021 15:35:30 +0100
Subject: [PATCH] Revert test debugging flags and update surefire/failsafe
 (#11016)

* Revert "Add a profile for debugging tests that run from Maven (#11011)"

This reverts commit 83895f0f

The same functionality is already natively available in surefire, by adding the `-Dmaven.surefire.debug` flag to Maven.

* Update surefire/failsafe version

These new versions copes better when our tests prints to STDOUT, and disturbs the progress processing that these plugins do.
---
 pom.xml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index bb2ec25ec9..d4ca68c34a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -297,12 +297,6 @@
         <argLine.noUnsafe>-Dio.netty.noUnsafe=true</argLine.noUnsafe>
       </properties>
     </profile>
-    <profile>
-      <id>ijDebug</id>
-      <properties>
-        <argLine.ijDebug>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005</argLine.ijDebug>
-      </properties>
-    </profile>
     <profile>
       <id>coverage</id>
       <properties>
@@ -368,12 +362,10 @@
     <jboss.marshalling.version>1.4.11.Final</jboss.marshalling.version>
     <jetty.alpnAgent.version>2.0.10</jetty.alpnAgent.version>
     <jetty.alpnAgent.path>"${settings.localRepository}"/org/mortbay/jetty/alpn/jetty-alpn-agent/${jetty.alpnAgent.version}/jetty-alpn-agent-${jetty.alpnAgent.version}.jar</jetty.alpnAgent.path>
-    <argLine.ijDebug /> <!-- Overridden when 'ijDebug' profile is active -->
     <argLine.common>
       -server
       -dsa -da -ea:io.netty...
       -XX:+HeapDumpOnOutOfMemoryError
-      ${argLine.ijDebug}
     </argLine.common>
     <!-- Default to ALPN. See forcenpn profile to force NPN -->
     <argLine.alpnAgent>-javaagent:${jetty.alpnAgent.path}=${jetty.alpnAgent.option}</argLine.alpnAgent>
@@ -1329,12 +1321,12 @@
         <!-- keep surefire and failsafe in sync -->
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>2.22.2</version>
         </plugin>
         <!-- keep surefire and failsafe in sync -->
         <plugin>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>2.22.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-clean-plugin</artifactId>