Skip to content

Commit 7499de3

Browse files
pan3793dongjoon-hyun
authored andcommitted
[SPARK-54239][BUILD] Bump Guava 33.4.8
### What changes were proposed in this pull request? This PR bumps Guava from 33.4.0 to 33.4.8, the latest patch version of 33.4 serial. The release notes can be found at - https://github.com/google/guava/releases/tag/v33.4.8 - https://github.com/google/guava/releases/tag/v33.4.1 (this contains more info) As mentioned in the release notes, it migrates from jsr305 to jspecify, thus causes some transitive deps changes https://mvnrepository.com/artifact/com.google.guava/guava/33.4.0-jre https://mvnrepository.com/artifact/com.google.guava/guava/33.4.8-jre ```patch - com.google.code.findbugs:jsr305:3.0.2 - org.checkerframework:checker-qual:3.34.0 + org.jspecify:jspecify:1.0.0 ``` Note, the transitive deps change does not affect the Maven package because we use the white list to declare the included deps for shaded jars. ### Why are the changes needed? The current Guava 33.4.0 used by Spark was released in Dec 17, 2024. This upgrades it to the latest patched version (instead of 33.5.0) to make it align with gRPC 1.76.0 (this is not enforced, but nice to have) https://mvnrepository.com/artifact/io.grpc/grpc-api/1.76.0 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GHA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #52939 from pan3793/guava-33.4.8. Authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Dongjoon Hyun <dongjoon@apache.org> (cherry picked from commit 9289c43) Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
1 parent 705a3a2 commit 7499de3

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

dev/deps/spark-deps-hadoop-3-hive-2.3

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,12 @@ derbyshared/10.16.1.1//derbyshared-10.16.1.1.jar
6262
derbytools/10.16.1.1//derbytools-10.16.1.1.jar
6363
dropwizard-metrics-hadoop-metrics2-reporter/0.1.2//dropwizard-metrics-hadoop-metrics2-reporter-0.1.2.jar
6464
esdk-obs-java/3.20.4.2//esdk-obs-java-3.20.4.2.jar
65-
failureaccess/1.0.2//failureaccess-1.0.2.jar
65+
failureaccess/1.0.3//failureaccess-1.0.3.jar
6666
flatbuffers-java/25.2.10//flatbuffers-java-25.2.10.jar
6767
gcs-connector/hadoop3-2.2.28/shaded/gcs-connector-hadoop3-2.2.28-shaded.jar
6868
gmetric4j/1.0.10//gmetric4j-1.0.10.jar
6969
gson/2.11.0//gson-2.11.0.jar
70-
guava/33.4.0-jre//guava-33.4.0-jre.jar
70+
guava/33.4.8-jre//guava-33.4.8-jre.jar
7171
hadoop-aliyun/3.4.2//hadoop-aliyun-3.4.2.jar
7272
hadoop-annotations/3.4.2//hadoop-annotations-3.4.2.jar
7373
hadoop-aws/3.4.2//hadoop-aws-3.4.2.jar

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@
198198
<!-- org.apache.commons/commons-pool2/-->
199199
<commons-pool2.version>2.12.1</commons-pool2.version>
200200
<datanucleus-core.version>4.1.17</datanucleus-core.version>
201-
<guava.version>33.4.0-jre</guava.version>
202-
<guava.failureaccess.version>1.0.2</guava.failureaccess.version>
201+
<guava.version>33.4.8-jre</guava.version>
202+
<guava.failureaccess.version>1.0.3</guava.failureaccess.version>
203203
<gson.version>2.11.0</gson.version>
204204
<janino.version>3.1.9</janino.version>
205205
<jersey.version>3.0.18</jersey.version>

project/SparkBuild.scala

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -881,17 +881,17 @@ object SparkConnectJdbc {
881881
// Exclude `scala-library` from assembly.
882882
(assembly / assemblyPackageScala / assembleArtifact) := false,
883883

884-
// Exclude `pmml-model-*.jar`, `scala-collection-compat_*.jar`, `jsr305-*.jar`,
884+
// Exclude `pmml-model-*.jar`, `scala-collection-compat_*.jar`, `jspecify-*.jar`,
885885
// `error_prone_annotations-*.jar`, `listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar`,
886-
// `j2objc-annotations-*.jar`, `checker-qual-*.jar` and `unused-1.0.0.jar` from assembly.
886+
// `j2objc-annotations-*.jar` and `unused-1.0.0.jar` from assembly.
887887
(assembly / assemblyExcludedJars) := {
888888
val cp = (assembly / fullClasspath).value
889889
cp filter { v =>
890890
val name = v.data.getName
891891
name.startsWith("pmml-model-") || name.startsWith("scala-collection-compat_") ||
892-
name.startsWith("jsr305-") || name.startsWith("error_prone_annotations") ||
892+
name.startsWith("jspecify-") || name.startsWith("error_prone_annotations") ||
893893
name.startsWith("listenablefuture") || name.startsWith("j2objc-annotations") ||
894-
name.startsWith("checker-qual") || name == "unused-1.0.0.jar"
894+
name == "unused-1.0.0.jar"
895895
}
896896
},
897897
// Only include `spark-connect-client-jdbc-*.jar`
@@ -971,17 +971,17 @@ object SparkConnectClient {
971971
// Exclude `scala-library` from assembly.
972972
(assembly / assemblyPackageScala / assembleArtifact) := false,
973973

974-
// Exclude `pmml-model-*.jar`, `scala-collection-compat_*.jar`, `jsr305-*.jar`,
974+
// Exclude `pmml-model-*.jar`, `scala-collection-compat_*.jar`, `jspecify-*.jar`,
975975
// `error_prone_annotations-*.jar`, `listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar`,
976-
// `j2objc-annotations-*.jar`, `checker-qual-*.jar` and `unused-1.0.0.jar` from assembly.
976+
// `j2objc-annotations-*.jar` and `unused-1.0.0.jar` from assembly.
977977
(assembly / assemblyExcludedJars) := {
978978
val cp = (assembly / fullClasspath).value
979979
cp filter { v =>
980980
val name = v.data.getName
981981
name.startsWith("pmml-model-") || name.startsWith("scala-collection-compat_") ||
982-
name.startsWith("jsr305-") || name.startsWith("error_prone_annotations") ||
982+
name.startsWith("jspecify-") || name.startsWith("error_prone_annotations") ||
983983
name.startsWith("listenablefuture") || name.startsWith("j2objc-annotations") ||
984-
name.startsWith("checker-qual") || name == "unused-1.0.0.jar"
984+
name == "unused-1.0.0.jar"
985985
}
986986
},
987987

0 commit comments

Comments
 (0)