From de95744ad2c4d998418fc3b19516244cb4c0e9b6 Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Thu, 27 Jul 2023 11:21:17 +0800
Subject: [PATCH 1/8] [SPARK-44563][BUILD] Upgrade Apache Arrow to 13.0.0

---
 dev/deps/spark-deps-hadoop-3-hive-2.3 | 8 ++++----
 pom.xml                               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 251c8174fcc78..8b1d8c45a9763 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -16,10 +16,10 @@ antlr4-runtime/4.9.3//antlr4-runtime-4.9.3.jar
 aopalliance-repackaged/2.6.1//aopalliance-repackaged-2.6.1.jar
 arpack/3.0.3//arpack-3.0.3.jar
 arpack_combined_all/0.1//arpack_combined_all-0.1.jar
-arrow-format/12.0.1//arrow-format-12.0.1.jar
-arrow-memory-core/12.0.1//arrow-memory-core-12.0.1.jar
-arrow-memory-netty/12.0.1//arrow-memory-netty-12.0.1.jar
-arrow-vector/12.0.1//arrow-vector-12.0.1.jar
+arrow-format/13.0.0//arrow-format-13.0.0.jar
+arrow-memory-core/13.0.0//arrow-memory-core-13.0.0.jar
+arrow-memory-netty/13.0.0//arrow-memory-netty-13.0.0.jar
+arrow-vector/13.0.0//arrow-vector-13.0.0.jar
 audience-annotations/0.5.0//audience-annotations-0.5.0.jar
 avro-ipc/1.11.2//avro-ipc-1.11.2.jar
 avro-mapred/1.11.2//avro-mapred-1.11.2.jar
diff --git a/pom.xml b/pom.xml
index 78dc8c3c7e08a..e5dff8dea68e8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -225,7 +225,7 @@
     If you are changing Arrow version specification, please check
     ./python/pyspark/sql/pandas/utils.py, and ./python/setup.py too.
     -->
-    <arrow.version>12.0.1</arrow.version>
+    <arrow.version>13.0.0</arrow.version>
     <ammonite.version>2.5.9</ammonite.version>
 
     <!-- org.fusesource.leveldbjni will be used except on arm64 platform. -->

From 9699c66a53f3dbf287e2b3552b3319afef08c05f Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Thu, 27 Jul 2023 11:53:03 +0800
Subject: [PATCH 2/8] [SPARK-44563][BUILD] Upgrade Apache Arrow to 13.0.0

---
 dev/deps/spark-deps-hadoop-3-hive-2.3 | 36 +++++++++++++--------------
 pom.xml                               | 17 +++++++++----
 project/SparkBuild.scala              |  1 +
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 8b1d8c45a9763..e3ad6c9131148 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -183,24 +183,24 @@ metrics-jmx/4.2.19//metrics-jmx-4.2.19.jar
 metrics-json/4.2.19//metrics-json-4.2.19.jar
 metrics-jvm/4.2.19//metrics-jvm-4.2.19.jar
 minlog/1.3.0//minlog-1.3.0.jar
