Skip to content

Commit

Permalink
Merge pull request #11877 from YanxuanLiu/fix-auto-merge-conflict-11873
Browse files Browse the repository at this point in the history
* Update rapids JNI and private dependency to 24.12.0 (#11849)

\nWait for the pre-merge CI job to SUCCEED

Signed-off-by: nvauto <[email protected]>

* Update latest changelog [skip ci] (#11851)

* Update latest changelog [skip ci]

Update change log with CLI: \n\n   scripts/generate-changelog --token=<GIT_TOKEN> --releases=24.10,24.12

Signed-off-by: nvauto <[email protected]>

* Update changelog

Signed-off-by: Tim Liu <[email protected]>

* update changelog to involve new changes.

Signed-off-by: Yanxuan Liu <[email protected]>

---------

Signed-off-by: nvauto <[email protected]>
Signed-off-by: Tim Liu <[email protected]>
Signed-off-by: Yanxuan Liu <[email protected]>
Co-authored-by: Tim Liu <[email protected]>
Co-authored-by: Yanxuan Liu <[email protected]>

* Remove 350db143 shim's build (#11874)

Skip the build of the 350db143 shim, as v24.12.0 will not contain the 350db143 shim

Moreover, the v24.12.0 private dependency jar is not released.

To fix below error:

    [ERROR] Failed to execute goal on project rapids-4-spark-sql_2.12: Could not resolve dependencies for
     project com.nvidia:rapids-4-spark-sql_2.12:jar:24.12.0: Failure to find com.nvidia:rapids-4-spark-private_2.12:jar:spark350db143:24.12.0
     in https://repo1.maven.org/maven2 was cached in the local repository, resolution will not be reattempted until the update interval of central has elapsed or updates are forced

Signed-off-by: Tim Liu <[email protected]>

* Update latest changelog [skip ci] (#11876)

Update change log with CLI: \n\n   scripts/generate-changelog --token=<GIT_TOKEN> --releases=24.10,24.12

Signed-off-by: nvauto <[email protected]>

---------

Signed-off-by: nvauto <[email protected]>
Signed-off-by: Tim Liu <[email protected]>
Signed-off-by: Yanxuan Liu <[email protected]>
Co-authored-by: Jenkins Automation <[email protected]>
Co-authored-by: Tim Liu <[email protected]>
  • Loading branch information
3 people authored Dec 16, 2024
2 parents 33d97e8 + 522c37e commit 7e465d8
Show file tree
Hide file tree
Showing 2 changed files with 388 additions and 211 deletions.
Loading

0 comments on commit 7e465d8

Please sign in to comment.