Skip to content

Commit

Permalink
[SPARK-41499][BUILD] Upgrade Protobuf version to 3.21.11
Browse files Browse the repository at this point in the history
### What changes were proposed in this pull request?

Upgrade Protobuf version to 3.21.11

### Why are the changes needed?

There are some bug fixes in the latest release https://github.com/protocolbuffers/protobuf/releases:
* Use bit-field int values in buildPartial to skip work on unset groups of fields. (protocolbuffers/protobuf#10960)
* Mark nested builder as clean after clear is called (protocolbuffers/protobuf#10984)

### Does this PR introduce _any_ user-facing change?

No

### How was this patch tested?

GA tests

Closes #39042 from gengliangwang/upgradeProtobuf.

Authored-by: Gengliang Wang <gengliang@apache.org>
Signed-off-by: Gengliang Wang <gengliang@apache.org>
  • Loading branch information
gengliangwang committed Dec 13, 2022
1 parent f590f87 commit 5720e82
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<protobuf.hadoopDependency.version>2.5.0</protobuf.hadoopDependency.version>
<!-- Actual Protobuf version in Spark modules like Spark Connect, protobuf connector, etc. -->
<!-- SPARK-41247: When updating `protobuf.version`, also need to update `protoVersion` in `SparkBuild.scala` -->
<protobuf.version>3.21.9</protobuf.version>
<protobuf.version>3.21.11</protobuf.version>
<protoc-jar-maven-plugin.version>3.11.4</protoc-jar-maven-plugin.version>
<yarn.version>${hadoop.version}</yarn.version>
<zookeeper.version>3.6.3</zookeeper.version>
Expand Down
2 changes: 1 addition & 1 deletion project/SparkBuild.scala
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ object BuildCommons {

// Google Protobuf version used for generating the protobuf.
// SPARK-41247: needs to be consistent with `protobuf.version` in `pom.xml`.
val protoVersion = "3.21.9"
val protoVersion = "3.21.11"
// GRPC version used for Spark Connect.
val gprcVersion = "1.47.0"
}
Expand Down

0 comments on commit 5720e82

Please sign in to comment.