From 1dfedff26bee036be37137cb38e70c9d709c2086 Mon Sep 17 00:00:00 2001
From: nvauto <70000568+nvauto@users.noreply.github.com>
Date: Sun, 29 Sep 2024 13:07:51 +0000
Subject: [PATCH 1/2] Update rapids JNI and private dependency to
 24.12.0-SNAPSHOT

To fix: https://github.com/NVIDIA/spark-rapids/issues/11492\nWait for the pre-merge CI job to SUCCEED

Signed-off-by: nvauto <70000568+nvauto@users.noreply.github.com>
---
 jenkins/databricks/init_cudf_udf.sh | 3 +--
 pom.xml                             | 5 ++---
 scala2.13/pom.xml                   | 5 ++---
 3 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/jenkins/databricks/init_cudf_udf.sh b/jenkins/databricks/init_cudf_udf.sh
index 8a2b05d89c5..4b01d758ed9 100755
--- a/jenkins/databricks/init_cudf_udf.sh
+++ b/jenkins/databricks/init_cudf_udf.sh
@@ -20,8 +20,7 @@
 
 set -ex
 
-# TODO: https://github.com/NVIDIA/spark-rapids/issues/11492
-CUDF_VER=${CUDF_VER:-24.10}
+CUDF_VER=${CUDF_VER:-24.12
 CUDA_VER=${CUDA_VER:-11.8}
 
 # Need to explicitly add conda into PATH environment, to activate conda environment.
diff --git a/pom.xml b/pom.xml
index f32c78f8454..7a4b7e56d85 100644
--- a/pom.xml
+++ b/pom.xml
@@ -722,9 +722,8 @@
         <spark.version.classifier>spark${buildver}</spark.version.classifier>
         <cuda.version>cuda11</cuda.version>
         <jni.classifier>${cuda.version}</jni.classifier>
-        <!-- TODO: https://github.com/NVIDIA/spark-rapids/issues/11492 -->
-        <spark-rapids-jni.version>24.10.0-SNAPSHOT</spark-rapids-jni.version>
-        <spark-rapids-private.version>24.10.0-SNAPSHOT</spark-rapids-private.version>
+        <spark-rapids-jni.version>24.12.0-SNAPSHOT</spark-rapids-jni.version>
+        <spark-rapids-private.version>24.12.0-SNAPSHOT</spark-rapids-private.version>
         <scala.binary.version>2.12</scala.binary.version>
         <alluxio.client.version>2.8.0</alluxio.client.version>
         <scala.recompileMode>incremental</scala.recompileMode>
diff --git a/scala2.13/pom.xml b/scala2.13/pom.xml
index 82e7af077ca..f17a90f4633 100644
--- a/scala2.13/pom.xml
+++ b/scala2.13/pom.xml
@@ -722,9 +722,8 @@
         <spark.version.classifier>spark${buildver}</spark.version.classifier>
         <cuda.version>cuda11</cuda.version>
         <jni.classifier>${cuda.version}</jni.classifier>
-        <!-- TODO: https://github.com/NVIDIA/spark-rapids/issues/11492 -->
-        <spark-rapids-jni.version>24.10.0-SNAPSHOT</spark-rapids-jni.version>
-        <spark-rapids-private.version>24.10.0-SNAPSHOT</spark-rapids-private.version>
+        <spark-rapids-jni.version>24.12.0-SNAPSHOT</spark-rapids-jni.version>
+        <spark-rapids-private.version>24.12.0-SNAPSHOT</spark-rapids-private.version>
         <scala.binary.version>2.13</scala.binary.version>
         <alluxio.client.version>2.8.0</alluxio.client.version>
         <scala.recompileMode>incremental</scala.recompileMode>

From bb51ba021fa750569fb07c80b009d9882fb570be Mon Sep 17 00:00:00 2001
From: timl <timl@nvidia.com>
Date: Mon, 30 Sep 2024 08:43:18 +0800
Subject: [PATCH 2/2] Fix the missing '}'

Signed-off-by: timl <timl@nvidia.com>
---
 jenkins/databricks/init_cudf_udf.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jenkins/databricks/init_cudf_udf.sh b/jenkins/databricks/init_cudf_udf.sh
index 4b01d758ed9..16b90b95c0e 100755
--- a/jenkins/databricks/init_cudf_udf.sh
+++ b/jenkins/databricks/init_cudf_udf.sh
@@ -20,7 +20,7 @@
 
 set -ex
 
-CUDF_VER=${CUDF_VER:-24.12
+CUDF_VER=${CUDF_VER:-24.12}
 CUDA_VER=${CUDA_VER:-11.8}
 
 # Need to explicitly add conda into PATH environment, to activate conda environment.