-netty-all/4.1.93.Final//netty-all-4.1.93.Final.jar
-netty-buffer/4.1.93.Final//netty-buffer-4.1.93.Final.jar
-netty-codec-http/4.1.93.Final//netty-codec-http-4.1.93.Final.jar
-netty-codec-http2/4.1.93.Final//netty-codec-http2-4.1.93.Final.jar
-netty-codec-socks/4.1.93.Final//netty-codec-socks-4.1.93.Final.jar
-netty-codec/4.1.93.Final//netty-codec-4.1.93.Final.jar
-netty-common/4.1.93.Final//netty-common-4.1.93.Final.jar
-netty-handler-proxy/4.1.93.Final//netty-handler-proxy-4.1.93.Final.jar
-netty-handler/4.1.93.Final//netty-handler-4.1.93.Final.jar
-netty-resolver/4.1.93.Final//netty-resolver-4.1.93.Final.jar
-netty-transport-classes-epoll/4.1.93.Final//netty-transport-classes-epoll-4.1.93.Final.jar
-netty-transport-classes-kqueue/4.1.93.Final//netty-transport-classes-kqueue-4.1.93.Final.jar
-netty-transport-native-epoll/4.1.93.Final/linux-aarch_64/netty-transport-native-epoll-4.1.93.Final-linux-aarch_64.jar
-netty-transport-native-epoll/4.1.93.Final/linux-x86_64/netty-transport-native-epoll-4.1.93.Final-linux-x86_64.jar
-netty-transport-native-kqueue/4.1.93.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.93.Final-osx-aarch_64.jar
-netty-transport-native-kqueue/4.1.93.Final/osx-x86_64/netty-transport-native-kqueue-4.1.93.Final-osx-x86_64.jar
-netty-transport-native-unix-common/4.1.93.Final//netty-transport-native-unix-common-4.1.93.Final.jar
-netty-transport/4.1.93.Final//netty-transport-4.1.93.Final.jar
+netty-all/4.1.95.Final//netty-all-4.1.95.Final.jar
+netty-buffer/4.1.95.Final//netty-buffer-4.1.95.Final.jar
+netty-codec-http/4.1.95.Final//netty-codec-http-4.1.95.Final.jar
+netty-codec-http2/4.1.95.Final//netty-codec-http2-4.1.95.Final.jar
+netty-codec-socks/4.1.95.Final//netty-codec-socks-4.1.95.Final.jar
+netty-codec/4.1.95.Final//netty-codec-4.1.95.Final.jar
+netty-common/4.1.95.Final//netty-common-4.1.95.Final.jar
+netty-handler-proxy/4.1.95.Final//netty-handler-proxy-4.1.95.Final.jar
+netty-handler/4.1.95.Final//netty-handler-4.1.95.Final.jar
+netty-resolver/4.1.95.Final//netty-resolver-4.1.95.Final.jar
+netty-transport-classes-epoll/4.1.95.Final//netty-transport-classes-epoll-4.1.95.Final.jar
+netty-transport-classes-kqueue/4.1.95.Final//netty-transport-classes-kqueue-4.1.95.Final.jar
+netty-transport-native-epoll/4.1.95.Final/linux-aarch_64/netty-transport-native-epoll-4.1.95.Final-linux-aarch_64.jar
+netty-transport-native-epoll/4.1.95.Final/linux-x86_64/netty-transport-native-epoll-4.1.95.Final-linux-x86_64.jar
+netty-transport-native-kqueue/4.1.95.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.95.Final-osx-aarch_64.jar
+netty-transport-native-kqueue/4.1.95.Final/osx-x86_64/netty-transport-native-kqueue-4.1.95.Final-osx-x86_64.jar
+netty-transport-native-unix-common/4.1.95.Final//netty-transport-native-unix-common-4.1.95.Final.jar
+netty-transport/4.1.95.Final//netty-transport-4.1.95.Final.jar
 objenesis/3.3//objenesis-3.3.jar
 okhttp/3.12.12//okhttp-3.12.12.jar
 okio/1.15.0//okio-1.15.0.jar
diff --git a/pom.xml b/pom.xml
index e5dff8dea68e8..5d4770e4993ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,11 +216,7 @@
     <commons-cli.version>1.5.0</commons-cli.version>
     <bouncycastle.version>1.70</bouncycastle.version>
     <tink.version>1.9.0</tink.version>
-    <!--
-      Please don't upgrade the version to 4.1.94.Final,
-      it needs to wait for `arrow-memory-netty` to be greater than 12.0.1.
-    -->
-    <netty.version>4.1.93.Final</netty.version>
+    <netty.version>4.1.95.Final</netty.version>
     <!--
     If you are changing Arrow version specification, please check
     ./python/pyspark/sql/pandas/utils.py, and ./python/setup.py too.
@@ -316,6 +312,17 @@
     </extraJavaTestArgs>
   </properties>
   <repositories>
