From 50ea618a616a5953c422bbb0799f3c5707e1e183 Mon Sep 17 00:00:00 2001
From: Vitaliy Dmitriev <v.dmitriev@arenadata.io>
Date: Mon, 17 Nov 2025 14:01:11 +0300
Subject: [PATCH 1/3] ADH-7079: set java.version 17 in pom.xml

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 93722888374b6..5f08c809ce7c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>1.8</java.version>
+    <java.version>17</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.version>3.9.6</maven.version>

From 0f6af855ebfef14e9e64b3d20753bf907b3f6633 Mon Sep 17 00:00:00 2001
From: Vitaliy Dmitriev <v.dmitriev@arenadata.io>
Date: Mon, 17 Nov 2025 19:19:21 +0300
Subject: [PATCH 2/3] ADH-7079: set io.grpc.version to 1.76.0 and
 protobuf.version to 3.25.8 (to fix spark connect issues)

---
 connector/connect/server/pom.xml | 5 +++++
 pom.xml                          | 4 ++--
 project/SparkBuild.scala         | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/connector/connect/server/pom.xml b/connector/connect/server/pom.xml
index aeadbacb7c692..7195ebbb46254 100644
--- a/connector/connect/server/pom.xml
+++ b/connector/connect/server/pom.xml
@@ -200,6 +200,11 @@
       <artifactId>grpc-stub</artifactId>
       <version>${io.grpc.version}</version>
     </dependency>
+    <dependency>
+        <groupId>io.grpc</groupId>
+        <artifactId>grpc-protobuf-lite</artifactId>
+        <version>${io.grpc.version}</version>
+    </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-codec-http2</artifactId>
diff --git a/pom.xml b/pom.xml
index 5f08c809ce7c5..bd244fe095e44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -124,7 +124,7 @@
     <!-- make sure to update IsolatedClientLoader whenever this version is changed -->
     <hadoop.version>3.3.6</hadoop.version>
     <!-- SPARK-41247: When updating `protobuf.version`, also need to update `protoVersion` in `SparkBuild.scala` -->
-    <protobuf.version>3.25.1</protobuf.version>
+    <protobuf.version>3.25.8</protobuf.version>
     <protoc-jar-maven-plugin.version>3.11.4</protoc-jar-maven-plugin.version>
     <yarn.version>${hadoop.version}</yarn.version>
     <zookeeper.version>3.8.4</zookeeper.version>
@@ -290,7 +290,7 @@
     <!-- Version used in Connect -->
     <connect.guava.version>32.0.1-jre</connect.guava.version>
     <guava.failureaccess.version>1.0.1</guava.failureaccess.version>
-    <io.grpc.version>1.56.0</io.grpc.version>
+    <io.grpc.version>1.76.0</io.grpc.version>
     <mima.version>1.1.2</mima.version>
     <tomcat.annotations.api.version>6.0.53</tomcat.annotations.api.version>
 
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 3211f87eab4b6..3ac39307f0793 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -89,9 +89,9 @@ 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.25.1"
+  val protoVersion = "3.25.8"
   // GRPC version used for Spark Connect.
-  val grpcVersion = "1.56.0"
+  val grpcVersion = "1.76.0"
 }
 
 object SparkBuild extends PomBuild {

From 4a9ba117ade17903888d8d65ce0d0d803efd8567 Mon Sep 17 00:00:00 2001
From: Vitaliy Dmitriev <v.dmitriev@arenadata.io>
Date: Fri, 21 Nov 2025 19:52:42 +0300
Subject: [PATCH 3/3] ADH-7079-java17: revert java version to 1.8

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index bd244fe095e44..82a6da5a6c9a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,7 +112,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-    <java.version>17</java.version>
+    <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
     <maven.compiler.target>${java.version}</maven.compiler.target>
     <maven.version>3.9.6</maven.version>