Skip to content

Commit 66ab715

Browse files
LuciferYangsrowen
authored andcommitted
[SPARK-42490][BUILD] Upgrade protobuf-java from 3.21.12 to 3.22.0
### What changes were proposed in this pull request? This pr aims upgrade `protobuf-java` from 3.21.12 to 3.22.0 ### Why are the changes needed? The new version bring some improvements like: - Use bit-field int values in buildPartial to skip work on unset groups of fields. (protocolbuffers/protobuf@2326aef) - Fix serialization warnings in generated code when compiling with Java 18 and above (protocolbuffers/protobuf#10561) - Enable Text format parser to skip unknown short-formed repeated fields. (protocolbuffers/protobuf@6dbd413) - Add serialVersionUID to ByteString and subclasses (protocolbuffers/protobuf#10718) and some bug fix like: - Mark default instance as immutable first to avoid race during static initialization of default instances. (protocolbuffers/protobuf#10770) - Fix Timestamps fromDate for negative 'exact second' java.sql.Timestamps (protocolbuffers/protobuf#10321) - Fix Timestamps.fromDate to correctly handle java.sql.Timestamps before unix epoch (protocolbuffers/protobuf#10126) - Fix bug in nested builder caching logic where cleared sub-field builders would remain dirty after a clear and build in a parent layer. protocolbuffers/protobuf#10624 The release notes as follows: - https://github.com/protocolbuffers/protobuf/releases/tag/v22.0 ### Does this PR introduce _any_ user-facing change? No ### How was this patch tested? Pass GitHub Actions Closes #40084 from LuciferYang/SPARK-42490. Authored-by: yangjie01 <[email protected]> Signed-off-by: Sean Owen <[email protected]>
1 parent 09d1e94 commit 66ab715

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<protobuf.hadoopDependency.version>2.5.0</protobuf.hadoopDependency.version>
125125
<!-- Actual Protobuf version in Spark modules like Spark Connect, protobuf connector, etc. -->
126126
<!-- SPARK-41247: When updating `protobuf.version`, also need to update `protoVersion` in `SparkBuild.scala` -->
127-
<protobuf.version>3.21.12</protobuf.version>
127+
<protobuf.version>3.22.0</protobuf.version>
128128
<protoc-jar-maven-plugin.version>3.11.4</protoc-jar-maven-plugin.version>
129129
<yarn.version>${hadoop.version}</yarn.version>
130130
<zookeeper.version>3.6.3</zookeeper.version>

project/SparkBuild.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ object BuildCommons {
8888

8989
// Google Protobuf version used for generating the protobuf.
9090
// SPARK-41247: needs to be consistent with `protobuf.version` in `pom.xml`.
91-
val protoVersion = "3.21.12"
91+
val protoVersion = "3.22.0"
9292
// GRPC version used for Spark Connect.
9393
val gprcVersion = "1.47.0"
9494
}

0 commit comments

Comments
 (0)