From b43d6c3b30a2bf2a764f17d5eafac55e0b1e0b59 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Mon, 13 Oct 2025 19:23:14 -0700
Subject: [PATCH] [SPARK-53894][BUILD][TESTS] Upgrade `docker-java` to 3.6.0

---
 connector/docker-integration-tests/pom.xml | 1 -
 pom.xml                                    | 4 ++--
 project/SparkBuild.scala                   | 4 +---
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/connector/docker-integration-tests/pom.xml b/connector/docker-integration-tests/pom.xml
index 4fec4a6d82c32..09fabdf64dba8 100644
--- a/connector/docker-integration-tests/pom.xml
+++ b/connector/docker-integration-tests/pom.xml
@@ -39,7 +39,6 @@
     <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
-      <version>33.1.0-jre</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/pom.xml b/pom.xml
index c81e5b74d3cc1..58a973d250b4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1318,7 +1318,7 @@
       <dependency>
         <groupId>com.github.docker-java</groupId>
         <artifactId>docker-java</artifactId>
-        <version>3.4.0</version>
+        <version>3.6.0</version>
         <scope>test</scope>
         <exclusions>
           <exclusion>
@@ -1338,7 +1338,7 @@
       <dependency>
         <groupId>com.github.docker-java</groupId>
         <artifactId>docker-java-transport-zerodep</artifactId>
-        <version>3.4.0</version>
+        <version>3.6.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 1700455d60455..b602edebe8fe0 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -985,9 +985,7 @@ object Unsafe {
 
 object DockerIntegrationTests {
   // This serves to override the override specified in DependencyOverrides:
-  lazy val settings = Seq(
-    dependencyOverrides += "com.google.guava" % "guava" % "33.1.0-jre"
-  )
+  lazy val settings = Seq()
 }
 
 /**