SNOW-1333078: Add explicitly surefire autodetected dependencies (#1739)

snowflakedb · Apr 29, 2024 · 2da252d · 2da252d
1 parent 6927fff
commit 2da252d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/ci/container/test_component.sh b/ci/container/test_component.sh
@@ -76,7 +76,7 @@ export MAVEN_OPTS="$MAVEN_OPTS -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=fa
 cd $SOURCE_ROOT
 
 # Avoid connection timeout on plugin dependency fetch or fail-fast when dependency cannot be fetched
-mvn --batch-mode --show-version dependency:resolve-plugins
+mvn --batch-mode --show-version dependency:go-offline
 
 for c in "${CATEGORY[@]}"; do
     c=$(echo $c | sed 's/ *$//g')

diff --git a/parent-pom.xml b/parent-pom.xml
@@ -488,6 +488,18 @@
         <version>${awaitility.version}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>surefire-junit4</artifactId>
+        <version>${version.plugin.surefire}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.maven.surefire</groupId>
+        <artifactId>common-junit48</artifactId>
+        <version>${version.plugin.surefire}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -725,5 +737,14 @@
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>
     </dependency>
+    <!-- surefire dependencies are autodetected by the test plugins - we want to have them installed explicitly -->
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>surefire-junit4</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.surefire</groupId>
+      <artifactId>common-junit48</artifactId>
+    </dependency>
   </dependencies>
 </project>