From 68805e9de2384ee13e5c5858f6b239784e50a7ba Mon Sep 17 00:00:00 2001
From: sfc-gh-astachowski <antoni.stachowski@snowflake.com>
Date: Tue, 29 Oct 2024 11:20:10 +0100
Subject: [PATCH] Added explicit surefire provider

---
 FIPS/pom.xml     | 14 ++++++++++++++
 TestOnly/pom.xml |  7 +++++++
 pom.xml          | 37 ++++++++++++++++++++++---------------
 3 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/FIPS/pom.xml b/FIPS/pom.xml
index cbc6132af..f0cbadd8f 100644
--- a/FIPS/pom.xml
+++ b/FIPS/pom.xml
@@ -671,6 +671,13 @@
         <plugins>
           <plugin>
             <artifactId>maven-failsafe-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
+              </dependency>
+            </dependencies>
             <version>${version.plugin.failsafe}</version>
             <configuration>
               <argLine>
@@ -715,6 +722,13 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
+              </dependency>
+            </dependencies>
             <version>${version.plugin.failsafe}</version>
             <executions>
               <execution>
diff --git a/TestOnly/pom.xml b/TestOnly/pom.xml
index a0ba49b49..f20916ac9 100644
--- a/TestOnly/pom.xml
+++ b/TestOnly/pom.xml
@@ -406,6 +406,13 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
+              </dependency>
+            </dependencies>
             <executions>
               <execution>
                 <id>DefaultIT</id>
diff --git a/pom.xml b/pom.xml
index 133a99695..0f1bce3a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -106,6 +106,13 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
           <version>${version.plugin.failsafe}</version>
+          <dependencies>
+            <dependency>
+              <groupId>org.apache.maven.surefire</groupId>
+              <artifactId>surefire-junit-platform</artifactId>
+              <version>3.5.1</version>
+            </dependency>
+          </dependencies>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -1093,9 +1100,9 @@
             </configuration>
             <dependencies>
               <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
               </dependency>
             </dependencies>
           </plugin>
@@ -1106,9 +1113,9 @@
             </configuration>
             <dependencies>
               <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
               </dependency>
             </dependencies>
           </plugin>
@@ -1315,9 +1322,9 @@
             </configuration>
             <dependencies>
               <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
               </dependency>
             </dependencies>
             <executions>
@@ -1365,9 +1372,9 @@
             </configuration>
             <dependencies>
               <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
               </dependency>
             </dependencies>
             <executions>
@@ -1409,9 +1416,9 @@
             </configuration>
             <dependencies>
               <dependency>
-                <groupId>org.junit.jupiter</groupId>
-                <artifactId>junit-jupiter-engine</artifactId>
-                <version>${junit.version}</version>
+                <groupId>org.apache.maven.surefire</groupId>
+                <artifactId>surefire-junit-platform</artifactId>
+                <version>3.5.1</version>
               </dependency>
             </dependencies>
             <executions>