From 5720e820350e9bd5b10a174cb8c1b492f093c465 Mon Sep 17 00:00:00 2001
From: Gengliang Wang <gengliang@apache.org>
Date: Mon, 12 Dec 2022 20:12:10 -0800
Subject: [PATCH] [SPARK-41499][BUILD] Upgrade Protobuf version to 3.21.11

### 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. (https://github.com/protocolbuffers/protobuf/pull/10960)
* Mark nested builder as clean after clear is called (https://github.com/protocolbuffers/protobuf/pull/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>
---
 pom.xml                  | 2 +-
 project/SparkBuild.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 54eb92873853c..da7c8eccfceac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 2dbcea60de9e2..556f8528ea1b0 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -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"
 }