diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 96b87d5e13d2a..babeb8d660917 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -29,7 +29,7 @@
 
         <!-- version.* properties are defined in jboss-parent and are overridden/updated here: -->
         <version.enforcer.plugin>3.0.0-M3</version.enforcer.plugin>
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <version.exec.plugin>3.0.0</version.exec.plugin>
         <failsafe-plugin.version>${version.surefire.plugin}</failsafe-plugin.version>
 
@@ -415,8 +415,6 @@
                         <!-- limit the amount of memory surefire can use, 1500m should be plenty-->
                         <!-- set tmpdir as early as possible because surefire sets it too late for JDK16 -->
                         <argLine>${jacoco.agent.argLine} -Xmx1500m -XX:MaxMetaspaceSize=1500m -Djava.io.tmpdir="${project.build.directory}" ${surefire.argLine.additional}</argLine>
-                        <!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
-                        <trimStackTrace>false</trimStackTrace>
                         <excludedEnvironmentVariables>MAVEN_OPTS</excludedEnvironmentVariables>
                     </configuration>
                 </plugin>
@@ -435,8 +433,6 @@
                         </systemPropertyVariables>
                         <!-- set tmpdir as early as possible because failsafe sets it too late for JDK16 -->
                         <argLine>-Djava.io.tmpdir="${project.build.directory}"</argLine>
-                        <!-- https://lists.apache.org/thread.html/r9030808273c82ac6d7b9602d34d446c7d8c4e8aa02c41bca164df1c5%40%3Cdev.maven.apache.org%3E -->
-                        <trimStackTrace>false</trimStackTrace>
                         <excludedEnvironmentVariables>MAVEN_OPTS</excludedEnvironmentVariables>
                     </configuration>
                 </plugin>
diff --git a/docs/src/main/asciidoc/building-my-first-extension.adoc b/docs/src/main/asciidoc/building-my-first-extension.adoc
index f0ade514b4a7d..0ec916a41d28a 100644
--- a/docs/src/main/asciidoc/building-my-first-extension.adoc
+++ b/docs/src/main/asciidoc/building-my-first-extension.adoc
@@ -169,8 +169,7 @@ Your extension is a multi-module project. So let's start by checking out the par
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.version>{quarkus-version}</quarkus.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/docs/src/main/asciidoc/jreleaser.adoc b/docs/src/main/asciidoc/jreleaser.adoc
index b811dca952578..fa6c4facb99fc 100644
--- a/docs/src/main/asciidoc/jreleaser.adoc
+++ b/docs/src/main/asciidoc/jreleaser.adoc
@@ -616,8 +616,7 @@ As a reference, these are the full contents of the `pom.xml`:
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus.platform</quarkus.platform.group-id>
     <quarkus.platform.version>{quarkus-version}</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 01c68d2ae4a2f..ba5993f75d90c 100644
--- a/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -18,7 +18,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 818ad9eee9e0b..a0518654fe7f2 100644
--- a/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda-rest/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -18,7 +18,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 2089304dd79ed..ec1094ddc0d83 100644
--- a/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -17,7 +17,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 69ab797195e17..643e676782a42 100644
--- a/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/azure-functions-http/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -17,7 +17,7 @@
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
     <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
     <resources-plugin.version>3.1.0</resources-plugin.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
 
     <azure.functions.maven.plugin.version>1.9.1</azure.functions.maven.plugin.version>
     <functionAppName>${appName}</functionAppName>
diff --git a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
index 1c22c58aef34f..919bcad791b75 100644
--- a/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/extensions/funqy/funqy-amazon-lambda/maven-archetype/src/main/resources/archetype-resources/pom.xml
@@ -17,7 +17,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     </properties>
     <dependencyManagement>
         <dependencies>
diff --git a/independent-projects/arc/pom.xml b/independent-projects/arc/pom.xml
index 64beeaefb568c..9e5d27de448ed 100644
--- a/independent-projects/arc/pom.xml
+++ b/independent-projects/arc/pom.xml
@@ -51,7 +51,7 @@
         <version.gizmo>1.0.11.Final</version.gizmo>
         <version.jpa>2.2.3</version.jpa>
 
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
     </properties>
 
