Fix merge conflict from branch-24.02 #10544
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…0511) Signed-off-by: Tim Liu <[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]>
Signed-off-by: Tim Liu <[email protected]>
) Signed-off-by: Jason Lowe <[email protected]>
Signed-off-by: Jason Lowe <[email protected]>
|
build |
NvTimLiu
approved these changes
Mar 5, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the merge conflict flagged in #10543. Only conflicts were pom.xml files where we take the 24.04 version.
NOTE: This needs to be merged with a merge commit, not squashed!