spark-3.5-scala-2.13/3.5.4 package update

[octo-sts]

[octo-sts]

Gen AI suggestions to solve the build error:

Based on the error output, I'll provide a specific analysis and solution:

• Detected Error:

patching file build/mvn
Hunk #1 FAILED at 56.
1 out of 2 hunks FAILED -- saving rejects to file build/mvn.rej

• Error Category: Configuration/Patch

• Failure Point: The patch application step failed specifically for the build/mvn file

• Root Cause Analysis:
The patch file mvn.patch is not aligning with the current source code, likely due to changes in the upstream Spark 3.5.4 codebase that modified the location or content of the targeted lines.

• Suggested Fix:

1. Examine the current build/mvn file at line 56 and surrounding context
2. Update the mvn.patch file to match the current file structure:

# Get the current file version
git show v3.5.4:build/mvn > build/mvn.current

# Generate a new patch
diff -u build/mvn.current build/mvn.desired > mvn.patch.new

3. Or modify the patch to use fuzzy matching:

--- a/build/mvn
+++ b/build/mvn
@@ -53,6 +53,7 @@
+  # Add your changes here with correct context

• Explanation:
Patch failures typically occur when the context lines don't match the target file exactly. By regenerating the patch against the specific version we're targeting (3.5.4), we ensure proper alignment. The patch needs to be updated to match the exact file structure in the v3.5.4 tag.

• Additional Notes:

• Consider using git apply --reject to see detailed rejection information
• The make-distribution.sh patch applied successfully, so only the Maven patch needs updating
• Version 3.5.4 might have reorganized the build scripts compared to previous versions

• References:

• Apache Spark 3.5.4 Release Notes: https://spark.apache.org/releases/spark-release-3-5-4.html
• Git Patch Documentation: https://git-scm.com/docs/git-apply
• Melange Patch Documentation: https://pkg.go.dev/github.com/chainguard-dev/melange#section-documentation