From c963538b1608cb24ed9a9fd8b32d3eef2dc6ad38 Mon Sep 17 00:00:00 2001
From: Keshav Dandeva <keshavdandeva@google.com>
Date: Tue, 28 Jul 2026 14:11:27 +0000
Subject: [PATCH 1/2] fix(bigquery-jdbc): add preferIPv4Stack to argLine for
 Kokoro reliability

---
 java-bigquery-jdbc/pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/java-bigquery-jdbc/pom.xml b/java-bigquery-jdbc/pom.xml
index 9ea2cfabf539..ea71d6af6248 100644
--- a/java-bigquery-jdbc/pom.xml
+++ b/java-bigquery-jdbc/pom.xml
@@ -47,6 +47,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.5.2</version>
         <configuration>
+          <argLine>-Djava.net.preferIPv4Stack=true</argLine>
           <skip>${skipSurefire}</skip>
           <systemPropertyVariables>
             <JDBC_TESTS>true</JDBC_TESTS>
@@ -57,6 +58,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
         <configuration>
+          <argLine>-Djava.net.preferIPv4Stack=true</argLine>
           <systemPropertyVariables>
             <JDBC_TESTS>true</JDBC_TESTS>
           </systemPropertyVariables>
@@ -477,14 +479,14 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+              <argLine>-Djava.net.preferIPv4Stack=true --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
             </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
             <configuration>
-              <argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+              <argLine>-Djava.net.preferIPv4Stack=true --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
             </configuration>
           </plugin>
         </plugins>

From 4a315bd59588ca32b459545d6339c36de75d39a0 Mon Sep 17 00:00:00 2001
From: Keshav Dandeva <keshavdandeva@google.com>
Date: Tue, 28 Jul 2026 14:19:46 +0000
Subject: [PATCH 2/2] address pr feedback

---
 java-bigquery-jdbc/pom.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/java-bigquery-jdbc/pom.xml b/java-bigquery-jdbc/pom.xml
index ea71d6af6248..764b9111f69a 100644
--- a/java-bigquery-jdbc/pom.xml
+++ b/java-bigquery-jdbc/pom.xml
@@ -32,6 +32,7 @@
     <github.global.server>github</github.global.server>
     <site.installationModule>google-cloud-bigquery-jdbc</site.installationModule>
     <skipShade>false</skipShade>
+    <preferIpv4.test.argLine>-Djava.net.preferIPv4Stack=true</preferIpv4.test.argLine>
   </properties>
 
   <build>
@@ -47,7 +48,7 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <version>3.5.2</version>
         <configuration>
-          <argLine>-Djava.net.preferIPv4Stack=true</argLine>
+          <argLine>@{argLine} ${preferIpv4.test.argLine}</argLine>
           <skip>${skipSurefire}</skip>
           <systemPropertyVariables>
             <JDBC_TESTS>true</JDBC_TESTS>
@@ -58,7 +59,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
         <configuration>
-          <argLine>-Djava.net.preferIPv4Stack=true</argLine>
+          <argLine>@{argLine} ${preferIpv4.test.argLine}</argLine>
           <systemPropertyVariables>
             <JDBC_TESTS>true</JDBC_TESTS>
           </systemPropertyVariables>
@@ -479,14 +480,14 @@
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>
-              <argLine>-Djava.net.preferIPv4Stack=true --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+              <argLine>@{argLine} ${preferIpv4.test.argLine} --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
             </configuration>
           </plugin>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-failsafe-plugin</artifactId>
             <configuration>
-              <argLine>-Djava.net.preferIPv4Stack=true --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
+              <argLine>@{argLine} ${preferIpv4.test.argLine} --add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</argLine>
             </configuration>
           </plugin>
         </plugins>