From 9ed2e0cdf3d7a3c2e10eaa38a9661dec6d659e51 Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Tue, 1 Jul 2025 07:53:53 -0700
Subject: [PATCH 1/2] Test ORC 1.9.7 RC0

---
 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 dbf0cb34c5353..b4034c171fd3a 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -212,9 +212,9 @@ 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/1.9.6/shaded-protobuf/orc-core-1.9.6-shaded-protobuf.jar
-orc-mapreduce/1.9.6/shaded-protobuf/orc-mapreduce-1.9.6-shaded-protobuf.jar
-orc-shims/1.9.6//orc-shims-1.9.6.jar
+orc-core/1.9.7/shaded-protobuf/orc-core-1.9.7-shaded-protobuf.jar
+orc-mapreduce/1.9.7/shaded-protobuf/orc-mapreduce-1.9.7-shaded-protobuf.jar
+orc-shims/1.9.7//orc-shims-1.9.7.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//paranamer-2.8.jar
diff --git a/pom.xml b/pom.xml
index 4f912329beed6..92a3b503ea032 100644
--- a/pom.xml
+++ b/pom.xml
@@ -141,7 +141,7 @@
     <!-- After 10.15.1.3, the minimum required version is JDK9 -->
     <derby.version>10.14.2.0</derby.version>
     <parquet.version>1.13.1</parquet.version>
-    <orc.version>1.9.6</orc.version>
+    <orc.version>1.9.7</orc.version>
     <orc.classifier>shaded-protobuf</orc.classifier>
     <jetty.version>9.4.56.v20240826</jetty.version>
     <jakartaservlet.version>4.0.3</jakartaservlet.version>
@@ -348,6 +348,10 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>staging</id>
+      <url>https://repository.apache.org/content/repositories/orgapacheorc-1099/</url>
+    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 53c991652905a..0d7cd4235fa91 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -315,6 +315,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-1099/",
       Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ),
     externalResolvers := resolvers.value,

From ed24c5a5ea9a73d8899eba52d725c3a198fcdfab Mon Sep 17 00:00:00 2001
From: Dongjoon Hyun <dongjoon@apache.org>
Date: Fri, 4 Jul 2025 15:21:19 -0700
Subject: [PATCH 2/2] Use official one

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

diff --git a/pom.xml b/pom.xml
index 92a3b503ea032..3a4530374bfee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -348,10 +348,6 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
-    <repository>
-      <id>staging</id>
-      <url>https://repository.apache.org/content/repositories/orgapacheorc-1099/</url>
-    </repository>
   </repositories>
   <pluginRepositories>
     <pluginRepository>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index 0d7cd4235fa91..53c991652905a 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -315,7 +315,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-1099/",
       Resolver.file("ivyLocal", file(Path.userHome.absolutePath + "/.ivy2/local"))(Resolver.ivyStylePatterns)
     ),
     externalResolvers := resolvers.value,