From f230daa5f3f8a94da1d51c7f655331f96238906a Mon Sep 17 00:00:00 2001
From: "Robert (Bobby) Evans" <bobby@apache.org>
Date: Thu, 9 Jan 2025 14:29:20 -0600
Subject: [PATCH 1/3] Add in a hot fix for a CUDF parquet issue (#2742)

This pulls in the patch for https://github.com/rapidsai/cudf/pull/17699
as a hot fix for 24.12.

Signed-off-by: Robert (Bobby) Evans <bobby@apache.org>
---
 patches/0_hot_fix_parquet.patch | 21 +++++++++++++++++++++
 patches/noop.patch              |  0
 2 files changed, 21 insertions(+)
 create mode 100644 patches/0_hot_fix_parquet.patch
 delete mode 100644 patches/noop.patch

diff --git a/patches/0_hot_fix_parquet.patch b/patches/0_hot_fix_parquet.patch
new file mode 100644
index 0000000000..90db1cc390
--- /dev/null
+++ b/patches/0_hot_fix_parquet.patch
@@ -0,0 +1,21 @@
+diff --git a/cpp/src/io/parquet/decode_fixed.cu b/cpp/src/io/parquet/decode_fixed.cu
+index 9acbe026bb..32bb334966 100644
+--- a/cpp/src/io/parquet/decode_fixed.cu
++++ b/cpp/src/io/parquet/decode_fixed.cu
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2024, NVIDIA CORPORATION.
++ * Copyright (c) 2024-2025, NVIDIA CORPORATION.
+  *
+  * Licensed under the Apache License, Version 2.0 (the "License");
+  * you may not use this file except in compliance with the License.
+@@ -961,9 +961,6 @@ CUDF_KERNEL void __launch_bounds__(decode_block_size_t, 8)
+     return;
+   }
+ 
+-  // if we have no work to do (eg, in a skip_rows/num_rows case) in this page.
+-  if (s->num_rows == 0) { return; }
+-
+   using value_decoder_type = std::conditional_t<
+     split_decode_t,
+     decode_fixed_width_split_values_func<decode_block_size_t, has_lists_t, state_buf_t>,
diff --git a/patches/noop.patch b/patches/noop.patch
deleted file mode 100644
index e69de29bb2..0000000000

From b56f1df117b44e565a861c008d2c58767e5edf14 Mon Sep 17 00:00:00 2001
From: Jenkins Automation <70000568+nvauto@users.noreply.github.com>
Date: Fri, 10 Jan 2025 10:04:58 +0800
Subject: [PATCH 2/3] Update version to 24.12.1 (#2749)

Wait for the pre-merge CI job to SUCCEED

---------

Signed-off-by: nvauto <70000568+nvauto@users.noreply.github.com>
Co-authored-by: YanxuanLiu <yanxuanl@nvidia.com>
---
 pom.xml                     | 4 ++--
 src/main/cpp/CMakeLists.txt | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index a7935e9717..1465e6c3df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright (c) 2022-2024, NVIDIA CORPORATION.
+  Copyright (c) 2022-2025, NVIDIA CORPORATION.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 
   <groupId>com.nvidia</groupId>
   <artifactId>spark-rapids-jni</artifactId>
-  <version>24.12.0-SNAPSHOT</version>
+  <version>24.12.1-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>RAPIDS Accelerator JNI for Apache Spark</name>
   <description>
diff --git a/src/main/cpp/CMakeLists.txt b/src/main/cpp/CMakeLists.txt
index 20a918266e..3f12b9c7fa 100644
--- a/src/main/cpp/CMakeLists.txt
+++ b/src/main/cpp/CMakeLists.txt
@@ -1,5 +1,5 @@
 # =============================================================================
-# Copyright (c) 2022-2024, NVIDIA CORPORATION.
+# Copyright (c) 2022-2025, NVIDIA CORPORATION.
 #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except
 # in compliance with the License. You may obtain a copy of the License at
@@ -51,7 +51,7 @@ rapids_cuda_init_architectures(SPARK_RAPIDS_JNI)
 
 project(
   SPARK_RAPIDS_JNI
-  VERSION 24.12.00
+  VERSION 24.12.01
   LANGUAGES C CXX CUDA
 )
 

From 45bd6a362d9fbdeadc4c8fea4f6845899639e3bf Mon Sep 17 00:00:00 2001
From: nvauto <70000568+nvauto@users.noreply.github.com>
Date: Fri, 10 Jan 2025 02:06:33 +0000
Subject: [PATCH 3/3] Change version to 24.12.1

Signed-off-by: nvauto <70000568+nvauto@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1465e6c3df..0441d80124 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>com.nvidia</groupId>
   <artifactId>spark-rapids-jni</artifactId>
-  <version>24.12.1-SNAPSHOT</version>
+  <version>24.12.1</version>
   <packaging>jar</packaging>
   <name>RAPIDS Accelerator JNI for Apache Spark</name>
   <description>