Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix auto merge conflict 10523 (#10528)
* Update rapids jni and private dependency version to 24.02.1 (#10511) Signed-off-by: Tim Liu <timl@nvidia.com> * Add missed shims for scala2.13 (#10465) * Add missed shims for scala2.13 Signed-off-by: Tim Liu <timl@nvidia.com> * Add 351 snapshot shim for the scala2.13 version of plugin jar Signed-off-by: Tim Liu <timl@nvidia.com> * Remove 351 snapshot shim as spark 3.5.1 has been released Signed-off-by: Tim Liu <timl@nvidia.com> * Remove scala2.13 351 snapshot shim Signed-off-by: Tim Liu <timl@nvidia.com> * Remove 351 shim's jason string Ran `mvn generate-sources -Dshimplify=true -Dshimplify.move=true -Dshimplify.remove.shim=351` to remove 351 shim's jason string, and fix some unnecessary empty lines that were introduced Signed-off-by: Tim Liu <timl@nvidia.com> * Update Copyright 2024 Auto copyright by below scripts ``` export SPARK_RAPIDS_AUTO_COPYRIGHTER=ON ./scripts/auto-copyrighter.sh $(git diff --name-only origin/branch-24.04..HEAD) ``` Signed-off-by: Tim Liu <timl@nvidia.com> * Revert "Update Copyright 2024" This reverts commit 8482847. * Revert "Remove 351 shim's jason string" This reverts commit 78d1f00. * skip 351 from strict checking * Alien scala2.13/pom.xml to scala2.12 one Run the script `bash build/make-scala-version-build-files.sh 2.13` Signed-off-by: Tim Liu <timl@nvidia.com> * pretend 351 is a snapshot in 24.02 Signed-off-by: Gera Shegalov <gera@apache.org> * pretend 351 is a SNAPSHOT version * Revert change of build/shimplify.py Signed-off-by: Tim Liu <timl@nvidia.com> --------- Signed-off-by: Tim Liu <timl@nvidia.com> Signed-off-by: Gera Shegalov <gera@apache.org> Co-authored-by: Raza Jafri <rjafri@nvidia.com> Co-authored-by: Gera Shegalov <gera@apache.org> * Update changelog for v24.02.0 release (#10525) Signed-off-by: Tim Liu <timl@nvidia.com> --------- Signed-off-by: Tim Liu <timl@nvidia.com> Signed-off-by: Gera Shegalov <gera@apache.org> Co-authored-by: Raza Jafri <rjafri@nvidia.com> Co-authored-by: Gera Shegalov <gera@apache.org>
- Loading branch information