This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 6f0f5873e348 [SPARK-53894][BUILD][TESTS] Upgrade `docker-java` to 3.6.0
6f0f5873e348 is described below
commit 6f0f5873e3489653c26c048d19b33e8d1d0e847f
Author: Dongjoon Hyun <[email protected]>
AuthorDate: Mon Oct 13 21:51:54 2025 -0700
[SPARK-53894][BUILD][TESTS] Upgrade `docker-java` to 3.6.0
### What changes were proposed in this pull request?
This PR aims to upgrade `docker-java` to 3.6.0 and remove `Guava` override
hack.
### Why are the changes needed?
To use the latest and stable `docker-java` for Docker IT tests and to
simplify the test dependency by removing `Guava` override hack.
### Does this PR introduce _any_ user-facing change?
No, this is a test dependency change.
### How was this patch tested?
Pass the CIs.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #52601 from dongjoon-hyun/SPARK-53894.
Authored-by: Dongjoon Hyun <[email protected]>
Signed-off-by: Dongjoon Hyun <[email protected]>
---
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 4fec4a6d82c3..09fabdf64dba 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 c81e5b74d3cc..58a973d250b4 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 1700455d6045..b602edebe8fe 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()
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