diff --git a/independent-projects/bootstrap/pom.xml b/independent-projects/bootstrap/pom.xml
index eb723c396d87f..cef892d11f0e3 100644
--- a/independent-projects/bootstrap/pom.xml
+++ b/independent-projects/bootstrap/pom.xml
@@ -34,7 +34,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.release>11</maven.compiler.release>
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
 
         <!-- Dependency versions -->
diff --git a/independent-projects/extension-maven-plugin/pom.xml b/independent-projects/extension-maven-plugin/pom.xml
index cfcdf73768dbc..f9ff5c586205a 100644
--- a/independent-projects/extension-maven-plugin/pom.xml
+++ b/independent-projects/extension-maven-plugin/pom.xml
@@ -33,7 +33,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.release>11</maven.compiler.release>
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <jackson-bom.version>2.13.3</jackson-bom.version>
         <junit.jupiter.version>5.8.2</junit.jupiter.version>
diff --git a/independent-projects/ide-config/pom.xml b/independent-projects/ide-config/pom.xml
index 4ca5954ad8d37..0535bf70d15d3 100644
--- a/independent-projects/ide-config/pom.xml
+++ b/independent-projects/ide-config/pom.xml
@@ -39,7 +39,7 @@
         <maven.compiler.target>11</maven.compiler.target>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.release>11</maven.compiler.release>
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
     </properties>
 
diff --git a/independent-projects/qute/pom.xml b/independent-projects/qute/pom.xml
index 3c77444d70b8a..be346059d4418 100644
--- a/independent-projects/qute/pom.xml
+++ b/independent-projects/qute/pom.xml
@@ -44,7 +44,7 @@
         <version.assertj>3.23.1</version.assertj>
         <version.gizmo>1.0.11.Final</version.gizmo>
         <version.jboss-logging>3.5.0.Final</version.jboss-logging>
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <version.nexus-staging-maven-plugin>1.6.8</version.nexus-staging-maven-plugin>
         <version.smallrye-mutiny>1.5.0</version.smallrye-mutiny>
     </properties>
diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml
index 489c2323c2546..dfe5369df1037 100644
--- a/independent-projects/resteasy-reactive/pom.xml
+++ b/independent-projects/resteasy-reactive/pom.xml
@@ -50,7 +50,7 @@
         <gizmo.version>1.0.11.Final</gizmo.version>
         <jakarta.persistence-api.version>2.2.3</jakarta.persistence-api.version>
 
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <jboss-jaxrs-api_2.1_spec.version>2.0.1.Final</jboss-jaxrs-api_2.1_spec.version>
         <jakarta.json.version>1.1.6</jakarta.json.version>
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
index 259a54154390b..9f87a9e40dfbd 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus-extension/code/extension-base/java/pom.tpl.qute.xml
@@ -38,7 +38,6 @@
         {#if maven.surefire-plugin.version}
         <surefire-plugin.version>{maven.surefire-plugin.version}</surefire-plugin.version>
         <failsafe-plugin.version>$\{surefire-plugin.version}</failsafe-plugin.version>
-        <failsafe.useModulePath>false</failsafe.useModulePath>
         {/if}
     </properties>
 
diff --git a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml
index ff41a91b35d80..6b154bbba6890 100644
--- a/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml
+++ b/independent-projects/tools/base-codestarts/src/main/resources/codestarts/quarkus/buildtool/maven/base/pom.tpl.qute.xml
@@ -19,7 +19,6 @@
         <compiler-plugin.version>{maven-compiler-plugin.version}</compiler-plugin.version>
         <skipITs>true</skipITs>
         <surefire-plugin.version>{maven-surefire-plugin.version}</surefire-plugin.version>
-        <failsafe.useModulePath>false</failsafe.useModulePath>
         {#if uberjar}
         <quarkus.package.type>uber-jar</quarkus.package.type>
         {/if}
diff --git a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
index 2db757952ca98..7b32cc9370ee2 100644
--- a/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
+++ b/independent-projects/tools/devtools-common/src/main/java/io/quarkus/devtools/commands/CreateExtension.java
@@ -53,7 +53,7 @@ public enum LayoutType {
     public static final String DEFAULT_QUARKIVERSE_PARENT_VERSION = "9";
     public static final String DEFAULT_QUARKIVERSE_NAMESPACE_ID = "quarkus-";
 
-    private static final String DEFAULT_SUREFIRE_PLUGIN_VERSION = "3.0.0-M5";
+    private static final String DEFAULT_SUREFIRE_PLUGIN_VERSION = "3.0.0-M7";
     private static final String DEFAULT_COMPILER_PLUGIN_VERSION = "3.8.1";
 
     private final QuarkusExtensionCodestartProjectInputBuilder builder = QuarkusExtensionCodestartProjectInput.builder();
diff --git a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
index f877097b9ea28..7c120b5a39eb5 100644
--- a/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
+++ b/independent-projects/tools/devtools-testing/src/main/java/io/quarkus/devtools/testing/registry/client/TestRegistryClientBuilder.java
@@ -604,7 +604,7 @@ public TestPlatformCatalogMemberBuilder addCoreMember() {
             metadata.put("maven-plugin-artifactId", "quarkus-maven-plugin");
             metadata.put("maven-plugin-version", quarkusBom.extensions.getBom().getVersion());
             metadata.put("compiler-plugin-version", "3.8.1");
-            metadata.put("surefire-plugin-version", "3.0.0-M5");
+            metadata.put("surefire-plugin-version", "3.0.0-M7");
             return quarkusBom;
         }
 
diff --git a/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json b/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json
index 86fb14508434c..0d979990eb723 100644
--- a/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json
+++ b/independent-projects/tools/devtools-testing/src/main/resources/fake-catalog.json
@@ -357,7 +357,7 @@
         "doc-root": "https://quarkus.io",
         "rest-assured-version": "4.3.2",
         "compiler-plugin-version": "3.8.1",
-        "surefire-plugin-version": "3.0.0-M5",
+        "surefire-plugin-version": "3.0.0-M7",
         "kotlin-version": "1.4.31",
         "scala-version": "2.12.13",
         "scala-plugin-version": "4.4.0",
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
index 7e85fa68effa5..936986bec5705 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateDefault/pom.xml
@@ -7,7 +7,6 @@
   <version>1.0.0-codestart</version>
   <properties>
     <compiler-plugin.version>3.8.1-MOCK</compiler-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
     <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
index b85d117ec24f6..cc3b1dd6e7174 100644
--- a/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
+++ b/independent-projects/tools/devtools-testing/src/test/resources/__snapshots__/QuarkusCodestartGenerationTest/generateMavenWithCustomDep/pom.xml
@@ -7,7 +7,6 @@
   <version>1.0.0-codestart</version>
   <properties>
     <compiler-plugin.version>3.8.1-MOCK</compiler-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
     <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/independent-projects/tools/pom.xml b/independent-projects/tools/pom.xml
index 7a8e1c364ef3a..9eb7062c06c4b 100644
--- a/independent-projects/tools/pom.xml
+++ b/independent-projects/tools/pom.xml
@@ -56,7 +56,7 @@
         <jboss-logging.version>3.5.0.Final</jboss-logging.version>
         <maven-core.version>3.8.4</maven-core.version>
         <mockito.version>4.6.0</mockito.version>
-        <version.surefire.plugin>3.0.0-M5</version.surefire.plugin>
+        <version.surefire.plugin>3.0.0-M7</version.surefire.plugin>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
         <quarkus.version>999-SNAPSHOT</quarkus.version>
         <maven-model-helper.version>20</maven-model-helper.version>
diff --git a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json
index 4715282d018cb..2be9b230c26c2 100644
--- a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json
+++ b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-bom-quarkus-platform-descriptor-999-SNAPSHOT-999-SNAPSHOT.json
@@ -3086,7 +3086,7 @@
         "doc-root" : "https://quarkus.io",
         "rest-assured-version" : "${rest-assured.version}",
         "compiler-plugin-version" : "3.8.1",
-        "surefire-plugin-version" : "3.0.0-M5",
+        "surefire-plugin-version" : "3.0.0-M7",
         "kotlin-version" : "1.5.31",
         "scala-version" : "2.12.13",
         "scala-plugin-version" : "4.4.0",
diff --git a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json
index bcd4543a39d48..dfce692711852 100644
--- a/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json
+++ b/independent-projects/tools/registry-client/src/test/resources/catalog-config/quarkus-universe-bom-quarkus-platform-descriptor-2.0.3.Final-2.0.3.Final.json
@@ -7329,7 +7329,7 @@
         "doc-root" : "https://quarkus.io",
         "rest-assured-version" : "4.3.2",
         "compiler-plugin-version" : "3.8.1",
-        "surefire-plugin-version" : "3.0.0-M5",
+        "surefire-plugin-version" : "3.0.0-M7",
         "kotlin-version" : "1.4.32",
         "scala-version" : "2.12.13",
         "scala-plugin-version" : "4.4.0",
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
index b51e3a8d928f8..ef193e14d0353 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-docker/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
index 710a1c0a31ed1..75822f8e4b21f 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-appcds/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/pom.xml
index 4c962329c7230..4d284694e2cac 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-db2/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/pom.xml
index 8625410190416..c12ad3520b5e1 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-kafka/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/pom.xml
index 533a0e97d422f..f20a360624b3b 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mariadb/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/pom.xml
index cb915c196ffe8..96668033c6ae8 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mongo/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/pom.xml
index f9fc551ac7ab5..b4cf979b66579 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mssql/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/pom.xml
index 01a07111c97b5..c5becf2450328 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-mysql/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/pom.xml
index 21749b35049c4..8aba595dcd58e 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib-with-postgresql/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
index 2058eca2a97e5..2f111fe79dd49 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-jib/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
index f1b3102d586be..11097b1f45b8e 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-docker/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
index 292e0a71351f8..745ebd873949d 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-multiple-tags-jib/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/pom.xml
index 7ab1a946c73ef..4e63e8324c61d 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak-default-realm/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/pom.xml
index 36703d7d24e32..f6774d34d448c 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-build-with-keycloak/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/pom.xml
index 31f8831594642..c5bb013ee6964 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-jib-with-redis/pom.xml
@@ -7,7 +7,7 @@
     <version>0.1-SNAPSHOT</version>
     <properties>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <maven.compiler.source>11</maven.compiler.source>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
index a1bcb77df0cf6..d1ea6004f2bda 100644
--- a/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
+++ b/integration-tests/container-image/maven-invoker-way/src/it/container-image-push/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
index 18c391b536522..cc7a13a0b838a 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-deployment/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
index a6e4eff0c9a67..30c13fd2eaa5f 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-docker-build-and-deploy-statefulset/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
index c028427d16d5b..c09aaf0bbd66a 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-jib-build-and-deploy/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
index 26b4ed7c44d8c..6227b07b8adf3 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/kubernetes-with-existing-selectorless-manifest/pom.xml
@@ -8,7 +8,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
index 9da02b3799935..f694f2fd1d224 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/minikube-with-existing-manifest/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
index e0e38089e4c61..149d87dfb7eb9 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-docker-build-and-deploy/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
index a1202d4a6b55e..4f4db1da25c13 100644
--- a/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/maven-invoker-way/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
index 330fad55b45d0..e6e58cd44fde7 100644
--- a/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
+++ b/integration-tests/kubernetes/src/it/openshift-s2i-build-and-deploy/pom.xml
@@ -7,7 +7,7 @@
   <version>0.1-SNAPSHOT</version>
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml
index a6627b1338bc8..fce79f81b7e87 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/arc-exclude-dependencies/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml
index c3def9fef230d..664096c5a0dac 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-conflict/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml
index c3def9fef230d..664096c5a0dac 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/capabilities-missing/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml
index 1e0b3d65b8076..93efd13ef7001 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/conditional-dependencies/pom.xml
@@ -19,7 +19,7 @@
         <compiler-plugin.version>3.8.1</compiler-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     </properties>
     <modules>
         <module>quarkus-ext-a</module>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml
index 856ae04c1a14e..a86c68e721ddb 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/extension-removed-resources/pom.xml
@@ -8,14 +8,13 @@
   <version>1.0.0-SNAPSHOT</version>
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
     <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
     <quarkus.platform.version>999-SNAPSHOT</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml
index f49fdb1db6d29..e4b907547b94a 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/modules-in-profiles/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml
index 8c2935da4e258..761b5178ed831 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode-parallel/pom.xml
@@ -14,7 +14,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml
index ede0824921f92..596340d2490be 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multi-build-mode/pom.xml
@@ -13,7 +13,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
     <commons.collections.version>4.4</commons.collections.version>
     <commons.io.version>1.3.2</commons.io.version>
   </properties>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml
index af0504531f109..4e85a4dcb2c92 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multijar-module/pom.xml
@@ -14,7 +14,7 @@
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml
index 7de3fef827340..efd68f88e346b 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-classpath/pom.xml
@@ -12,7 +12,7 @@
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.version>@project.version@</quarkus.platform.version>
     <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml
index 1db6c10f9dadb..024f362a5651c 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-parent-dep/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml
index 325164b6d3aa7..c198255e13bee 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule-revision-prop/pom.xml
@@ -13,7 +13,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>${project.version}</quarkus.platform.version>
         <quarkus-plugin.version>${project.version}</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml
index 80648cfb5c413..61374b8c4194d 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/multimodule/pom.xml
@@ -12,7 +12,7 @@
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.version>@project.version@</quarkus.platform.version>
     <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml
index cf23479da47ca..27f27e613ff9f 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/project-with-extension/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml
index 4af72e39f9c47..afd42e0468ba7 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/property-overrides/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml
index a6627b1338bc8..fce79f81b7e87 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus-index-dependencies/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml
index 7580f81055cbc..c1eb87a9e9eb3 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/quarkus.package.output-directory/pom.xml
@@ -13,7 +13,7 @@
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>11</maven.compiler.target>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml
index 31be3f68b0604..d22cc9c0586d8 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/reactive-routes/pom.xml
@@ -9,7 +9,7 @@
     <version>1.0.0-SNAPSHOT</version>
 
     <properties>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <quarkus-plugin.version>999-SNAPSHOT</quarkus-plugin.version>
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml
index 0e963911a3188..eea74f5940507 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/rest-client-custom-headers-extension/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml
index d005d4c5167f3..9c69b77fa520a 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-module-dependency/pom.xml
@@ -12,7 +12,7 @@
         <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
         <quarkus.platform.version>@project.version@</quarkus.platform.version>
         <quarkus-plugin.version>@project.version@</quarkus-plugin.version>
-        <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+        <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml
index 333e129399de8..a3258dff65ca8 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-plugin-classpath-config/pom.xml
@@ -8,14 +8,13 @@
   <packaging>pom</packaging>
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
     <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
     <quarkus.platform.version>@project.version@</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
diff --git a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml
index 815fab772adf5..18533443f95d5 100644
--- a/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml
+++ b/integration-tests/maven/src/test/resources-filtered/projects/test-source-sets/pom.xml
@@ -10,7 +10,6 @@
     <build-helper-maven-plugin.version>3.3.0</build-helper-maven-plugin.version>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <dependency-plugin.version>3.2.0</dependency-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
     <maven.compiler.release>11</maven.compiler.release>
 
     <!-- General project setup -->
@@ -40,7 +39,7 @@
     <quarkus.platform.artifact-id>quarkus-bom</quarkus.platform.artifact-id>
     <quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
     <quarkus.platform.version>@project.version@</quarkus.platform.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>
@@ -216,7 +215,6 @@
               <includes>
                 <include>**/*.java</include>
               </includes>
-              <trimStackTrace>false</trimStackTrace>
               <systemPropertyVariables>
                 <native.image.path>\${project.build.directory}/\${project.build.finalName}-runner</native.image.path>
                 <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
diff --git a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
index bb1add918a2a6..87b888fa32ed0 100644
--- a/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
+++ b/integration-tests/maven/src/test/resources/__snapshots__/CreateExtensionMojoIT/testCreateStandaloneExtension/my-org-my-own-ext_pom.xml
@@ -14,12 +14,11 @@
   <properties>
     <compiler-plugin.version>3.8.1</compiler-plugin.version>
     <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
-    <failsafe.useModulePath>false</failsafe.useModulePath>
     <maven.compiler.release>11</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <quarkus.version>1.10.5.Final</quarkus.version>
-    <surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
+    <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
   </properties>
   <dependencyManagement>
     <dependencies>