From 7d461d0fb3e08c0826b4de1913c8b48ca892b6ae Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Sat, 27 Sep 2025 15:51:12 -0700
Subject: [PATCH 1/2] [SPARK-53741][BUILD] Upgrade ORC to 2.2.1

---
 dev/deps/spark-deps-hadoop-3-hive-2.3 | 6 +++---
 pom.xml                               | 6 +++++-
 project/SparkBuild.scala              | 1 +
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 4e855737e9d99..2a6835971408a 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -232,10 +232,10 @@ opencsv/2.3//opencsv-2.3.jar
 opentracing-api/0.33.0//opentracing-api-0.33.0.jar
 opentracing-noop/0.33.0//opentracing-noop-0.33.0.jar
 opentracing-util/0.33.0//opentracing-util-0.33.0.jar
-orc-core/2.2.0/shaded-protobuf/orc-core-2.2.0-shaded-protobuf.jar
+orc-core/2.2.1/shaded-protobuf/orc-core-2.2.1-shaded-protobuf.jar
 orc-format/1.1.1/shaded-protobuf/orc-format-1.1.1-shaded-protobuf.jar
-orc-mapreduce/2.2.0/shaded-protobuf/orc-mapreduce-2.2.0-shaded-protobuf.jar
-orc-shims/2.2.0//orc-shims-2.2.0.jar
+orc-mapreduce/2.2.1/shaded-protobuf/orc-mapreduce-2.2.1-shaded-protobuf.jar
+orc-shims/2.2.1//orc-shims-2.2.1.jar
 oro/2.0.8//oro-2.0.8.jar
 osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
 paranamer/2.8.3//paranamer-2.8.3.jar
diff --git a/pom.xml b/pom.xml
index 0f7232a23a4a0..00fe37561336f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <!-- After 10.17.1.0, the minimum required version is JDK19 -->
     <derby.version>10.16.1.1</derby.version>
     <parquet.version>1.16.0</parquet.version>
-    <orc.version>2.2.0</orc.version>
+    <orc.version>2.2.1</orc.version>
     <orc.classifier>shaded-protobuf</orc.classifier>
     <jetty.version>11.0.26</jetty.version>
     <jakartaservlet.version>5.0.0</jakartaservlet.version>
@@ -382,6 +382,10 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>orc</id>
+      <url>https://repository.apache.org/content/repositories/orgapacheorc-1104/</url>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 09459671b3cc4..86393eb629f47 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -305,6 +305,7 @@ object SparkBuild extends PomBuild {
       "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/",
       DefaultMavenRepository,
       Resolver.mavenLocal,
+      "orc" at "https://repository.apache.org/content/repositories/orgapacheorc-1104/",
       Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ),
     externalResolvers := resolvers.value,

From edb53f591aee37ead4d34861689232a1b546a42f Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Wed, 1 Oct 2025 09:21:58 -0700
Subject: [PATCH 2/2] Update

---
 pom.xml                  | 4 ----
 project/SparkBuild.scala | 1 -
 2 files changed, 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 00fe37561336f..7c6e492c54bb9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -382,10 +382,6 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>orc</id>
-      <url>https://repository.apache.org/content/repositories/orgapacheorc-1104/</url>
-    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 86393eb629f47..09459671b3cc4 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -305,7 +305,6 @@ object SparkBuild extends PomBuild {
       "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/",
       DefaultMavenRepository,
       Resolver.mavenLocal,
-      "orc" at "https://repository.apache.org/content/repositories/orgapacheorc-1104/",
       Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ),
     externalResolvers := resolvers.value,