From 13511ac113825ec9875e8654315ff42dd0460207 Mon Sep 17 00:00:00 2001
From: Rafay Aleem <mohammad.aleem@affirm.com>
Date: Thu, 6 Feb 2025 16:50:07 +0000
Subject: [PATCH] 2815!3.5.4+affirm.dev2 release: This build works with
 batch-infra-tasks DT spark sentinels - Revert back to iceberg-aws-bundle and
 remove software.amazon.awssdk - Switch hadoop-aws to hadoop.version
 otherwise, Spark would fail to find the classes

---
 pom.xml                   | 8 ++++----
 python/pyspark/version.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index d3b450e670145..bd3fc0f85a131 100644
--- a/pom.xml
+++ b/pom.xml
@@ -434,14 +434,14 @@
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>software.amazon.awssdk</groupId>
-      <artifactId>bundle</artifactId>
-      <version>2.30.13</version>
+      <groupId>org.apache.iceberg</groupId>
+      <artifactId>iceberg-aws-bundle</artifactId>
+      <version>1.7.1</version>
     </dependency>
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-aws</artifactId>
-      <version>3.4.1</version>
+      <version>${hadoop.version}</version>
     </dependency>
   </dependencies>
   <dependencyManagement>
diff --git a/python/pyspark/version.py b/python/pyspark/version.py
index db20a2ffae586..67ff724242e32 100644
--- a/python/pyspark/version.py
+++ b/python/pyspark/version.py
@@ -16,4 +16,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__version__: str = "3.5.4"
+__version__: str = "2815!3.5.4+affirm.dev2"