+    <repository>
+      <id>asf-staging</id>
+      <name>ASF</name>
+      <url>https://repository.apache.org/content/groups/staging/</url>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
     <repository>
       <id>gcs-maven-central-mirror</id>
       <!--
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index e585d5dd2b25c..922541a0cf63f 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -309,6 +309,7 @@ object SparkBuild extends PomBuild {
     resolvers := Seq(
       // Google Mirror of Maven Central, placed first so that it's used instead of flaky Maven Central.
       // See https://storage-download.googleapis.com/maven-central/index.html for more info.
+      "asf-staging" at "https://repository.apache.org/content/groups/staging/",
       "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/",
       DefaultMavenRepository,
       Resolver.mavenLocal,

From 263f0bdea7d29a46f066379a3ba1db5d82e1d60f Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Fri, 28 Jul 2023 09:42:38 +0800
Subject: [PATCH 3/8] [SPARK-44563][BUILD] Upgrade Arrow to 13.0.0 & Netty to
 4.1.96.Final

---
 dev/deps/spark-deps-hadoop-3-hive-2.3 | 36 +++++++++++++--------------
 pom.xml                               |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index e3ad6c9131148..c441656f87bb5 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -183,24 +183,24 @@ metrics-jmx/4.2.19//metrics-jmx-4.2.19.jar
 metrics-json/4.2.19//metrics-json-4.2.19.jar
 metrics-jvm/4.2.19//metrics-jvm-4.2.19.jar
 minlog/1.3.0//minlog-1.3.0.jar
-netty-all/4.1.95.Final//netty-all-4.1.95.Final.jar
-netty-buffer/4.1.95.Final//netty-buffer-4.1.95.Final.jar
-netty-codec-http/4.1.95.Final//netty-codec-http-4.1.95.Final.jar
-netty-codec-http2/4.1.95.Final//netty-codec-http2-4.1.95.Final.jar
-netty-codec-socks/4.1.95.Final//netty-codec-socks-4.1.95.Final.jar
-netty-codec/4.1.95.Final//netty-codec-4.1.95.Final.jar
-netty-common/4.1.95.Final//netty-common-4.1.95.Final.jar
-netty-handler-proxy/4.1.95.Final//netty-handler-proxy-4.1.95.Final.jar
-netty-handler/4.1.95.Final//netty-handler-4.1.95.Final.jar
-netty-resolver/4.1.95.Final//netty-resolver-4.1.95.Final.jar
-netty-transport-classes-epoll/4.1.95.Final//netty-transport-classes-epoll-4.1.95.Final.jar
-netty-transport-classes-kqueue/4.1.95.Final//netty-transport-classes-kqueue-4.1.95.Final.jar
-netty-transport-native-epoll/4.1.95.Final/linux-aarch_64/netty-transport-native-epoll-4.1.95.Final-linux-aarch_64.jar
-netty-transport-native-epoll/4.1.95.Final/linux-x86_64/netty-transport-native-epoll-4.1.95.Final-linux-x86_64.jar
-netty-transport-native-kqueue/4.1.95.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.95.Final-osx-aarch_64.jar
-netty-transport-native-kqueue/4.1.95.Final/osx-x86_64/netty-transport-native-kqueue-4.1.95.Final-osx-x86_64.jar
-netty-transport-native-unix-common/4.1.95.Final//netty-transport-native-unix-common-4.1.95.Final.jar
-netty-transport/4.1.95.Final//netty-transport-4.1.95.Final.jar
+netty-all/4.1.96.Final//netty-all-4.1.96.Final.jar
+netty-buffer/4.1.96.Final//netty-buffer-4.1.96.Final.jar
+netty-codec-http/4.1.96.Final//netty-codec-http-4.1.96.Final.jar
+netty-codec-http2/4.1.96.Final//netty-codec-http2-4.1.96.Final.jar
+netty-codec-socks/4.1.96.Final//netty-codec-socks-4.1.96.Final.jar
+netty-codec/4.1.96.Final//netty-codec-4.1.96.Final.jar
+netty-common/4.1.96.Final//netty-common-4.1.96.Final.jar
+netty-handler-proxy/4.1.96.Final//netty-handler-proxy-4.1.96.Final.jar
+netty-handler/4.1.96.Final//netty-handler-4.1.96.Final.jar
+netty-resolver/4.1.96.Final//netty-resolver-4.1.96.Final.jar
+netty-transport-classes-epoll/4.1.96.Final//netty-transport-classes-epoll-4.1.96.Final.jar
+netty-transport-classes-kqueue/4.1.96.Final//netty-transport-classes-kqueue-4.1.96.Final.jar
+netty-transport-native-epoll/4.1.96.Final/linux-aarch_64/netty-transport-native-epoll-4.1.96.Final-linux-aarch_64.jar
+netty-transport-native-epoll/4.1.96.Final/linux-x86_64/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar
+netty-transport-native-kqueue/4.1.96.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.96.Final-osx-aarch_64.jar
+netty-transport-native-kqueue/4.1.96.Final/osx-x86_64/netty-transport-native-kqueue-4.1.96.Final-osx-x86_64.jar
+netty-transport-native-unix-common/4.1.96.Final//netty-transport-native-unix-common-4.1.96.Final.jar
+netty-transport/4.1.96.Final//netty-transport-4.1.96.Final.jar
 objenesis/3.3//objenesis-3.3.jar
 okhttp/3.12.12//okhttp-3.12.12.jar
 okio/1.15.0//okio-1.15.0.jar
diff --git a/pom.xml b/pom.xml
index 5d4770e4993ee..2460ac44abd7d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
     <commons-cli.version>1.5.0</commons-cli.version>
     <bouncycastle.version>1.70</bouncycastle.version>
     <tink.version>1.9.0</tink.version>
-    <netty.version>4.1.95.Final</netty.version>
+    <netty.version>4.1.96.Final</netty.version>
     <!--
     If you are changing Arrow version specification, please check
     ./python/pyspark/sql/pandas/utils.py, and ./python/setup.py too.

From 70ac9c1c0fbc19ec11e0fecc8ab3a3f8212db903 Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Fri, 28 Jul 2023 11:00:48 +0800
Subject: [PATCH 4/8] Revert "[SPARK-44563][BUILD] Upgrade Arrow to 13.0.0 &
 Netty to 4.1.96.Final"

This reverts commit 263f0bdea7d29a46f066379a3ba1db5d82e1d60f.
---
 dev/deps/spark-deps-hadoop-3-hive-2.3 | 36 +++++++++++++--------------
 pom.xml                               |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/dev/deps/spark-deps-hadoop-3-hive-2.3 b/dev/deps/spark-deps-hadoop-3-hive-2.3
index 8d394f3114999..8fdd074f782ab 100644
--- a/dev/deps/spark-deps-hadoop-3-hive-2.3
+++ b/dev/deps/spark-deps-hadoop-3-hive-2.3
@@ -183,24 +183,24 @@ metrics-jmx/4.2.19//metrics-jmx-4.2.19.jar
 metrics-json/4.2.19//metrics-json-4.2.19.jar
 metrics-jvm/4.2.19//metrics-jvm-4.2.19.jar
 minlog/1.3.0//minlog-1.3.0.jar
-netty-all/4.1.96.Final//netty-all-4.1.96.Final.jar
-netty-buffer/4.1.96.Final//netty-buffer-4.1.96.Final.jar
-netty-codec-http/4.1.96.Final//netty-codec-http-4.1.96.Final.jar
-netty-codec-http2/4.1.96.Final//netty-codec-http2-4.1.96.Final.jar
-netty-codec-socks/4.1.96.Final//netty-codec-socks-4.1.96.Final.jar
-netty-codec/4.1.96.Final//netty-codec-4.1.96.Final.jar
-netty-common/4.1.96.Final//netty-common-4.1.96.Final.jar
-netty-handler-proxy/4.1.96.Final//netty-handler-proxy-4.1.96.Final.jar
-netty-handler/4.1.96.Final//netty-handler-4.1.96.Final.jar
-netty-resolver/4.1.96.Final//netty-resolver-4.1.96.Final.jar
-netty-transport-classes-epoll/4.1.96.Final//netty-transport-classes-epoll-4.1.96.Final.jar
-netty-transport-classes-kqueue/4.1.96.Final//netty-transport-classes-kqueue-4.1.96.Final.jar
-netty-transport-native-epoll/4.1.96.Final/linux-aarch_64/netty-transport-native-epoll-4.1.96.Final-linux-aarch_64.jar
-netty-transport-native-epoll/4.1.96.Final/linux-x86_64/netty-transport-native-epoll-4.1.96.Final-linux-x86_64.jar
-netty-transport-native-kqueue/4.1.96.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.96.Final-osx-aarch_64.jar
-netty-transport-native-kqueue/4.1.96.Final/osx-x86_64/netty-transport-native-kqueue-4.1.96.Final-osx-x86_64.jar
-netty-transport-native-unix-common/4.1.96.Final//netty-transport-native-unix-common-4.1.96.Final.jar
-netty-transport/4.1.96.Final//netty-transport-4.1.96.Final.jar
+netty-all/4.1.95.Final//netty-all-4.1.95.Final.jar
+netty-buffer/4.1.95.Final//netty-buffer-4.1.95.Final.jar
+netty-codec-http/4.1.95.Final//netty-codec-http-4.1.95.Final.jar
+netty-codec-http2/4.1.95.Final//netty-codec-http2-4.1.95.Final.jar
+netty-codec-socks/4.1.95.Final//netty-codec-socks-4.1.95.Final.jar
+netty-codec/4.1.95.Final//netty-codec-4.1.95.Final.jar
+netty-common/4.1.95.Final//netty-common-4.1.95.Final.jar
+netty-handler-proxy/4.1.95.Final//netty-handler-proxy-4.1.95.Final.jar
+netty-handler/4.1.95.Final//netty-handler-4.1.95.Final.jar
+netty-resolver/4.1.95.Final//netty-resolver-4.1.95.Final.jar
+netty-transport-classes-epoll/4.1.95.Final//netty-transport-classes-epoll-4.1.95.Final.jar
+netty-transport-classes-kqueue/4.1.95.Final//netty-transport-classes-kqueue-4.1.95.Final.jar
+netty-transport-native-epoll/4.1.95.Final/linux-aarch_64/netty-transport-native-epoll-4.1.95.Final-linux-aarch_64.jar
+netty-transport-native-epoll/4.1.95.Final/linux-x86_64/netty-transport-native-epoll-4.1.95.Final-linux-x86_64.jar
+netty-transport-native-kqueue/4.1.95.Final/osx-aarch_64/netty-transport-native-kqueue-4.1.95.Final-osx-aarch_64.jar
+netty-transport-native-kqueue/4.1.95.Final/osx-x86_64/netty-transport-native-kqueue-4.1.95.Final-osx-x86_64.jar
+netty-transport-native-unix-common/4.1.95.Final//netty-transport-native-unix-common-4.1.95.Final.jar
+netty-transport/4.1.95.Final//netty-transport-4.1.95.Final.jar
 objenesis/3.3//objenesis-3.3.jar
 okhttp/3.12.12//okhttp-3.12.12.jar
 okio/1.15.0//okio-1.15.0.jar
diff --git a/pom.xml b/pom.xml
index c8b798f779c5c..876c0c6d77c9b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,7 +216,7 @@
     <commons-cli.version>1.5.0</commons-cli.version>
     <bouncycastle.version>1.70</bouncycastle.version>
     <tink.version>1.9.0</tink.version>
-    <netty.version>4.1.96.Final</netty.version>
+    <netty.version>4.1.95.Final</netty.version>
     <!--
     If you are changing Arrow version specification, please check
     ./python/pyspark/sql/pandas/utils.py, and ./python/setup.py too.

From 6f5d5f04565a671058ae825e6654c7b7843c32e0 Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Fri, 28 Jul 2023 11:17:55 +0800
Subject: [PATCH 5/8] [SPARK-44563][BUILD] Upgrade Arrow to 13.0.0 & Netty to
 4.1.95.Final

---
 pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pom.xml b/pom.xml
index 876c0c6d77c9b..5cb4cee7fe0a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -216,6 +216,10 @@
     <commons-cli.version>1.5.0</commons-cli.version>
     <bouncycastle.version>1.70</bouncycastle.version>
     <tink.version>1.9.0</tink.version>
+    <!--
+      Please don't upgrade the version to 4.1.96.Final,
+      it needs to wait for `arrow-memory-netty` to be greater than 13.0.0.
+    -->
     <netty.version>4.1.95.Final</netty.version>
     <!--
     If you are changing Arrow version specification, please check

From 0bfa518c70f4761927492f038a8e9a21fd075bc6 Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Fri, 4 Aug 2023 09:41:25 +0800
Subject: [PATCH 6/8] [SPARK-44247][BUILD] Upgrade Arrow to 13.0.0

---
 .github/workflows/build_and_test.yml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index d9bcdfcbfa474..c44c9d7c6d424 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -222,17 +222,6 @@ jobs:
         git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' merge --no-commit --progress --squash FETCH_HEAD
         git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' commit -m "Merged commit" --allow-empty
     # Cache local repositories. Note that GitHub Actions cache has a 2G limit.
-    - name: Cache Scala, SBT and Maven
-      uses: actions/cache@v3
-      with:
-        path: |
-          build/apache-maven-*
-          build/scala-*
-          build/*.jar
-          ~/.sbt
-        key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
-        restore-keys: |
-          build-
     - name: Cache Coursier local repository
       uses: actions/cache@v3
       with:

From b658049b8eec8168b7dd8f7d99cf0d8888b0dfd0 Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Fri, 4 Aug 2023 11:04:31 +0800
Subject: [PATCH 7/8] remove cache

---
 .github/workflows/build_and_test.yml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index c44c9d7c6d424..17475d4c5a69b 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -222,13 +222,6 @@ jobs:
         git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' merge --no-commit --progress --squash FETCH_HEAD
         git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' commit -m "Merged commit" --allow-empty
     # Cache local repositories. Note that GitHub Actions cache has a 2G limit.
-    - name: Cache Coursier local repository
-      uses: actions/cache@v3
-      with:
-        path: ~/.cache/coursier
-        key: ${{ matrix.java }}-${{ matrix.hadoop }}-coursier-${{ hashFiles('**/pom.xml', '**/plugins.sbt') }}
-        restore-keys: |
-          ${{ matrix.java }}-${{ matrix.hadoop }}-coursier-
     - name: Free up disk space
       run: ./dev/free_disk_space
     - name: Install Java ${{ matrix.java }}

From 9defab4c5be33d0a49cc7c753d5dcfaa8c5c4c58 Mon Sep 17 00:00:00 2001
From: panbingkun <pbk1982@gmail.com>
Date: Thu, 24 Aug 2023 10:12:49 +0800
Subject: [PATCH 8/8] [SPARK-44247][BUILD] Upgrade Arrow to 13.0.0

---
 .github/workflows/build_and_test.yml | 18 ++++++++++++++++++
 pom.xml                              | 11 -----------
 project/SparkBuild.scala             |  1 -
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index a53b19a916e74..6321fd37b1a4c 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -222,6 +222,24 @@ jobs:
         git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' merge --no-commit --progress --squash FETCH_HEAD
         git -c user.name='Apache Spark Test Account' -c user.email='sparktestacc@gmail.com' commit -m "Merged commit" --allow-empty
     # Cache local repositories. Note that GitHub Actions cache has a 2G limit.
+    - name: Cache Scala, SBT and Maven
+      uses: actions/cache@v3
+      with:
+        path: |
+          build/apache-maven-*
+          build/scala-*
+          build/*.jar
+          ~/.sbt
+        key: build-${{ hashFiles('**/pom.xml', 'project/build.properties', 'build/mvn', 'build/sbt', 'build/sbt-launch-lib.bash', 'build/spark-build-info') }}
+        restore-keys: |
+          build-
+    - name: Cache Coursier local repository
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/coursier
+        key: ${{ matrix.java }}-${{ matrix.hadoop }}-coursier-${{ hashFiles('**/pom.xml', '**/plugins.sbt') }}
+        restore-keys: |
+          ${{ matrix.java }}-${{ matrix.hadoop }}-coursier-
     - name: Free up disk space
       run: |
         if [ -f ./dev/free_disk_space ]; then
diff --git a/pom.xml b/pom.xml
index ea66e5e4308d4..628458c7050b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -314,17 +314,6 @@
     </extraJavaTestArgs>
   </properties>
   <repositories>
-    <repository>
-      <id>asf-staging</id>
-      <name>ASF</name>
-      <url>https://repository.apache.org/content/groups/staging/</url>
-      <releases>
-        <enabled>true</enabled>
-      </releases>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-    </repository>
     <repository>
       <id>gcs-maven-central-mirror</id>
       <!--
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index ec2fb03dd06f0..41fa19725f555 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -307,7 +307,6 @@ object SparkBuild extends PomBuild {
     resolvers := Seq(
       // Google Mirror of Maven Central, placed first so that it's used instead of flaky Maven Central.
       // See https://storage-download.googleapis.com/maven-central/index.html for more info.
-      "asf-staging" at "https://repository.apache.org/content/groups/staging/",
       "gcs-maven-central-mirror" at "https://maven-central.storage-download.googleapis.com/maven2/",
       DefaultMavenRepository,
       Resolver.mavenLocal,