Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge branch-24.02 into main [skip ci] #10526

Merged
merged 7 commits into from
Mar 1, 2024
Merged

Merge branch-24.02 into main [skip ci] #10526

merged 7 commits into from
Mar 1, 2024

Conversation

NvTimLiu
Copy link
Collaborator

@NvTimLiu NvTimLiu commented Mar 1, 2024

As the title

Merge this change with "Create a merge commit"

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

SurajAralihalli and others added 7 commits February 21, 2024 16:25
* Fix scalar leak in RankFixer

Signed-off-by: Jason Lowe <[email protected]>

* Use safeClose

Co-authored-by: Gera Shegalov <[email protected]>

* Add missing RapidsPluginImplicits import

Signed-off-by: Gera Shegalov <[email protected]>

---------

Signed-off-by: Jason Lowe <[email protected]>
Signed-off-by: Gera Shegalov <[email protected]>
Co-authored-by: Gera Shegalov <[email protected]>
Co-authored-by: Gera Shegalov <[email protected]>
* Add missed shims for scala2.13

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

* Add 351 snapshot shim for the scala2.13 version of plugin jar

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

* Remove 351 snapshot shim as spark 3.5.1 has been released

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

* Remove scala2.13 351 snapshot shim

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

* 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 <[email protected]>

* 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 <[email protected]>

* 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 <[email protected]>

* pretend 351 is a snapshot in 24.02

Signed-off-by: Gera Shegalov <[email protected]>

* pretend 351 is a SNAPSHOT version

* Revert change of build/shimplify.py

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

---------

Signed-off-by: Tim Liu <[email protected]>
Signed-off-by: Gera Shegalov <[email protected]>
Co-authored-by: Raza Jafri <[email protected]>
Co-authored-by: Gera Shegalov <[email protected]>
@NvTimLiu NvTimLiu added the build Related to CI / CD or cleanly building label Mar 1, 2024
@NvTimLiu NvTimLiu self-assigned this Mar 1, 2024
@NvTimLiu NvTimLiu changed the title Merge branch-24.02 into main Merge branch-24.02 into main [skip ci] Mar 1, 2024
@NvTimLiu
Copy link
Collaborator Author

NvTimLiu commented Mar 1, 2024

build

@NvTimLiu NvTimLiu merged commit 4df4d46 into main Mar 1, 2024
42 of 43 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build Related to CI / CD or cleanly building
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants